Commit graph

9868 commits

Author SHA1 Message Date
Jaime Passos
ea6a35f3cd Merge branch 'amycrash' into 'master'
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables

See merge request STJr/SRB2!823
2020-02-25 20:38:15 -05:00
Jaime Passos
c1156ef29c Fix (technically functional) string comparison counting an extra character in the comparison length 2020-02-25 22:34:19 -03:00
Jaime Passos
31be6ef867 Fix TYPEOFLEVEL options not having enough bits for TOL_ flags 2020-02-25 22:30:34 -03:00
LJ Sonic
9a23fface3 Merge branch 'realmo' into 'next'
Let Lua access spectator mobjs

See merge request STJr/SRB2!756
2020-02-25 15:06:29 -05:00
Jaime Passos
b8e8b5517d Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables 2020-02-24 20:03:08 -03:00
Steel Titanium
fcfaa0efde Fix new skin colors using default chat color 2020-02-24 16:58:19 -05:00
fickleheart
614bbafc1b Increase COM_BUF_SIZE
The config file is starting to get close to the old max,
so this should be enough headroom for a while...
2020-02-24 11:45:22 -06:00
fickleheart
d3218a2431 Fix ExecCfg not working on files added via command line 2020-02-24 11:44:45 -06:00
fickleheart
1e656618f6 Allow using lump names in ExecCfg 2020-02-24 11:44:27 -06:00
sphere
24511e67fc Allow emblem hints (and radar) in record attack. 2020-02-24 17:31:30 +01:00
fickleheart
663403e016 Skip empty gametypes in level select menu 2020-02-24 10:02:48 -06:00
Jaime Passos
03f81accc2 Merge branch 'spectator-is-it' into 'next'
Don't get chosen as the tagger if you're a spectator

See merge request STJr/SRB2!815
2020-02-23 20:37:27 -05:00
fickleheart
6734fbc49a Fix MD2 rollangle in reverse gravity 2020-02-23 18:44:22 -06:00
fickleheart
0427c6d282 Add music position functions to Lua 2020-02-23 17:58:32 -06:00
fickleheart
5aebc0ed6d Add JingleStatus hook for carrying custom jingle tunes
The extra argument is the music name, as passed into
P_PlayJingleMusic(player, musname), to run the hook for, optional.
Arguments are (player, musname) - the latter to allow global hooks
that still differentiate between different tracks.
2020-02-23 17:20:44 -06:00
fickleheart
578d1d4f39 Expose P_PlayJingle/Music() to Lua 2020-02-23 17:19:18 -06:00
James R
c69ca7381c Merge branch 'console-in-menus-mk-ii' into 'master'
Console in menus again!

See merge request STJr/SRB2!797
2020-02-23 18:15:43 -05:00
James R
a1fd09c7bc Merge branch 'nomd5-crash' into 'master'
Fix crash under NOMD5

See merge request STJr/SRB2!807
2020-02-23 18:15:04 -05:00
James R
7becbcefbe Merge branch 'exitmove-hideflags' into 'master'
Don't spawn the exitmove flags in Single Player

See merge request STJr/SRB2!813
2020-02-23 18:13:38 -05:00
Jaime Passos
75ff8c1789 Don't get chosen as the tagger if you're a spectator 2020-02-23 19:28:16 -03:00
fickleheart
d55ef8db71 Make P_PlayLivesJingle player optional in Lua 2020-02-23 15:40:59 -06:00
fickleheart
c23e8d2cbd Disable NOHUD/INLEVEL checks on Lua sound functions
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
2020-02-23 12:50:45 -06:00
Snu
8796517177 Merge branch 'master' into supergoldedit 2020-02-23 17:57:39 +00:00
Jaime Passos
745a6bb0f0 Fix incorrect newdisplayplayer in forced ViewpointSwitch 2020-02-23 12:14:52 -03:00
Tatsuru
9368818731 Oopsie 2 2020-02-22 22:36:44 -03:00
Tatsuru
2e71bbf96e Oopsie 2020-02-22 21:14:05 -03:00
SteelT
8328c2a9b7 Merge branch '2.2.2-prep' into 'next'
2.2.2 preparation

See merge request STJr/SRB2!811
2020-02-22 17:27:19 -05:00
Steel Titanium
4f5694fa14 Enable use of the patch file 2020-02-22 16:42:24 -05:00
Steel Titanium
c7778af7d6 Update version number to 2.2.2 2020-02-22 16:37:13 -05:00
Louis-Antoine
2857508dfc Fix buffer overrun with nodeless players 2020-02-22 15:08:17 +01:00
James R
f8c9912d25 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R
1a251ccee2 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R
4d77611752 Register servername etc. under NOMD5
This fixes crashes in the menus.
2020-02-21 20:04:28 -08:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT
0d02983d97 Merge branch 'warp-gamedata-corruption-fix' into 'next'
Warp gamedata corruption fix

See merge request STJr/SRB2!802
2020-02-21 21:00:29 -05:00
SteelT
fcb0c62bf7 Merge branch 'update-copyright-year' into 'master'
Update copyright year

See merge request STJr/SRB2!801
2020-02-21 20:59:56 -05:00
Louis-Antoine
c785fc2132 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine
59a53908e5 Improve join refusal handling 2020-02-22 02:17:21 +01:00
Louis-Antoine
6739fcff69 Replace MAX_WADPATH with plain numbers
This is not ideal either, but I would rather
not use a constant for something unrelated.
2020-02-21 17:31:32 +01:00
Louis-Antoine
325872de4e Fix weird comment style 2020-02-21 17:17:39 +01:00
James R
e6dafe3002 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R
441be52fd8 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R
168a1325f7 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R
26ff2e0355 Fix compiler warnings 2020-02-20 17:18:26 -08:00
James R
aa0d40212e Merge branch 'ogl-colorbug' into 'master'
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
2020-02-20 19:32:34 -05:00
James R
4331b13952 Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
Snu
36fc21790b Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour
18e3134efd Make hook_FollowMobj a mobj hook instead of a player hook
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
2020-02-20 16:40:39 -05:00
Monster Iestyn
8eb80cbf75 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn
7ee6ff2b03 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00