lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10028 commits 1 branch 29 tags 122 MiB
Commit graph

914 commits

Author SHA1 Message Date
James R 6b4ee94e38 Use camera angle, not mobj angle, when comparing Angle Anchor 2020-05-10 19:40:28 -07:00
lachwright 63cb58a10a Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
MascaraSnake 485a4e5035 Remove POLYOBJECTS and POLYOBJECTS_PLANES defines 2020-05-02 12:08:31 +02:00
Monster Iestyn d1d006a1a7 Merge branch 'thinker-cleanup' into 'next' 
Plane movement thinker cleanup

See merge request STJr/SRB2!880
 2020-04-24 14:30:52 -04:00
sphere 67f511a55e Restore carelessly removed const keywords. 2020-04-22 23:38:10 +02:00
sphere 25affe6948 Make emerald hunt shards spawn at correct heights, and add Float option. 2020-04-22 18:58:40 +02:00
MascaraSnake fd598f315e Add an enum for crumblestate 2020-04-17 23:54:37 +02:00
Monster Iestyn 23b6679b3a Merge branch 'buggle-trouble' into 'next' 
P_HomingAttack related fixes

See merge request STJr/SRB2!836
 2020-03-22 16:57:22 -04:00
Louis-Antoine 892a8dd6e7 Make SRB2 flat like Earth 2020-03-20 18:55:29 +01:00
Louis-Antoine e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Monster Iestyn f4cb6e1f5e 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
Tatsuru 776951c6a8 Never forget who your enemy is 2020-03-03 11:40:35 -03:00
Jaime Passos fe93155578 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 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R 92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
Tatsuru c76a8e8a58 Standards 2020-02-18 22:46:16 -03:00
fickleheart 0fbff66e25 Let scripters see if player just launched from slope 2020-02-16 21:34:07 -06:00
James R 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
James R 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
lachwright cddc4e1500 Merge branch 'next' into platform-fixes 2020-01-26 04:34:57 +08:00
Louis-Antoine d30b48cfd1 Fix lava removing fire shield 2020-01-25 14:04:16 +01:00
Louis-Antoine 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
Tatsuru 9e4c519cad In-map visual indicator 2020-01-19 19:02:03 -03:00
fickleheart 4ca44f2d57 Bosses need dropshadows too 2020-01-17 00:16:15 -06:00
lachwright 28c466a0a5 Reset pmomz after transfer to momz 2020-01-16 22:56:01 +08:00
fickleheart 1e2a4c2cce Allow starpost Parameter to dictate order 2020-01-11 22:26:20 -06:00
fickleheart ba8ff3d502 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
fickleheart 4e5f49c60d Fix player shadows while on rope hangs etc 2020-01-11 17:39:53 -06:00
toaster 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
James R ced5ca81a4 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 71c2ee3850 whitespace cleanup 2020-01-09 16:19:12 -05:00
toaster 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
MascaraSnake 45404f7f27 Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next 2020-01-08 08:43:55 +01:00
MascaraSnake 031e7cfb82 Fix a condition in the flame jet thinkers I accidentally messed up 2020-01-08 08:43:36 +01:00
James R 0597d0ccbd Merge branch 'dashmode-tweaks' into 'next' 
Dashmode tweaks

See merge request STJr/SRB2!646
 2020-01-08 01:10:44 -05:00
lachwright 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
Tatsuru 360e8f28b4 ifdefs make indenting confusing 2020-01-07 01:24:04 -03:00
Tatsuru 07f9ddc45a Don't fuck with the fuse if it's negative 2020-01-05 23:41:22 -03:00
Tatsuru fce1313517 No comments 2020-01-05 23:19:52 -03:00
Tatsuru 664bce71de :amybruh: 2020-01-05 23:18:38 -03:00
Jaime Passos 7676f11112 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
MascaraSnake 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
Jaime Passos e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
Jaime Passos 45af6d8899 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
lachwright 5ed1dc5410 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
MascaraSnake e71d07fa8e Merge branch 'next' into kill-zshift 
# Conflicts:
#	src/p_mobj.c
 2019-12-27 08:11:04 +01:00
Jaime Passos c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R e6532b9bad Merge branch 'gametype-clownery' into 'next' 
Custom gametypes

See merge request STJr/SRB2!566
 2019-12-26 18:08:41 -05:00
Monster Iestyn ca5a4d90e0 Fix mixed declaration-and-code compiling error 2019-12-26 21:59:09 +00:00