spherallic
0c7abd88fe
Merge branch 'next' into fullscreen-toggle
2022-03-08 23:50:40 +01:00
spherallic
50330c746b
Merge branch 'next' into fast-r-load-textures
2022-03-08 22:11:16 +01:00
katsy
b161cb4588
e
2022-03-08 01:06:01 +00:00
katsy
86336d6bed
remove MODID check from hooklib to fix compile issue
2022-03-07 18:33:15 -06:00
Sally Coolatta
c0a2d31a22
Merge remote-tracking branch 'upstream/2210-release' into refresh-spr2
2022-03-07 13:09:06 -05:00
spherallic
82fb731cab
:dramahog:
2022-03-06 22:52:43 +01:00
spherallic
098fcaa4b0
2.2.10
2022-03-06 20:22:22 +01:00
sphere
7e26377264
Merge branch 'state-changes' into 'next'
...
Update Nightopians & other state changes
See merge request STJr/SRB2!1744
2022-03-06 15:45:59 +00:00
sphere
ab711128c7
Merge branch 'tutorial-scenery' into 'next'
...
Tutorial scenery
See merge request STJr/SRB2!1722
2022-03-06 15:45:53 +00:00
sphere
8e6174ab2d
Merge branch 'emblemhealth' into 'next'
...
Fix #805
Closes #805
See merge request STJr/SRB2!1757
2022-03-06 15:44:50 +00:00
sphere
00117476e1
Merge branch 'mobj-spawn-null-fix' into 'next'
...
Spawn MT_RAY when attempting to spawn MT_NULL
Closes #801 and #800
See merge request STJr/SRB2!1751
2022-03-06 11:52:44 +00:00
sphere
f7eafeb665
Merge branch '2022' into 'next'
...
2022
See merge request STJr/SRB2!1754
2022-03-06 11:52:31 +00:00
spherallic
77d4f873b0
Add upper bound to emblemlocations[] access.
2022-03-06 12:20:41 +01:00
aiire
6040f97dd5
added FF_FULLBRIGHT to S_THUNDERCOIN_SPARK
2022-03-04 23:25:25 +00:00
sphere
1abe2689f3
Merge branch 'fix-nonet-2210' into 'next'
...
Fix warning when compiling with NONET=1
See merge request STJr/SRB2!1753
2022-03-04 09:49:36 +00:00
sphere
980bcb4775
Merge branch 'fix-nohw-perfstats-next' into 'next'
...
Fix perfstats failing to compile with NOHW=1
See merge request STJr/SRB2!1728
2022-03-04 09:49:15 +00:00
aiire
8c1991d674
added FF_FULLBRIGHT to S_IVSP
2022-03-04 02:57:45 +00:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
spherallic
3b75ef7e76
Fix warning when compiling with NONET=1
2022-03-03 12:08:15 +01:00
SteelT
893ea10a67
Turn the console warning into a devmode print because turns out it happens more often than I thought
2022-03-02 12:46:24 -05:00
SteelT
34f8464cbf
Spawn MT_RAY when attempting to spawn MT_NULL
...
Some code assumes that P_SpawnMobj can never return NULL
So spawn MT_RAY in it's place when attempting to spawn MT_NULL and show a console warning
2022-03-02 12:35:03 -05:00
sphere
a57a0985ee
Merge branch 'mt_ray' into 'next'
...
Move MT_RAY to the very end of the mobj list
See merge request STJr/SRB2!1747
2022-02-28 15:13:09 +00:00
sphere
0ad2ac68f7
Merge branch 'demo-frameflags' into 'next'
...
Convert old frame flags in Metal recordings to their 2.2.10 equivalents
Closes #775
See merge request STJr/SRB2!1742
2022-02-28 15:12:28 +00:00
spherallic
d624ee2541
Revert "minor spike optimisations"
...
This reverts commit b2d693a547
2022-02-28 14:30:01 +01:00
Sally Coolatta
f7b166da07
Refresh sprite2s
...
Allows for custom characters to be loaded first, then a wad that adds a custom sprite2, and the custom character's sprite2s won't be discarded.
2022-02-27 07:56:45 -05:00
spherallic
a6c52f5bad
Move MT_RAY to the very end of the mobj list.
2022-02-22 15:49:16 +01:00
sphere
d6f3522333
Merge branch 'fix-vflag-blendmodes' into 'next'
...
Fix blendmode V_ flags not working at full opacity in Software
See merge request STJr/SRB2!1717
2022-02-21 19:58:24 +00:00
spherallic
fcc28d0714
Update seaweed state to utilize new features & sprites.
2022-02-21 16:00:21 +01:00
spherallic
946100939a
Update editor configurations & increase Nightopians' hitbox height.
2022-02-19 22:19:39 +01:00
sphere
d532546e46
Merge branch 'mt-null-spawning' into 'next'
...
Remove MT_NULL hacks
Closes #721
See merge request STJr/SRB2!1729
2022-02-19 20:24:34 +00:00
sphere
249a3dfa25
Merge branch 'eggman-hitboxes' into 'next'
...
Increase Eggman's hitboxes
See merge request STJr/SRB2!1706
2022-02-19 20:24:20 +00:00
sphere
c79c6531e6
Merge branch 'server-bots' into 'next'
...
Improve bots (resolves #710 )
Closes #710
See merge request STJr/SRB2!1679
2022-02-19 20:24:12 +00:00
spherallic
f077021591
Clean up renderer toggle at SteelT's suggestion.
2022-02-19 15:15:06 +01:00
spherallic
7d1faf7e2c
Handle invalid resolutions, make Backspace work in resolution menu.
2022-02-19 12:12:04 +01:00
sphere
7218060a7a
:lachyes:
2022-02-19 01:49:19 +00:00
sphere
14cb5415c9
Merge branch 'fix-portals' into 'next'
...
Fix portals
See merge request STJr/SRB2!1724
2022-02-17 12:26:27 +00:00
sphere
a8c2c4ebe6
Merge branch 'checkbotname' into 'next'
...
Fix #732
Closes #732
See merge request STJr/SRB2!1739
2022-02-17 12:26:22 +00:00
spherallic
2266e31038
Merge branch 'next' into state-changes
2022-02-17 12:35:34 +01:00
spherallic
a4778075b2
Convert old frame flags in Metal recordings to their 2.2.10 equivalents.
2022-02-14 14:57:00 +01:00
SMS Alfredo
2033b77b46
Actually do the thing
2022-02-11 00:33:49 -06:00
spherallic
bb84ae1793
Decrease hitbox sizes to prevent collision with thin air.
2022-02-10 13:10:56 +01:00
spherallic
9fee550fb0
Actually check bot names in lib_gAddPlayer.
2022-02-08 14:58:09 +01:00
spherallic
3da52592f2
Merge branch 'next' into fullscreen-toggle
2022-02-07 23:05:15 +01:00
Sally Coolatta
e28ce265dc
Merge branch 'next' into action-super-fix
2022-02-06 18:53:10 -05:00
Sally Coolatta
c53f57a22f
Handle super stack more intelligently
...
Counted per action type, and it is decremented after the function is called instead of keeping its old value or even resetting completely when using multiple actions together.
2022-02-06 18:31:10 -05:00
Sally Coolatta
dcdbdec2bf
Make super for A_Actions act as described
2022-02-06 15:16:30 -05:00
LJ Sonic
fdee3a2b7f
Merge branch 'ms_update_command' into 'next'
...
Allow people to update their Master Server listing on command.
See merge request STJr/SRB2!1518
2022-02-06 18:53:49 +00:00
LJ Sonic
c00d1e5499
Merge branch 'no-dedi-sighandle-window' into 'next'
...
Disable SDL error message on dedicated servers
See merge request STJr/SRB2!1735
2022-02-06 17:44:48 +00:00
LJ Sonic
81b0eb1c7c
Merge branch 'crosshairs' into 'next'
...
Fix crosshairs not displaying
See merge request STJr/SRB2!1716
2022-02-06 17:30:15 +00:00
LJ Sonic
9c5427555b
Merge branch 'fix-exitgame-ztarget-crash' into 'next'
...
Fix lock-on crash (Resolves #746 )
Closes #746
See merge request STJr/SRB2!1704
2022-02-06 17:24:01 +00:00
