MascaraSnake
ccd2371d42
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
f1744efbd5
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
MascaraSnake
7004d8ca75
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
4c526f6e50
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
James R
5ad69621f2
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
lachwright
645c324d51
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
MascaraSnake
4e6a0c0ae9
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
5a6d3753c0
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
cd9f6a2b7e
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
1cee43f945
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
147a1a8a0a
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
1929b62133
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
d037a12e54
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
8efec04051
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
Monster Iestyn
f26e8f3df7
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
7955c96fa1
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
sphere
0868930d3b
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
MascaraSnake
93eb0ee1c8
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Monster Iestyn
0a288260fc
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
29294a53cc
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +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
Tatsuru
06a2882dc9
Never forget who your enemy is
2020-03-03 11:40:35 -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
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
