4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
76f26cda24
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
c76a8e8a58
Standards
2020-02-18 22:46:16 -03:00
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
bd90c20366
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
5a524f21da
Merge branch 'starpost-config-additions' into 'next'
...
Starpost config additions
See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
cddc4e1500
Merge branch 'next' into platform-fixes
2020-01-26 04:34:57 +08:00
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
fb28ede660
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
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
4ca44f2d57
Bosses need dropshadows too
2020-01-17 00:16:15 -06:00
28c466a0a5
Reset pmomz after transfer to momz
2020-01-16 22:56:01 +08:00
1e2a4c2cce
Allow starpost Parameter to dictate order
2020-01-11 22:26:20 -06:00
ba8ff3d502
Add mobj shadowscale property
2020-01-11 18:24:08 -06:00
4e5f49c60d
Fix player shadows while on rope hangs etc
2020-01-11 17:39:53 -06:00
80b801e91e
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
ced5ca81a4
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
71c2ee3850
whitespace cleanup
2020-01-09 16:19:12 -05:00
004cfb45aa
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
45404f7f27
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-01-08 08:43:55 +01:00
031e7cfb82
Fix a condition in the flame jet thinkers I accidentally messed up
2020-01-08 08:43:36 +01:00
0597d0ccbd
Merge branch 'dashmode-tweaks' into 'next'
...
Dashmode tweaks
See merge request STJr/SRB2!646
2020-01-08 01:10:44 -05:00
01b8bd21cc
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
360e8f28b4
ifdefs make indenting confusing
2020-01-07 01:24:04 -03:00
07f9ddc45a
Don't fuck with the fuse if it's negative
2020-01-05 23:41:22 -03:00
fce1313517
No comments
2020-01-05 23:19:52 -03:00
664bce71de
:amybruh:
2020-01-05 23:18:38 -03:00
7676f11112
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 12:09:45 -03:00
bb9093ff57
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
e63f77ea1a
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-28 21:39:38 -03:00
45af6d8899
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
2019-12-28 19:49:34 -03:00
5ed1dc5410
Remove MF_NOTHINK from join-breaking referenced objects
2019-12-29 03:01:09 +08:00
e71d07fa8e
Merge branch 'next' into kill-zshift
...
# Conflicts:
# src/p_mobj.c
2019-12-27 08:11:04 +01:00
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
e6532b9bad
Merge branch 'gametype-clownery' into 'next'
...
Custom gametypes
See merge request STJr/SRB2!566
2019-12-26 18:08:41 -05:00
ca5a4d90e0
Fix mixed declaration-and-code compiling error
2019-12-26 21:59:09 +00:00
e823441e31
Merge branch 'next' into mobjthinker-refactoring
2019-12-26 14:50:35 -05:00
61a0197339
Merge branch 'next' into gametype-clownery
2019-12-26 14:48:04 -05:00
c0d6cd8599
Merge branch 'kill-zshift' of git.magicalgirl.moe:STJr/SRB2 into kill-zshift
2019-12-26 14:43:03 -05:00
855f5da6c9
Make P_RespawnSpecials call P_SpawnMapThing instead of trying to do everything itself
2019-12-26 20:13:56 +01:00
e8431e168a
Merge branch 'next' into kill-zshift
2019-12-26 12:49:04 -05:00
4906cd4331
ISO C90 fixup
2019-12-26 12:44:47 -05:00
50379dac85
cleanup buildbot error
2019-12-26 12:27:15 -05:00
70f08007eb
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
de7575416a
P_FlagFuseThink: Use mt->z instead of mt->options >> ZSHIFT
2019-12-25 11:17:57 +01:00
f4c6068ab1
P_MovePlayerToSpawn: Use mthing->z instead of mthing->options >> ZSHIFT
2019-12-25 10:59:12 +01:00
7e5ec552ee
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-25 06:09:00 -03:00
12d30b7acc
Use mthing->z instead of mthing->options >> ZSHIFT in particle generator setup
2019-12-25 09:46:09 +01:00
Jaime Passos