sphere
9925e96365
Merge branch 'if-range-demoversion' into 'next'
...
Use if-range checks instead of switch for demo versions
See merge request STJr/SRB2!2164
2023-10-06 13:19:48 +00:00
SMS Alfredo
290fc9f81f
Restore Ringslinger Collectable Behavior
2023-10-05 12:04:46 -05:00
SMS Alfredo
7632113d57
Oops Whitespace
2023-10-05 11:50:17 -05:00
SMS Alfredo
01491a4d31
Undo Unintentional Changes
2023-10-05 11:36:19 -05:00
SMS Alfredo
c3640c5aa9
Merge branch 'next' into pit-savior
2023-10-05 11:30:02 -05:00
Eidolon
219dac16cb
Merge branch 'improve-point-in-subsector-performance' into 'next'
...
Avoid branch prediction slowdowns in R_PointOnSide
See merge request STJr/SRB2!2168
2023-10-05 12:26:51 +00:00
Hannu Hanhi
8008981647
Add hw_shaders.c to hardware/CMakeLists.txt
2023-10-03 19:35:18 +03:00
spherallic
733dabe9a0
Coins?
2023-10-02 23:31:21 +02:00
Gustaf Alhäll
12d595399e
Avoid branch prediction slowdowns in R_PointOnSide
2023-10-01 17:34:13 +02:00
Lactozilla
c09305de62
Minor refactoring
2023-09-23 20:43:59 -03:00
Lactozilla
28e6b97299
Fix R_DrawFlippedColumnInCache and R_DrawBlendColumnInCache
2023-09-23 20:30:50 -03:00
Lactozilla
e30523264c
Merge remote-tracking branch 'stjr/next' into patch-refactor
2023-09-23 20:28:24 -03:00
Hannu Hanhi
a47e1fb272
Merge tag 'SRB2_release_2.2.13' into ogl-palette-rendering-merge13
...
SRB2 release v2.2.13
2023-09-23 19:38:27 +03:00
Lactozilla
57465a1a56
Fix minor grammatical mistake
2023-09-22 15:00:07 -03:00
Zwip-Zwap Zapony
fb9e6c9c6d
Use if-range instead of switch for demo versions
2023-09-22 18:16:54 +02:00
Monster Iestyn
340eee8691
Added some notes related to FEETADJUST for reference, made another tweak
2023-09-21 16:13:55 +01:00
Monster Iestyn
ee0bab2941
Remove adjustfeet parameter from Patch_GetRotatedSprite, remove [2] from spriteframe_t's rotated array.
...
Following from my previous commit, these things are no longer needed: they existed ONLY for adding FEETADJUST offsets to rotated sprites in Lua HUD code.
2023-09-21 15:50:30 +01:00
Monster Iestyn
5e501bae07
v.getSpritePatch/v.getSprite2Patch fix: Fix offset inconsistency between rotated sprites and non-rotated sprites
...
This was caused by rotated sprites having FEETADJUST offsets applied, when non-rotated sprites did not. FEETADJUST is not actually needed in the HUD, so I've removed it from the rotated sprites (thankfully this is also the easiest way to fix it too)
2023-09-21 13:19:38 +01:00
Lactozilla
8fd9a82a19
Raise sidedef limits
...
Also, fixes reading of GL3 nodes to use 32-bit indices for line IDs.
2023-09-21 02:06:06 -03:00
sphere
a373d96d07
Merge branch 'fix-overflow-scrolling-background' into 'next'
...
Fix buffer overflow when displaying a scrolling background
See merge request STJr/SRB2!2010
2023-09-20 16:10:56 +00:00
sphere
1c4419ee56
Merge branch 'fix-minecart-debug-build' into 'next'
...
Fix memory leak when other players are riding a minecart
See merge request STJr/SRB2!2146
2023-09-20 15:26:41 +00:00
sphere
e15326081b
Merge branch 'fix-cmake-compiling' into 'next'
...
Fix CMake Compiling
Closes #1116
See merge request STJr/SRB2!2157
2023-09-20 15:20:07 +00:00
spherallic
05926ceec8
Group NiGHTS star/chip hitboxes with rings
2023-09-20 15:42:19 +02:00
SMS Alfredo
7bcad024f8
Only Award Bonuses / RA Emblems from Physically Beating a Level
2023-09-19 21:48:01 -05:00
SMS Alfredo
7da8e2e776
Make the Cheats Command Reflect UsedCheats
2023-09-19 18:10:51 -05:00
SMS Alfredo
ab8aa245d6
Add the Other PlayersForExit Conditions
2023-09-19 17:30:46 -05:00
SMS Alfredo
71b0f002c9
Only Consider ExitLevel a Cheat When Used to Cheat
2023-09-19 17:17:00 -05:00
Gustaf Alhäll
a8fe500d0e
Add auto-kick for inactive players
2023-09-19 19:05:43 +02:00
SMS Alfredo
ecf950e749
Add "allowflip" Parameter to P_DoJump
2023-09-19 11:54:51 -05:00
Zwip-Zwap Zapony
cfedee9dc9
Fix CMake compiling
2023-09-19 18:46:05 +02:00
Lactozilla
6deaf89f72
Merge branch 'fix-minor-spelling-mistakes' into 'next'
...
Fix minor spelling mistake
See merge request STJr/SRB2!2154
2023-09-19 05:07:45 +00:00
Lactozilla
68e25737c0
Fix minor spelling mistake
2023-09-18 18:51:11 -03:00
Lactozilla
731113ea0e
Improve download refusal messages
2023-09-18 18:45:11 -03: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
Gustaf Alhäll
fc20508295
Fix saturation not being applied on colormaps in OpenGL
2023-09-18 18:16:10 +02:00
SMS Alfredo
a977fd6075
Expose P_LineIsBlocking
2023-09-17 18:45:57 -05:00
Gustaf Alhäll
b53b2df7ee
Fix saturation option not being applied on OpenGL
2023-09-17 22:48:26 +02:00
LJ Sonic
8f1618018e
Fix free
2023-09-15 19:12:55 +02:00
SMS Alfredo
cca83fe9e9
Merge branch 'next' into pit-savior
2023-09-14 16:07:41 -05:00
SMS Alfredo
62525d34f1
Merge branch 'next' into pandoradev
2023-09-14 16:05:55 -05:00
Gustaf Alhäll
65547ae036
Fix memory leak when other players are riding a minecart
2023-09-14 18:31:05 +02:00
sphere
f02fd19c5a
Merge branch 'team-gametype-keep-player-color' into 'next'
...
Respect the player's skin and color selection
See merge request STJr/SRB2!2100
2023-09-13 07:59:00 +00:00
Alam Ed Arias
6caff62662
Merge remote-tracking branch 'origin/master' into next
2023-09-12 19:40:54 -04:00
Alam Ed Arias
8558d123ee
SDL: add version check for SDL_OPenURL()
2023-09-12 19:32:47 -04:00
Lactozilla
ebca345a44
Check if in a game
2023-09-12 19:32:15 -03:00
Lactozilla
69df136e2b
Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color
2023-09-12 19:17:07 -03:00
sphere
0f5e80a122
Merge branch 'warpwithoutmapheaderfix' into 'next'
...
Fix "-warp"ing to a level without a map header crashing the game
Closes #1105
See merge request STJr/SRB2!2143
2023-09-12 20:13:46 +00:00
LJ Sonic
06d4d71b41
Fix missing includes for Linux platforms
2023-09-12 19:52:24 +02:00
Zwip-Zwap Zapony
4f6da8dc0f
Fix a "maybe-uninitialized" compiler warning
2023-09-10 16:19:39 +02:00
Lactozilla
5306d2b474
Merge branch 'next' into sector-portals
2023-09-09 22:28:01 -03:00