Commit graph

1682 commits

Author SHA1 Message Date
Sally Cochenour
084901a8b1 Add warnings for old map setups
We probably don't want to keep these for release, but we need reminders to get rid of them ourselves :V
2020-03-15 19:21:06 -04:00
Sally Cochenour
c6f3ac651e Switch red & blue sparks, add yellow sparks, add big spark sprites 2020-03-14 01:43:54 -04:00
Nev3r
63fb8f846b Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-03-11 09:31:31 +01:00
Monster Iestyn
f186def0bf Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Sally Cochenour
83c74af696 Fix bad master merge 2020-03-06 12:56:12 -05:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
James R
253ab49c07 Merge remote-tracking branch 'origin/master' into 22shadows 2020-03-05 21:36:58 -08:00
Sal
b13ebd6d15 Merge branch 'special-sector-tweak' into 'master'
Fix step-up on stairs for other objects (Orbinaut VS Toxic Palace Stairs)

See merge request KartKrew/Kart!201
2020-03-06 00:10:35 -05:00
Sal
10fe9434f6 Merge branch 'blizzard' into 'master'
Weather system refactor, Blizzard weather type

See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sally Cochenour
ff190b7a88 Fix unsigned/signed comparison 2020-03-03 17:05:04 -05:00
Tatsuru
06a2882dc9 Never forget who your enemy is 2020-03-03 11:40:35 -03:00
Sally Cochenour
18637b9eb2 2.2 shadow port 2020-03-01 22:12:50 -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
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
SwitchKaze
9508b23d85 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-29 23:41:16 -05:00
Jaime Passos
9d0e3465f9 G_CoopGametype, for all the GT_COOP cases 2020-02-29 00:57:22 -03: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
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
Sally Cochenour
40b21a60f6 Fix merge 2020-02-24 01:07:12 -05:00
Sally Cochenour
c7daa33bb8 Merge branch 'master' into draw-flags 2020-02-24 00:52:45 -05:00
SwitchKaze
99a1840101 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
lachwright
6e471ef8b2 Start CA_GLIDEANDCLIMB swimming functionality 2020-02-23 15:38:11 +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
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
Tatsuru
c562a4eea4 Standards 2020-02-18 22:46:16 -03:00
MascaraSnake
c2311dca45 Merge branch 'next' into udmf-next 2020-02-18 18:39:11 +01:00
fickleheart
598f66a997 Let scripters see if player just launched from slope 2020-02-16 21:34:07 -06:00
James R
2615806bf8 Turn the shadow scale if-else into a switch statement, for sake of editing and in case object types ever change 💦 2020-02-02 18:00:02 -08:00
James R
4f41da1d16 Merge branch 'starpost-config-additions' into 'next'
Starpost config additions

See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
lachwright
56c5132c79 Merge branch 'next' into platform-fixes 2020-01-26 04:34:57 +08:00
MascaraSnake
485f505142 Skyboxes: Remove obsolete modulo operation 2020-01-25 15:37:23 +01:00
Louis-Antoine
e04596d611 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
MascaraSnake
08386ead09 Use tag instead of angle for skyboxes 2020-01-25 10:26:38 +01:00
Louis-Antoine
f07b432df4 Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
fickleheart
3f570ab888 Bosses need dropshadows too 2020-01-17 00:16:15 -06:00
lachwright
9a41bca7d7 Reset pmomz after transfer to momz 2020-01-16 22:56:01 +08:00
fickleheart
52d9c08b71 Allow starpost Parameter to dictate order 2020-01-11 22:26:20 -06:00
fickleheart
d2c6af1167 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
fickleheart
d5b0ba7659 Fix player shadows while on rope hangs etc 2020-01-11 17:39:53 -06:00