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
Jaime Passos
41469d0116
Remove unused SOC menu types
2020-02-23 22:31:17 -03: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
Jaime Passos
7a34372885
Let spectators decide where they spawn
...
Also fixes some issues with tag gametypes
2020-02-23 19:23:00 -03:00
fickleheart
d55ef8db71
Make P_PlayLivesJingle player optional in Lua
2020-02-23 15:40:59 -06:00
Jaime Passos
48a9ea8d0e
Turn players IT if they join the game after the hide time in tag gametypes
...
Except in gametypes with hide time stasis, because they can't change team.
2020-02-23 17:02:50 -03:00
Jaime Passos
8efba0e367
Allow countdown time-up in any campaign gametype
2020-02-23 16:50:36 -03:00
Jaime Passos
1b9a6fed3e
Same here
2020-02-23 16:46:45 -03:00
Jaime Passos
990df8e8c0
Consider Co-Op here as any campaign gametype
2020-02-23 16:45:01 -03:00
Jaime Passos
4d94689af7
Scan for emeralds in gametypes with Emerald Hunt
2020-02-23 16:41:39 -03:00
Jaime Passos
1d5f9ed292
Always allow skin switching in friendly gametypes
2020-02-23 16:40:52 -03:00
Jaime Passos
220cf7bd89
Don't reset player between maps in campaign gametypes
2020-02-23 16:40:16 -03:00
Jaime Passos
84cde74bda
Award pink shields in friendly gametypes
2020-02-23 16:38:32 -03: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
SwitchKaze
09373133a1
Fix userdataType typo
2020-02-23 12:17:52 -05:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
Jaime Passos
745a6bb0f0
Fix incorrect newdisplayplayer in forced ViewpointSwitch
2020-02-23 12:14:52 -03:00
lachwright
6e471ef8b2
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00
Tatsuru
9368818731
Oopsie 2
2020-02-22 22:36:44 -03:00
Tatsuru
2e71bbf96e
Oopsie
2020-02-22 21:14:05 -03:00
James R
ac4cb796d0
Add patch_music.pk3
2020-02-22 14:43:41 -08: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
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05: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
lachwright
db766f02a5
Merge branch 'next' into knuxtweaks
2020-02-21 16:28:17 +08: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