SwitchKaze
8714a52cbb
Bruh.
2020-02-29 23:44:56 -05:00
SwitchKaze
9508b23d85
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
SwitchKaze
044e19e328
Prohibit modification of built-in colors
...
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
2020-02-29 23:14:49 -05:00
Jaime Passos
fa8e87ea16
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Monster Iestyn
97f8526e01
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Jaime Passos
ea756fd557
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
9d0e3465f9
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
d831163487
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-28 23:52:33 -03:00
Jaime Passos
d5f6e5fcc6
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
33f58f006d
Score adding and stealing should check the gametype's rules.
2020-02-28 23:41:10 -03:00
Jaime Passos
895c226548
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
604c05801a
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
Jaime Passos
86dd35c32b
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
623974bf88
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
0b63c2a3cc
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
Jaime Passos
d62090afae
Fix ACZ fence texture
2020-02-28 17:33:58 -03:00
Jaime Passos
875afea599
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
2020-02-28 17:31:41 -03:00
Jaime Passos
43efbe4ba5
Merge remote-tracking branch 'origin/master' into next
2020-02-25 22:43:15 -03:00
Jaime Passos
2d1321e310
Merge branch 'new-color-chat-fix' into 'master'
...
Fix new skin colors using default chat color
See merge request STJr/SRB2!822
2020-02-25 20:38:36 -05:00
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
fickleheart
782c710246
Fix menu enterwipes being overridden?
2020-02-24 18:00:52 -06:00
fickleheart
eaeae45ec2
Use a named macro for menu hierarchy
...
This _really_ needs to be a UINT8 array instead of
all this bit-shifting nonsense that saves no space,
but at least this way reading the menu structs doesn't
make me want to die.
2020-02-24 18:00:17 -06:00
fickleheart
564cb7d41c
Fix missing menuname entries
2020-02-24 17:56:00 -06: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
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
