sphere
f67d349b35
Merge branch 'fix-buffer-overflow-hud-string' into 'next'
...
Fix segfault when passing a long string to v.drawString
See merge request STJr/SRB2!2403
2024-06-03 14:25:41 +00:00
sphere
4a599cb8da
Merge branch 'nostickztarget' into 'next'
...
Fix automatic mode z-target bugs and crashes (resolves #751 , #758 , #1264 )
Closes #1264 , #758 , and #751
See merge request STJr/SRB2!2422
2024-06-03 14:24:06 +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
6b8f4ab398
Merge branch 'allowdesync' into 'next'
...
Add a console variable that will allow individual demos to desync....
See merge request STJr/SRB2!2361
2024-06-03 13:45:37 +00:00
sphere
6b160747d8
Merge branch 'alwaysgrabmouse-fix' into 'next'
...
Fix mouse buttons not working in menus with alwaysgrabmouse on
Closes #1257
See merge request STJr/SRB2!2449
2024-06-03 13:41:54 +00:00
sphere
d3686b3255
Merge branch 'improve-backtrace' into 'next'
...
Clean up the backtrace code and make it use write() more safely.
See merge request STJr/SRB2!1897
2024-06-03 13:37:48 +00:00
sphere
8ffce81fc3
Merge branch 'whirlybirdridesagain' into 'next'
...
Removed thokked when hitting springs (resolves #1245 )
Closes #1245
See merge request STJr/SRB2!2429
2024-06-03 13:30:16 +00:00
sphere
57e17184d1
Merge branch 'lessthan3emeraldshards' into 'next'
...
Allow less than 3 emerald shards instead of crashing
See merge request STJr/SRB2!2433
2024-06-03 13:24:58 +00:00
sphere
f54c34e2ee
Merge branch 'fix-shearing-vertical-aim' into 'next'
...
Fix vertical aim being off when using lack of perspective
See merge request STJr/SRB2!2408
2024-06-03 13:17:37 +00:00
sphere
3ef5d14e3a
Merge branch 'issue1062' into 'next'
...
Don't change drawangle while riding on a fan
Closes #1062
See merge request STJr/SRB2!2371
2024-06-03 13:12:38 +00:00
sphere
30f1ac31e4
Merge branch 'issue1133' into 'next'
...
Rollout rock handling with gravity boots
See merge request STJr/SRB2!2343
2024-06-03 13:10:06 +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
sphere
cc29f8a42d
Merge branch 'fix-equation-slopes-near-edges' into 'next'
...
Fix equation slopes breaking with slopes farther than 32k FU away from the map center
See merge request STJr/SRB2!2397
2024-06-03 12:59:13 +00:00
sphere
af8337cd61
Merge branch 'expose-maxvid-const' into 'next'
...
Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC
See merge request STJr/SRB2!2468
2024-06-03 12:56:44 +00:00
Hanicef
1a02c7fd73
Expose BASEVIDWIDTH and BASEVIDHEIGHT to Lua and SOC
2024-06-03 12:56:44 +00:00
sphere
c8bffdea66
Merge branch 'improve-slope-physics-on-solid-middle-textures' into 'next'
...
Improve slope physics on solid middle textures
See merge request STJr/SRB2!2455
2024-06-03 12:55:41 +00:00
sphere
5d72b4383d
Merge branch 'fix-1093' into 'next'
...
Use correct slope for solid middle textures
Closes #1093
See merge request STJr/SRB2!2454
2024-06-03 12:55:35 +00:00
Lactozilla
c65acbcca8
Merge branch '712-trying-to-load-a-folder-as-an-addon-causes-a-bad-cycle-error-everytime' into 'next'
...
Resolve "[2.2.10 prerelease] Trying to load a folder as an addon causes a "bad cycle" error every time"
Closes #712
See merge request STJr/SRB2!2412
2024-06-03 03:38:06 +00:00
Lactozilla
aa3455dc0f
Merge branch 'spr2defaults-fix' into 'next'
...
SPR2defaults fix
See merge request STJr/SRB2!2461
2024-06-03 03:20:52 +00:00
Lactozilla
8b1ddcbd57
Merge branch 'fix-spriteinfo-indexing' into 'next'
...
Fix spriteinfo indexing
Closes #1255
See merge request STJr/SRB2!2463
2024-06-03 03:19:14 +00:00
Lactozilla
b89aaf709e
Generate the TF_CHROMAKEYED texture in hw_cache.c
2024-06-03 00:14:33 -03:00
Lactozilla
cb09b90556
Add missing comments
2024-06-02 21:45:36 -03:00
Lactozilla
bd641c3857
Fix #1263
2024-06-02 21:40:14 -03:00
Lactozilla
dd5f030b16
Use palette index 255 for transparency
2024-06-02 20:45:00 -03:00
Lactozilla
7cc0dd1eff
Merge branch 'fix-1248' into 'next'
...
Fix #1248
Closes #1248
See merge request STJr/SRB2!2452
2024-06-02 21:08:38 +00:00
Lactozilla
726345013c
Merge branch 'fix-1247' into 'next'
...
Fix 3D floor side texture scaling (resolves #1247 )
Closes #1247
See merge request STJr/SRB2!2435
2024-06-02 21:07:17 +00:00
Lactozilla
02d18ff44d
Merge branch 'fixfoftferline' into 'next'
...
Fix FOFs with transferline flag and many linedefs randomly crashing
See merge request STJr/SRB2!2285
2024-06-02 21:04:48 +00:00
Lactozilla
a1f22a3c47
Merge branch 'next' into SRB2-fixfoftferline
2024-06-02 17:19:38 -03:00
Lactozilla
f8a7ba4a75
Prevent infinite loop in R_RenderThickSideRange
2024-06-02 16:54:11 -03:00
Lactozilla
21dd828bfa
Merge branch 'fix-1215' into 'next'
...
Fix 3D floor side texture scrolling (resolves #1215 )
Closes #1215
See merge request STJr/SRB2!2392
2024-06-02 19:47:59 +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
c0c1b8de90
don't adjust texture coords of nonexistant gpatch
2024-06-01 14:40:44 -05: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
SSNTails
b453e6732d
pastel's ideas #2
2024-05-29 21:43:09 -04:00
SSNTails
bd8684e3e0
pastel's ideas
2024-05-29 21:42:05 -04:00
SSNTails
53c6e65fd2
Merge branch 'issue1062' of https://git.do.srb2.org/SSNTails/SRB2 into issue1062
2024-05-29 21:18:42 -04:00
SSNTails
19736fa55e
possibly more valid...?
2024-05-29 21:18:36 -04:00
SSNTails
5fe927038c
Merge branch SRB2:next into issue1062
2024-05-29 21:42:28 +00:00
SSNTails
a2bba687ba
Don't break automatic mode.
2024-05-29 17:19:49 -04:00
pastel
712414817b
also fix ticcmd intro crash
2024-05-28 13:51:29 -05:00
pastel
db40279fdb
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into nostickztarget
2024-05-28 13:31:42 -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
LJ Sonic
1ba9ecf027
Add missing newline in console warning
2024-05-26 17:51:48 +02:00
LJ Sonic
3b14531dc2
Fix spriteinfo indexing
2024-05-26 17:51:20 +02:00
Hanicef
19500742d2
Avoid updating IPv4 MS entry if it failed to register
2024-05-26 13:00:16 +02:00
kaldrum1
b7fdcdf2b2
fix spr2defaults pretty sure
2024-05-25 20:49:29 -07:00
kaldrum1
92fc592966
fix spr2defaults probably
2024-05-25 20:08:43 -07:00
Hanicef
72f2942929
Fix players not rendering on team scoreboards
2024-05-25 18:04:49 +02:00
Lactozilla
341139ea73
Scale the vertical offsets
2024-05-22 23:37:31 -03:00
Lactozilla
6e4eb6292f
Merge branch 'next' into fix-1248
2024-05-22 23:16:49 -03: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
sphere
593ffd2435
Merge branch 'fix-linedef-type-466' into 'next'
...
Fix Linedef type 466
Closes #1246
See merge request STJr/SRB2!2453
2024-05-22 11:21:42 +00:00
sphere
d6df06949d
Merge branch 'fix-1222' into 'next'
...
Fix #1222
Closes #1222
See merge request STJr/SRB2!2448
2024-05-22 11:20:06 +00:00
sphere
a5e89ea032
Merge branch 'flats-as-texpatch-overlap' into 'next'
...
Fix composite "flats as patch" name overlap crash
See merge request STJr/SRB2!2450
2024-05-22 11:16:07 +00:00
sphere
418671863c
Merge branch 'fix-us-intl-console-key' into 'next'
...
Fix keyboard input when certain keys overlap with dead keys
Closes #1174
See merge request STJr/SRB2!2443
2024-05-22 11:14:57 +00:00
Lactozilla
36395bfaac
Copy the flags of the reference slope
2024-05-20 20:25:42 -03:00
Lactozilla
3fb5907eff
Add slope data to lines
2024-05-20 20:10:49 -03:00
Lactozilla
3d4c9eedf8
Revert "Improve slope physics on solid middle textures"
...
This reverts commit e67e225ff2
2024-05-20 20:10:34 -03:00
Lactozilla
6bf58ce870
Revert "Add comments"
...
This reverts commit 3a09c475c7
2024-05-20 20:10:25 -03:00
Refrag
68264e7288
Fix buffer overflow when setting a NETVAR string CVar
...
There was a possible buffer overflow if you tried setting a console var
that had the CV_NETVAR and that was of the string type.
The overflow would happen if you were trying to set the console variable
while in a multiplayer / netgame state.
This commit just increases the size of buf to account for everything
that needs to be written to it.
2024-05-20 10:55:10 +02: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
MIDIMan
a19f843a3e
Implement Lactozilla's suggestions and add 3D model support
2024-05-19 22:21:09 -04:00
Lactozilla
3a09c475c7
Add comments
2024-05-19 22:53:00 -03:00
MIDIMan
7c937a5dc0
Merge branch SRB2:next into mobj-alpha
2024-05-20 01:26:33 +00:00
Lactozilla
e67e225ff2
Improve slope physics on solid middle textures
2024-05-19 20:40:40 -03:00
Lactozilla
3a62ebbe3e
Set correct slope for solid midtextures
2024-05-19 18:56:14 -03:00
Lactozilla
464072d7af
Fix Linedef type 466
2024-05-19 16:24:03 -03:00
Lactozilla
27e1ee710c
Fix #1248
2024-05-19 15:28:55 -03:00
Sally Coolatta
619cf708a1
Fix composite "flats as patch" name overlap crash
2024-05-19 03:57:07 -04:00
Refrag
ccadfd8157
Fix mouse buttons not working in menus with alwaysgrabmouse on
...
This commit fixes #1257 by reintroducing something left out in commit
9f116c7c9e#879 ).
2024-05-19 09:08:00 +02:00
Lactozilla
d90c2ac4b4
Fix #1222
2024-05-19 01:43:02 -03:00
Lactozilla
b3418cd685
Fix #523
2024-05-19 01:29:54 -03:00
Lactozilla
c2b57e2654
Merge branch 'fffffop2' into 'next'
...
Fix backwards compat for SPR2 Super (resolves #1225 )
Closes #1225
See merge request STJr/SRB2!2410
2024-05-14 02:07:11 +00:00
katsy
509df21f25
Fix backwards compat for SPR2 Super ( resolves #1225 )
2024-05-14 02:07:11 +00:00
Hanicef
c2e58b59a9
Fix other builds
2024-05-12 19:54:14 +02:00
Hanicef
911a351eb4
Fix keyboard input when certain keys overlap with dead keys
2024-05-12 19:44:37 +02:00
Vlad Doc
f291c8466c
Merge branch SRB2:next into linux-customshader-compilation-fix
2024-05-09 16:35:45 +00:00
Hanicef
15bf00e5ba
Fix buffer overflow when invoking MusicChange hook
2024-05-08 19:56:03 +02:00
Hanicef
df856aa823
Do not access memory on misaligned addresses
2024-05-07 18:10:31 +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
Lactozilla
da3355a153
Fix #1247
2024-05-04 03:39:41 -03:00
MIDIMan
d626856ae2
Merge branch SRB2:next into mobj-alpha
2024-05-03 14:36:17 +00:00
spherallic
efced4e763
Allow less than 3 emerald shards instead of crashing
2024-05-03 15:54:36 +02:00
Hanicef
c208921c4a
Add tofixed lua function
2024-05-01 17:26:02 +02:00
katsy
b0f5255a0d
Removed thokked when hitting springs
2024-04-28 17:10:34 -05:00
Hanicef
f8650a17a0
Fix aim in splitscreen
2024-04-28 16:21:48 +02:00
Zwip-Zwap Zapony
723b5662ef
Fix CR_PLAYER/CR_PTERABYTE positioning
2024-04-18 20:15:30 +02:00
katsy
92cccd682c
Fix automatic mode z-target bugs and crashes
2024-04-17 18:00:30 -05:00
VladDoc
fb437a3c72
white space fix
2024-04-12 20:38:26 +03:00
Vlad Doc
66a5b2f22f
Merge branch SRB2:next into linux-customshader-compilation-fix
2024-04-11 19:37:12 +00:00
VladDoc
26da1e1e09
Shaders with absent #version directive to compile on linux via prepending of said directive
2024-04-11 22:36:12 +03:00
katsy
b2ff4e6167
Fix PlayerZMovement spam and infinite MFE_JUSTHITFLOOR when standing on a solid object
2024-04-08 00:07:51 -05:00
LJ Sonic
b6544efceb
Merge branch 'long-sprite-names' into 'next'
...
Fix SOC freeslotting including trailing spaces in constant names
See merge request STJr/SRB2!2415
2024-04-07 16:41:34 +00:00
LJ Sonic
829a12e7ac
Fix SOC freeslotting including trailing spaces in constant names
2024-04-07 18:35:58 +02:00
Logan Aerl Arias
ef0fc97bc6
Merge branch SRB2:next into improve-backtrace
2024-04-06 17:59:52 +00:00
LJ Sonic
32a8652c35
Merge branch 'long-sprite-names' into 'next'
...
Sprite names up to 64 character long and 256 frames per sprite
See merge request STJr/SRB2!2394
2024-04-05 17:21:42 +00:00
LJ Sonic
4a9462761a
Fix early free
2024-04-05 19:10:15 +02:00
LJ Sonic
a1649186ce
Fix some error messages
2024-04-05 17:31:42 +02:00
Logan Aerl Arias
aab11cd873
reformat the compare func used in qsort
2024-04-03 18:42:36 -04:00
LJ Sonic
8a6b5d7c0f
Support setting two frames per lump for long sprites
2024-04-04 00:06:33 +02:00
LJ Sonic
22106ef8b1
Fix short sprite names triggering an error
2024-04-03 23:24:54 +02:00
LJ Sonic
245a82112f
Make rotation optional for long sprites
2024-04-03 22:39:58 +02:00
LJ Sonic
eaf0ba6658
Error out when a sprite definition contains a subfolder
2024-04-03 22:07:59 +02:00
LJ Sonic
32a3683e07
Fix error message when a patch is missing
2024-04-03 22:06:03 +02:00
LJ Sonic
f406e9bbb5
Throw a Lua error when R_Frame2Char is called with a frame number without character representation
2024-04-03 20:39:53 +02:00
Logan Aerl Arias
6c628db56a
1st try around sorting the lumps by name
2024-04-03 00:54:35 -04:00
MIDIMan
0062c9fd59
Merge branch SRB2:next into mobj-alpha
2024-04-02 14:12:11 +00:00
Hanicef
2b9cfa8262
Fix crash when spawning a BOT_2PAI on a dedicated server
2024-03-31 18:27:57 +02:00
Hanicef
de74137cae
Use float for calculating aspect ratio
2024-03-30 21:10:09 +01:00
Hanicef
755adb0c46
Fix vertical aim being off when using lack of perspective
2024-03-30 17:58:27 +01:00
Hanicef
fece34cef6
Fix segfault when passing a long string to v.drawString
2024-03-23 13:06:18 +01:00
Hanicef
d0dd329a82
Fix buffer overflow when loading addons through symlinks
2024-03-23 13:01:21 +01:00
Logan Aerl Arias
6b4dac7478
replace CPM with vcpkg
2024-03-23 04:50:19 +00:00
spherallic
dfecbe87b8
Fix FreeBSD build error
2024-03-21 19:30:45 +01:00
sphere
620f1e55aa
Merge branch 'mpss-extratime' into 'next'
...
Make Extra Time powerup work in old-style special stages
See merge request STJr/SRB2!2292
2024-03-21 15:49:12 +00:00
sphere
31367e3e07
Merge branch 'mpss-mixnightscountdown' into 'next'
...
Support LF_MIXNIGHTSCOUNTDOWN for old-style special stages
See merge request STJr/SRB2!2291
2024-03-21 15:49:10 +00:00
sphere
7aa8477443
Merge branch 'fix-time-old-special-softlock' into 'next'
...
Fix softlock on old special stages when running out of time due to being hit
See merge request STJr/SRB2!2398
2024-03-21 15:46:26 +00:00
Alam Ed Arias
95457b8fe0
Fix stringop-truncation warnings for Debian Bookworm builds
2024-03-21 11:03:05 -04:00
Hanicef
d00c6a8ab9
Fix softlock on old special stages when running out of time due to being hit
2024-03-20 22:49:12 +01:00
Hanicef
10365e943a
Use DEFAULTDIR instead of hardcoding .srb2
2024-03-20 20:44:17 +01:00
LJ Sonic
c3a8f452e2
Fix equation slopes breaking with slopes farther than 32k FU away from the map center
2024-03-20 20:30:06 +01:00
Hanicef
8794e411bd
Don't traverse the entire HOME directory to find wads
2024-03-20 19:23:13 +01:00
LJ Sonic
49fa45039e
Fix error report when some frames are missing
2024-03-20 18:06:19 +01:00
Logan Aerl Arias
da1d2919c6
Merge branch SRB2:next into improve-backtrace
2024-03-18 00:40:02 +00:00
LJ Sonic
0e57d70b95
Automatically mirror long sprites for missing rotations
2024-03-17 00:41:38 +01:00
LJ Sonic
f6cb5d563c
Only log sprite and frame additions when at least one was added
2024-03-17 00:40:29 +01:00
LJ Sonic
0f6f6afb44
Fix sprite and frame addition logging
2024-03-17 00:28:25 +01:00
LJ Sonic
761a972927
Fix R_AddSingleSpriteDef for short sprite names
2024-03-17 00:27:19 +01:00
LJ Sonic
4ebda932bb
Cleanup
2024-03-16 19:36:18 +01:00
LJ Sonic
7371566592
Fix error message for too long sprite names
2024-03-16 19:35:56 +01:00
LJ Sonic
dc3436df78
Fix compiler warnings
2024-03-16 18:54:10 +01:00
LJ Sonic
9b6c642345
Fix infinite loop
2024-03-16 18:13:43 +01:00
LJ Sonic
a0c253f81e
Fix invalid syntax
2024-03-16 17:49:34 +01:00
LJ Sonic
de8a4bb3e1
Fix compiler warnings
2024-03-16 17:21:35 +01:00
LJ Sonic
a6b71826f9
Use R_GetSpriteNumByName everywhere
2024-03-16 17:00:59 +01:00
LJ Sonic
45d54c38f7
Use bitarray_t for used_spr
2024-03-16 16:26:33 +01:00
LJ Sonic
b3844a9ca5
Cleanup initfreeslots()
2024-03-16 16:14:52 +01:00
SSNTails
8e43f0a46e
Merge branch SRB2:next into issue1133
2024-03-16 14:38:00 +00:00
SSNTails
b4ad054422
Zwip Zwap Zapony's suggestions
2024-03-16 10:28:49 -04:00
LJ Sonic
178d29cf0c
Allow up to 256 frames per sprite
2024-03-16 00:51:23 +01:00
SSNTails
2181dadb4c
Checking MFE_VERTICALFLIP matching is actually redundant..
2024-03-15 16:39:37 -04:00
Hanicef
01b017019b
Fix spectator list not compensating for non-green resolutions
2024-03-15 21:35:28 +01:00
LJ Sonic
99a9e5fcc9
Add support for LongSprites/ folder
2024-03-15 21:22:12 +01:00
LJ Sonic
42c610af9c
Fix GetFramesAndRotationsFromShortLumpName
2024-03-15 21:02:41 +01:00
LJ Sonic
33f176fd5b
Refactor R_AddSingleSpriteDef
2024-03-15 20:15:38 +01:00
LJ Sonic
837c3a7be3
Refactor R_AddSingleSpriteDef
2024-03-15 20:06:21 +01:00
SSNTails
a58d9036bc
Restore MF2_OBJECTFLIP/MFE_VERTICALFLIP on rollout rock disconnect
2024-03-15 14:28:44 -04:00
LJ Sonic
1c415749f7
Refactor R_AddSpriteDefs
2024-03-15 15:45:35 +01:00
LJ Sonic
092ac6643e
Allow sprite names with up to 64 characters
2024-03-14 20:32:10 +01:00
LJ Sonic
8073b8b3f0
Fix rare Lua bug when updating a SPR_ constant
2024-03-14 20:20:12 +01:00
LJ Sonic
9ca5ce01f1
No longer store wadnum in sprnames
2024-03-14 13:56:47 +01:00
Lactozilla
e44c751187
Fix #1215
2024-03-14 04:13:09 -03:00
Lactozilla
7469a6271b
Fix #1219
2024-03-14 00:59:49 -03:00
BarrelsOFun
cfc23648f5
Transform FlingRing instead of spawning new Ring
2024-03-13 19:58:24 -07:00
SSNTails
34cf7c1a01
I don't think flipping the flag here is even needed...
2024-03-13 18:08:07 -04:00
sphere
4018a7fa0f
Merge branch 'udmf-nophysicsequation' into 'next'
...
Add sector flags to disable equation slope physics
See merge request STJr/SRB2!2028
2024-03-13 17:38:45 +00:00
sphere
70626a683f
Add sector flags to disable equation slope physics
2024-03-13 17:38:45 +00:00
spherallic
0f9ed1b822
Write colormap alpha to textmap in old range, for now
2024-03-13 14:57:37 +01:00
sphere
dedd80a0f0
Merge branch 'issue1195' into 'next'
...
Issue #1195 - Standing at a corner under steam, but far away enough to not be...
See merge request STJr/SRB2!2318
2024-03-13 13:49:49 +00:00
sphere
b750876f7e
Merge branch 'issue1150d' into 'next'
...
Fix Issue #1150 plus some small refactoring
See merge request STJr/SRB2!2357
2024-03-13 13:32:11 +00:00
sphere
1b060d2b34
Merge branch 'fruits-clipper' into 'next'
...
NiGHTS text improvements
Closes #1121
See merge request STJr/SRB2!2165
2024-03-13 13:03:33 +00:00
sphere
a3165cbbee
Merge branch 'maretimers' into 'next'
...
Allow per-mare time limits in NiGHTS
See merge request STJr/SRB2!2137
2024-03-13 13:03:29 +00: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
spherallic
8dce0e1a3f
Prevent white flash upon starting the game (in Software)
2024-03-12 17:29:08 +01:00
spherallic
373e23dd90
Merge branch 'next' into quick-intro
2024-03-12 17:19:36 +01:00
MIDIMan
8fb5f88f89
Merge branch SRB2:next into mobj-alpha
2024-03-11 00:03:44 +00:00
MIDIMan
22d7f392d0
Move some stuff around in P_DoBoss5Death
2024-03-10 19:34:21 -04:00
MIDIMan
f354c0b2ea
Fix Fang's death sequence
2024-03-10 10:44:08 -04: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
Hanicef
7d3c0ca301
Fix finished players getting kicked for idling
2024-03-09 23:57:11 +01:00
Hanicef
7e3f6a2803
Add variable to move idle players to spectators
2024-03-09 23:54:52 +01:00
spherallic
31e58f1156
Rewrite aligned string drawing, using a modified version of strtok
2024-03-09 18:08:02 +01:00
spherallic
444cfc180f
Use alignment enum for drawing aligned font strings
2024-03-08 00:39:53 +01: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
sphere
33a1776f97
Merge branch 'issue1211' into 'next'
...
Fixes Issue #1211 - cut the amplitude on OpenGL water wave effect
See merge request STJr/SRB2!2381
2024-03-07 12:50:14 +00:00
sphere
6adfe7a829
Merge branch 'forceshieldhp' into 'next'
...
Show extra Force Shield hits using text instead of stacking more icons
See merge request STJr/SRB2!2378
2024-03-07 12:22:35 +00:00
sphere
4faa429f43
Merge branch 'issue1040' into 'next'
...
Fixes Issue #1040
See merge request STJr/SRB2!2377
2024-03-07 12:09:12 +00:00
sphere
3c0761f8fe
Merge branch 'fix-players-idle-kick-cutscene' into 'next'
...
Fix players getting kicked by auto-kick during cutscenes
See merge request STJr/SRB2!2384
2024-03-07 12:08:13 +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
MIDIMan
29378e7f94
Merge branch SRB2:next into mobj-alpha
2024-03-06 02:26:50 +00:00
Hanicef
51e912e87b
Fix segfault when passing NULL as player
2024-03-05 18:29:07 +01:00
Hanicef
b3aa23bc21
Remove unused variable
2024-03-05 18:23:23 +01:00
Hanicef
259997d121
Remove varargs from P_SpawnMobjFromMobj
2024-03-05 18:23:22 +01:00
Hanicef
02811b72f6
Fix segfault when trying to spawn an MT_PLAYER from Lua
2024-03-05 18:22:27 +01:00
Logan Aerl Arias
d2a068d158
Merge branch SRB2:next into issue1040
2024-03-04 17:21:35 +00:00
Logan Aerl Arias
084f7bc4f7
Merge branch SRB2:next into playersetup-and-continue-lua
2024-03-04 17:21:26 +00:00
spherallic
fdb23298f6
fix spacing that gitlab freaked out over
2024-03-04 15:25:25 +01:00
sphere
261e2d4347
bruh
...
# Conflicts:
# src/doomstat.h
2024-03-04 14:23:45 +00:00
spherallic
6768bc7178
Merge branch 'next' into maretimers
2024-03-04 15:17:04 +01:00
sphere
cf7adfc8ac
Merge branch 'fix-missing-hud-entry' into 'next'
...
Fix missing HUD item for Lua
See merge request STJr/SRB2!2383
2024-03-04 13:49:28 +00:00
Logan Aerl Arias
8cb18088b5
Merge branch SRB2:next into issue1150d
2024-03-04 13:35:11 +00:00
Logan Aerl Arias
33940e46bf
Merge branch 'remove-opengl-chromakey' into 'next'
...
Make the display of palette index 255 consistent between renderers
Closes #405
See merge request STJr/SRB2!2351
2024-03-04 13:31:23 +00:00
Logan Aerl Arias
f4b862068c
Merge branch 'texture-scaling-fixes' into 'next'
...
Fix various issues related to texture scaling
See merge request STJr/SRB2!2329
2024-03-04 13:30:11 +00:00
Logan Aerl Arias
4aee720bce
Merge branch 'issue1188' into 'next'
...
Fix #1188
Closes #1188
See merge request STJr/SRB2!2354
2024-03-03 23:55:18 +00:00
Logan Aerl Arias
add091bac4
Merge branch 'substitute-null-with-ray' into 'next'
...
Substitute MT_NULL with MT_RAY in Lua
See merge request STJr/SRB2!2302
2024-03-03 23:39:49 +00:00
Logan Aerl Arias
bcc0eb39ea
Merge branch 'remove-NOPNG' into 'next'
...
if PNG graphics support is removed, it is not netplay compatible
See merge request STJr/SRB2!2260
2024-03-03 23:37:53 +00:00
