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 |
|
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 |
|
Alam Ed Arias
|
703ee972e6
|
Clean up stringop-truncation warnings
|
2024-02-20 16:30:15 -05:00 |
|
Lactozilla
|
5a46f12c62
|
Merge branch 'next' into delete-unused-render-code
|
2024-02-19 19:20:48 -03: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 |
|
Logan Aerl Arias
|
a7d1d53778
|
Merge branch 'next' into playersetup-and-continue-lua
|
2024-02-17 22:17:50 -05:00 |
|
Logan Aerl Arias
|
6763aaefff
|
Merge branch 'next' into ogl-palette-rendering
|
2024-02-17 19:06:18 -05:00 |
|
Arthur
|
99c91d4bb3
|
Visual Studio compiles again
|
2024-02-14 16:36:36 -05:00 |
|
Hanicef
|
634c972f6c
|
Fix console not being blocked by IT_CV_STRING
|
2024-02-11 12:08:42 +01:00 |
|
Lactozilla
|
76c7dccd00
|
Delete old pic_t format from Doom Legacy
|
2024-01-16 15:54:29 -03:00 |
|
Lactozilla
|
970a9d65dd
|
Merge branch 'next' into more-sprite2
|
2024-01-13 03:43:34 -03:00 |
|
spherallic
|
35b6b21562
|
Clean up NiGHTS attack character code, fix compile issues
|
2024-01-11 13:18:32 +01:00 |
|
sphere
|
4ae2482283
|
Merge branch 'character-nightsattack' into 'next'
Draw Character in NiGHTS Attack
See merge request STJr/SRB2!2175
|
2024-01-11 12:11:54 +00:00 |
|
Mari0shi
|
5a2a24b868
|
Draw Character in NiGHTS Attack
|
2024-01-11 12:11:54 +00:00 |
|
Logan Aerl Arias
|
0781adc3ca
|
Merge branch 'pandoradev' into 'next'
Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked
See merge request STJr/SRB2!2066
|
2024-01-08 19:20:23 +00:00 |
|
Lactozilla
|
0ffcf89c85
|
Merge branch 'next' into more-sprite2
|
2024-01-08 02:55:19 -03:00 |
|
Alam Ed Arias
|
626ac069f2
|
Merge branch 'master' into next
|
2024-01-07 14:22:43 -05:00 |
|
Alam Ed Arias
|
caaeaef6cc
|
fixup Valgrind warning:
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
|
2024-01-07 13:09:47 -05:00 |
|
Lactozilla
|
7fbd8f7025
|
Merge branch 'next' into more-sprite2
|
2024-01-02 22:09:17 -03:00 |
|