Commit graph

214 commits

Author SHA1 Message Date
Lactozilla
e7b4beba20 Update dates in copyright notices of all files modified in 2024 2024-09-21 21:35:01 -03: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
sphere
a75fbd229e Merge branch 'fix-ctrl+backspace-in-console' into 'next'
Fix Ctrl+Backspace in the console causing a crash

See merge request STJr/SRB2!2437
2024-05-22 11:25:07 +00: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
Zwip-Zwap Zapony
5db15ae943 Fix Ctrl+Backspace in the console causing a crash
Also fix Ctrl+C / Ctrl+X emptying the clipboard without a text selection
2024-05-05 17:03:42 +02: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
Logan Aerl Arias
e147ca30b9 Merge branch SRB2:next into issue1188 2024-03-03 17:22:51 +00:00
spherallic
73b90d13eb Merge branch 'next' into font_drawer 2024-02-25 00:58:04 +01:00
256nil
18e7f0ee2d Fix #1188 2024-02-20 18:12:51 +02: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
Arthur
7c257dc765 This was nothing more crazy than a buffer wraparound. 2024-02-16 19:47:15 -05:00
Arthur
99c91d4bb3 Visual Studio compiles again 2024-02-14 16:36:36 -05:00
Alam Ed Arias
3a5c5410bf Merge branch SRB2:next into fix-command-line-input 2024-02-14 17:12:05 +00:00
Logan Aerl Arias
bf4efe968f Merge branch 'patch-refactor' into 'next'
Patch and texture refactor

See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
Hanicef
8155313344 Fix input via command line/terminal not working 2024-02-09 18:49:32 +01:00
Hanicef
914cb167a4 Fix console binds incorrectly respecting layout keys 2024-02-08 21:50:43 +01:00
Lactozilla
72b63a1305 Merge branch 'next' into patch-refactor 2024-01-14 22:16:32 -03:00
Logan Aerl Arias
456f7ef9a6 Merge branch SRB2:next into devmode-hudlines 2023-12-31 16:43:54 +00:00
Logan Aerl Arias
f5ac585338 Merge branch 'bind-multi-arg' into 'next'
Allow `bind` to accept more arguments for a command.

See merge request STJr/SRB2!1596
2023-12-31 14:24:39 +00:00
Lactozilla
2ef5ea86f3 Don't toggle the console if shift is held 2023-12-26 18:31:11 -03:00
Lactozilla
1f65c55074 Don't add text to the console on the same frame it's being toggled
Resolves #1161
2023-12-26 18:29:41 -03: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
63a5361d3a Merge branch 'native-keyboard-layout-support' into 'next'
Implement support for native keyboard layout

See merge request STJr/SRB2!1952
2023-12-25 23:57:51 +00:00
Gustaf Alhäll
fa050cdebf
Redesign search mechanism 2023-11-18 20:44:26 +01:00
Lactozilla
376022f3d7 Merge remote-tracking branch 'stjr/next' into patch-refactor 2023-11-07 00:56:28 -03:00
Krabs
4e9915e1ba Merge branch SRB2:next into bind-multi-arg 2023-10-31 04:46:53 +00:00
Zwip-Zwap Zapony
cd6cd53959 Combine vid.dupx and vid.dupy 2023-10-30 04:38:51 +00:00
Alam Ed Arias
2b7e38726e Merge branch SRB2:next into bind-multi-arg 2023-10-25 19:50:36 +00: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
Zwip-Zwap Zapony
8077a1db8f Always allow con_hudlines when using devmode 2023-08-14 19:55:47 +02:00
Lactozilla
821460d208 Patch refactor 2023-07-30 20:56:28 -03:00
Sal
3a52e6deb2 Merge branch 'waiting-players-intermission' into 'next'
SRB2Kart netcode ports

See merge request STJr/SRB2!2019
2023-07-24 18:03:45 +00:00
sphere
b1e3589210 Merge branch 'hudlines-hudtime-fix' into 'next'
Fix con_hudlines being off by one, Fix con_hudtime overflow

See merge request STJr/SRB2!1931
2023-07-18 19:47:21 +00:00
Sally Coolatta
80bf4d6c2d Port SRB2Kart join on intermission fix
All gamestates besides GS_LEVEL are unsupported by the save game functions. This commit forces players joining during these gamestates into GS_WAITINGPLAYERS, which is a basic gamestate that just maintains the connection until we can enter the start of a new one. Also provides an extremely simple drawer for GS_WAITINGPLAYERS so the joining player knows what's going on.
2023-07-16 20:53:28 -04:00
Zwip-Zwap Zapony
4d4910c918 Use 99999999 instead of 86400, make "MIN" 0
Nines might be more pleasing than an exact number for con_hudtime
It'd be bad to make "MIN" in an old config suddenly start displaying lines for con_hudlines
2023-06-13 14:02:19 +02:00
sphere
cd1b57a901 Merge branch 'textcolortweaks' into 'next'
Small text colormap tweaks

See merge request STJr/SRB2!1971
2023-06-09 11:33:26 +00:00
sphere
c37af2bf78 Merge branch 'uncap-console' into 'next'
Interpolate console animation, Make con_height update on the fly

Closes #905

See merge request STJr/SRB2!1878
2023-05-25 22:36:24 +00:00
Gustaf Alhäll
b8f8cc1451
fixup! fixup! Implement support for native keyboard layout 2023-05-23 17:40:13 +02:00
Gustaf Alhäll
95d7a486ee
Implement support for native keyboard layout 2023-05-23 17:40:09 +02:00
spherallic
98dcf2d228 Tweak yellow/green/blue/red/peridot text colors 2023-04-24 23:23:47 +02:00
spherallic
34abe808e4 Merge branch 'next' into font_drawer 2023-04-13 10:43:39 +02:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next'
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
2023-04-12 17:50:01 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
spherallic
8228275cf8 Merge branch 'next' into font_drawer 2023-03-05 22:27:22 +01:00
Zwip-Zwap Zapony
702b2acfd3 Limit con_hudtime to 24 hours
Also rename cons_msgtimeout to cons_hudtime for consistency
2023-02-04 17:35:44 +01:00