Commit graph

295 commits

Author SHA1 Message Date
Lactozilla
e7970fc59a Merge branch 'fix-miscolored-chat' into 'next'
Make chat aware of team colors on normal chat plus custom team colors

See merge request STJr/SRB2!2588
2025-01-20 02:12:30 +00:00
Lugent
db606d0111 Fix bruh moment 2025-01-12 11:42:11 -04:00
Lugent
201d0fd023 Make chat aware of team colors on normal chat plus custom team colors 2025-01-12 11:23:33 -04:00
Eidolon
aabf8ae54e Merge branch 'next' of git.do.srb2.org:STJr/SRB2 into 2214 2024-10-16 17:43:38 -05:00
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03:00
spherallic
3c1a43f141 Merge branch 'next' into 2214 2024-09-13 15:50:12 +02:00
Hanicef
53db028bdb Synchronize rate limit variables and limit PlayerMsg hook 2024-09-06 12:21:34 +02:00
spherallic
a9a16ea841 Merge branch 'next' into 2214 2024-07-02 22:16:31 +02:00
spherallic
01a368632e Correct line spacing on title card font 2024-07-02 21:52:17 +02:00
spherallic
c683fa82da Merge branch 'public_next' into 2214 2024-07-02 15:15:46 +02:00
spherallic
f92f1f3527 Correct chat word wrapping further, clean up unused status bar dimensions 2024-07-02 02:43:34 +02:00
spherallic
49327909de Merge branch 'next' into 2214 2024-06-27 10:51:52 +02:00
spherallic
05c97dbd56 Fix chat word wrapping by reintroducing some old hacks 2024-06-27 10:48:59 +02:00
spherallic
e59f421a1e Merge branch 'next' into security-release-14 2024-06-24 14:28:12 +02:00
sphere
ce1901a3bb Merge branch 'fix-spectator-list-resolution' into 'next'
Fix spectator list not compensating for non-green resolutions

See merge request STJr/SRB2!2393
2024-06-06 22:53:25 +00:00
Lactozilla
0aca694f1e Merge branch 'ignore-flats-when-loading-patches' into 'next'
Ignore flats when loading patches

See merge request STJr/SRB2!2457
2024-06-02 19:45:40 +00:00
Hanicef
72f2942929 Fix players not rendering on team scoreboards 2024-05-25 18:04:49 +02:00
Lactozilla
4502e67f0f Ignore flats when loading patches 2024-05-20 02:48:38 -03:00
Hanicef
911a351eb4 Fix keyboard input when certain keys overlap with dead keys 2024-05-12 19:44:37 +02:00
James R
388a72a89b Got_Saycmd: copy message content into intermediate buffer
This prevents modifying the original buffer at the cleanup
step as well as potentially writing out of bounds.
2024-04-20 14:23:25 -05:00
Hanicef
01b017019b Fix spectator list not compensating for non-green resolutions 2024-03-15 21:35:28 +01:00
sphere
df18cc0960 Merge branch 'font_drawer' into 'next'
Refactor string drawing functions

See merge request STJr/SRB2!1726
2024-03-10 12:48:59 +00:00
spherallic
02f31a4922 Add character width to font definitions
Used for V_MONOSPACE and V_OLDSPACING instead of spacewidth*2
2024-03-07 21:36:59 +01:00
Alam Ed Arias
a0c27b22c3 Merge branch 'next' into stringop 2024-02-28 13:14:11 -05:00
Hanicef
bfd6dbefe6 Add per-player mute 2024-02-27 10:58:59 +00:00
spherallic
94db9ddf12 Make chat word wrapping consistent with how it was before 2024-02-25 01:48:42 +01:00
spherallic
73b90d13eb Merge branch 'next' into font_drawer 2024-02-25 00:58:04 +01:00
Alam Ed Arias
703ee972e6 Clean up stringop-truncation warnings 2024-02-20 16:30:15 -05:00
Lactozilla
07656de1d2 Delete old and unused rendering-related code
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
2024-02-18 22:11:22 -03:00
spherallic
03c138b782 Merge branch 'next' into font_drawer 2024-02-18 17:43:39 +01:00
Hanicef
88bdc3e433 Fix MOTD not being sent to players on first join 2024-02-15 18:36:28 +01:00
sphere
279820cd6c Merge branch 'slash-n' into 'next'
add checks for \n in chat messages

See merge request STJr/SRB2!2170
2024-02-10 15:22:33 +00:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
3331e073ea Merge branch SRB2:next into slash-n 2023-12-31 17:05:06 +00:00
Lactozilla
a266fbb6a0 Revert 6c701a9312 2023-12-26 17:53:38 -03:00
Logan Aerl Arias
6c701a9312 Revert "Merge branch 'native-keyboard-layout-support' into 'next'"
This reverts merge request !1952
2023-12-26 19:21:09 +00:00
Logan Aerl Arias
8e86cf6a5c Merge branch 'configurable-spam-protection' into 'next'
Make chat spam protection more configurable

See merge request STJr/SRB2!2127
2023-12-25 23:59:07 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
Alam Ed Arias
244cca8e9d Merge branch 'master' into font_drawer 2023-10-25 15:06:35 -04:00
Alam Ed Arias
f2fa2505cd Merge branch SRB2:next into native-keyboard-layout-support 2023-10-25 19:05:06 +00:00
Alam Ed Arias
d1fb9e191a Merge branch SRB2:next into configurable-spam-protection 2023-10-23 18:29:32 +00:00
bitten2up
2de0c6a2ea
forgot to add a comment explaining it 2023-10-08 20:38:56 -05:00
bitten2up
6ff2a2de7e
\n 2023-10-08 20:34:43 -05:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
sphere
b7b1e0b1e5 Add toggle for instant retry in Record Attack 2023-09-05 17:24:03 +00:00
Gustaf Alhäll
e0ea677ca4
Make chat spam protection more configurable 2023-08-30 19:32:13 +02:00
LJ Sonic
de46eef068 Move gamestate handling to a new file 2023-07-27 15:38:45 +02:00
LJ Sonic
0ade3ae0bc Move tic and net command handling to new files 2023-07-27 15:38:45 +02:00
LJ Sonic
0b17e3c418 Move netcode files to a new folder 2023-07-27 15:38:42 +02:00