Alam Ed Arias
0fe8c7a57a
Update m_menu.c
...
Add check netgame check if someone use both -noipv4 and -noipv6
2025-02-02 22:29:44 -05:00
Lactozilla
ee6ce2a1fb
Revert "Merge branch 'superbutton' into 'next'"
...
This reverts commit 4706e80df15f98f7696e
2025-01-22 21:01:45 -03:00
Lactozilla
a6a5767335
Revert "Merge branch 'shield-button-touchups' into 'next'"
...
This reverts commit 89620dbd9e55a7afde52
2025-01-22 20:53:37 -03:00
Lactozilla
c09bdf5407
Revert "Merge branch 'shield-button-prompt' into 'next'"
...
This reverts commit 3849ba65aa2ac80138a8
2025-01-22 20:47:39 -03:00
Lactozilla
5f66e675c9
Merge branch 'fix-masterserver-listing' into 'next'
...
Fix in-game masterserver listing
See merge request STJr/SRB2!2603
2025-01-21 21:49:04 +00:00
Lactozilla
74777eeb81
Only show level select option if started a session from a level select
2025-01-21 17:56:02 -03:00
pastel
18e39ee42e
Fix single player level select conditions
2025-01-20 14:32:56 -06:00
Gustaf Alhäll
83de7c93a4
Fix in-game masterserver listing
2025-01-20 16:52:58 +01:00
pastel
1e58ccb8aa
Fix pipeline broken on clang
2025-01-18 05:04:16 +00:00
Radicalicious
60bd1527de
Update m_menu.c
2025-01-16 18:26:54 -06:00
Lactozilla
8fbbf802e6
Update copyrights to 2025
2025-01-16 14:13:30 -03:00
Alam Ed Arias
1db9679f01
Merge branch SRB2:next into add-room-id-cvar
2025-01-10 05:00:21 +00:00
Hanicef
819ecb0152
Fix issues with custom pause menu binds
2025-01-10 03:37:58 +00:00
pastel
9eecedf3ae
Fix being unable to use CTRL keyboard shortcuts on menu input fields
2024-12-31 14:05:51 -06:00
pastel
102ba86869
Correctly force Sonic in the tutorial
2024-12-19 14:11:01 -06:00
Lactozilla
50db80f001
Remove keypad handling in M_HandleConnectIP
...
There is no need to have that code anymore, since keypad presses also generate ev_text events.
Additionally, made text fields in menus ignore ev_keydown events if they are keypad keys.
2024-11-30 10:58:28 -03:00
Lactozilla
e7b4beba20
Update dates in copyright notices of all files modified in 2024
2024-09-21 21:35:01 -03:00
sphere
0f65f9fc47
Merge branch 'newfilewhothis' into 'next'
...
Make files with missing skins tell you who the skin is (resolves #1071 )
Closes #1071
See merge request STJr/SRB2!2411
2024-07-01 14:14:05 +00:00
pastel
e9e2f20de9
Make files with missing skins tell you who the skin is ( resolves #1071 )
2024-07-01 14:14:05 +00:00
spherallic
2eebd4df29
Fix #1146
2024-06-24 23:51:47 +02:00
sphere
3849ba65aa
Merge branch 'shield-button-prompt' into 'next'
...
Shield Button Prompt for Old Configs
Closes #1152
See merge request STJr/SRB2!2387
2024-06-24 10:24:17 +00:00
Hanicef
0846024adc
Add CVar for changing room ID
2024-06-16 15:00:51 +02:00
SMS Alfredo
f19ec6f676
Fix shieldscale 0 bugs
2024-06-03 23:25:02 +00:00
sphere
6d68091f3f
Merge branch 'skinvarstuff' into 'next'
...
Update skin cvar from character select and compare against cvar when warping without a loaded file (resolves #1267 , #1117 , #1114 , #1112 )
Closes #1112 , #1114 , #1117 , and #1267
See merge request STJr/SRB2!2467
2024-06-03 14:19:44 +00:00
sphere
7e3a06cbe8
Merge branch 'gexunleashed' into 'next'
...
Fix forcecharacter regressions & crash (resolves #1262 )
Closes #1262
See merge request STJr/SRB2!2464
2024-06-03 12:59:52 +00:00
pastel
1f71ecdc80
Fix forcecharacter regressions & crash ( resolves #1262 )
2024-06-03 12:59:52 +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
pastel
e2e879a704
handle file loading correctly
2024-05-31 21:10:25 -05:00
pastel
dd1ac23bdb
Update skin cvar from character select and compare against cvar when warping to map without character select
2024-05-31 15:52:24 -05:00
Zwip-Zwap Zapony
b1f15a35ba
Use a three-option menu instead of a yes/no prompt
2024-05-28 14:25:30 +02:00
Zwip-Zwap Zapony
c53da609b1
Shield button prompt for old configs
2024-05-28 14:17:57 +02: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
0186e5bce5
Fix a mistake
2024-05-20 02:54:45 -03: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
fcd4c8334c
Merge branch 'playersetup-and-continue-lua' into 'next'
...
Add "continue" and "playersetup" Lua HUD hooks & draw followitems in the Player Setup menu
See merge request STJr/SRB2!2227
2024-03-13 11:11:36 +00: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
sphere
ee96ed12a4
Merge branch 'more-sprite2' into 'next'
...
Add 'sprite2' field to states
See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
Logan Aerl Arias
084f7bc4f7
Merge branch SRB2:next into playersetup-and-continue-lua
2024-03-04 17:21:26 +00:00
Logan Aerl Arias
89620dbd9e
Merge branch 'shield-button-touchups' into 'next'
...
Shield Button Touchups
See merge request STJr/SRB2!2257
2024-03-03 23:37:05 +00:00
Logan Aerl Arias
e5cb182662
Merge branch SRB2:next into fix-it-cv-string-console-block
2024-03-03 17:20:04 +00:00
Logan Aerl Arias
ba35849b5a
Merge branch SRB2:next into shield-button-touchups
2024-03-03 16:17:08 +00:00
Logan Aerl Arias
5dd82cb7db
Merge branch 'next' into more-sprite2
2024-03-03 11:16:35 -05:00
Alam Ed Arias
a0c27b22c3
Merge branch 'next' into stringop
2024-02-28 13:14:11 -05:00
spherallic
7f51bb3001
Fix build errors & fix F_DrawContinueCharacter somehow becoming unused
2024-02-27 14:22:57 +01:00
spherallic
9fb4b4cfbb
Merge branch 'next' into playersetup-and-continue-lua
2024-02-27 12:31:12 +01:00
spherallic
dbc1fe8c0e
Merge branch 'next' into more-sprite2
2024-02-27 12:23:14 +01:00
spherallic
73b90d13eb
Merge branch 'next' into font_drawer
2024-02-25 00:58:04 +01:00
Zwip-Zwap Zapony
90958614f3
Shield button touchups
2024-02-24 15:41:36 +01:00
