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
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
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
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
Louis-Antoine
e04596d611
Fix lava removing fire shield
2020-01-25 14:04:16 +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
toaster
1adceb858c
Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually.
2020-01-10 11:43:41 +00:00
James R
f1712f2cd8
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
Alam Ed Arias
f267f7bb3e
whitespace cleanup
2020-01-09 16:19:12 -05:00
toaster
4f77e1e99b
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
MascaraSnake
ce7a1b289f
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
MascaraSnake
3a6614409b
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
James R
cea03e4256
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
lachwright
1811a2a34d
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
Tatsuru
30683f5bdd
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
Tatsuru
a50549aa7c
Don't fuck with the fuse if it's negative
2020-01-05 23:41:22 -03:00
Tatsuru
ce45746d02
No comments
2020-01-05 23:19:52 -03:00
Tatsuru
89eda2fa9b
:amybruh:
2020-01-05 23:18:38 -03:00
Jaime Passos
12068930b2
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 12:09:45 -03:00
MascaraSnake
8d561a20c1
Merge branch 'kill-zshift' into 'next'
...
Eliminate all unnecessary uses of ZSHIFT
See merge request STJr/SRB2!580
2019-12-29 08:35:52 -05:00
Jaime Passos
bd28daea02
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-28 21:39:38 -03:00
Jaime Passos
63132da7e0
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
2019-12-28 19:49:34 -03:00
lachwright
65c5f7f571
Remove MF_NOTHINK from join-breaking referenced objects
2019-12-29 03:01:09 +08:00
MascaraSnake
82d21224cf
Merge branch 'next' into kill-zshift
...
# Conflicts:
# src/p_mobj.c
2019-12-27 08:11:04 +01:00
Jaime Passos
070adb4191
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
James R
599477061a
Merge branch 'gametype-clownery' into 'next'
...
Custom gametypes
See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
Monster Iestyn
3bafa90b7a
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
Alam Ed Arias
dc1f97e634
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
Alam Ed Arias
97b5d2449c
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
Alam Ed Arias
19379a0a68
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 14:43:03 -05:00
MascaraSnake
015f3a36d2
Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself
2019-12-26 20:13:56 +01:00
Alam Ed Arias
5089b93e4c
Merge branch 'next' into kill-zshift
2019-12-26 12:49:04 -05:00
Alam Ed Arias
64792ab9fd
ISO C90 fixup
2019-12-26 12:44:47 -05:00
Alam Ed Arias
c1b52069e3
cleanup buildbot error
2019-12-26 12:27:15 -05:00
James R
12f0e584b2
Correct the check for rings on thing 604 - 607
...
The original code used a switch case, not AND 1. :V
2019-12-25 15:23:19 -08:00
MascaraSnake
c4a6424642
P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT
2019-12-25 11:17:57 +01:00
MascaraSnake
27361fbf43
P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT
2019-12-25 10:59:12 +01:00
Jaime Passos
42c71d3f42
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03:00
