Commit graph

14498 commits

Author SHA1 Message Date
Jaime Passos
1b272067ad Merge remote-tracking branch 'origin/next' into tolflag-fix 2020-03-02 13:14:12 -03:00
Louis-Antoine
ad1b4066d9 Increase the length of the player input buffer 2020-03-02 15:36:28 +01:00
LJ Sonic
cb2528ccc8 Merge branch 'fix-io-warning' into 'next'
Fix compiler warning

See merge request STJr/SRB2!833
2020-03-02 07:46:46 -05:00
Louis-Antoine
af5500575b Fix warning and formatting 2020-03-02 13:33:12 +01:00
sphere
422bc7439b Actually use the "SCREENSHOT OPTIONS" header for its menu. 2020-03-02 13:23:54 +01:00
Jaime Passos
84f977ff7a Fix G_TOLFlag returning the wrong type 2020-03-02 00:20:53 -03:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -05:00
Sally Cochenour
834225c597 One more... I swear it's the last... 2020-03-01 17:50:58 -05:00
Sally Cochenour
7a3733d75c More remenants 2020-03-01 17:37:10 -05:00
Sally Cochenour
30d391b6b2 FINISH removing the shadows... 2020-03-01 17:35:49 -05:00
Sally Cochenour
c17f4dcf15 Remove our shadows 2020-03-01 17:07:52 -05:00
Sally Cochenour
65e9aeec62 This was in the wrong place 2020-03-01 16:03:31 -05:00
Sally Cochenour
48ff9ddf85 Move overtime stuff to k_battle.c 2020-03-01 15:58:00 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
0c1d0d8f5c Don't need abs here 2020-03-01 14:56:16 -05:00
Sally Cochenour
885d6fea1f Merge branch 'master' into special-sector-tweak 2020-03-01 14:50:45 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
Sally Cochenour
6956e1d24e Store random states in mobjinfo instead of precipprops
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
Jaime Passos
ef7855fca4 Merge branch 'tol-moment' into 'next'
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags

See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
e0f3a5b8f5 Merge branch 'lua-io' into 'next'
Support for Lua's I/O library

See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
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
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
Sally Cochenour
a63157b937 Flip facing direction 2020-02-25 00:04:39 -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
James R
ea8fd7348f Show lagless for all the host's splitscreen players 2020-02-23 23:23:50 -08:00
James R
f9b5f71171 Merge branch 'gentlemen' into parties 2020-02-23 23:22:37 -08:00
James R
8619ec4d0f Fix first person camera angle in parties 2020-02-23 23:21:20 -08:00