29192eff9a
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
afc6378868
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
2605f29bd4
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
19d77bfc53
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
165b6c2435
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
9ebb4071ee
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
2020-04-25 10:47:45 +02:00
3170f2b8c3
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
2020-04-24 21:15:53 +02:00
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
67f511a55e
Restore carelessly removed const keywords.
2020-04-22 23:38:10 +02:00
25affe6948
Make emerald hunt shards spawn at correct heights, and add Float option.
2020-04-22 18:58:40 +02:00
de3ad9bc43
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/doomdata.h
# src/p_setup.c
2020-04-22 09:11:17 +02:00
3d9d9d74f6
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
...
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
2020-04-21 12:27:26 -04:00
beb42c9499
Move the scale setting code behind the MapthingSpawn hook.
2020-04-19 16:00:57 +02:00
7cf08e1a08
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
ca10b38b9c
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
9ac60a62b3
Fix cage issue with boss 4.
2020-04-19 13:13:53 +02:00
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
d775a42e93
Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists.
2020-04-17 23:43:26 +02:00
7904856e8e
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
b5eaad42fc
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
4fc07473fd
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
439fde3434
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
4128f826b7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
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
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
1580e14cbc
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
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
776951c6a8
Never forget who your enemy is
2020-03-03 11:40:35 -03:00
21b28b6295
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
fe93155578
Fix Amy cameo's love hearts crashing the Software renderer due to invalid translucency tables
2020-02-24 20:03:08 -03:00
6415e10216
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
4517377552
Start CA_GLIDEANDCLIMB swimming functionality
2020-02-23 15:38:11 +08:00
56b67a3b4f
Custom skincolors
2020-02-21 21:56:39 -05: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
cae99654be
Merge branch 'next' into udmf-next
2020-02-18 18:39:11 +01: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
3775e6447e
Skyboxes: Remove obsolete modulo operation
2020-01-25 15:37:23 +01:00
d30b48cfd1
Fix lava removing fire shield
2020-01-25 14:04:16 +01:00
d947558576
Use tag instead of angle for skyboxes
2020-01-25 10:26:38 +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
64df10f7be
P_MobjThinker: Separate fuse handling into its own function
2019-12-25 00:36:24 +01:00
6032aa3cd1
P_MobjThinker: Separate MF2_FIRING handling into its own function
2019-12-25 00:18:12 +01:00
5d89e915c6
Continue cutting up P_MobjThinker into multiple functions
2019-12-25 00:14:53 +01:00
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
ddccfbd73d
P_MobjThinker(): Separate scale thinking and scenery thinking into their own functions
2019-12-24 21:07:55 +01:00
c61c1e2514
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
0aa3c9b0a3
Fixed missing break in offset handling for horizontal springs
2019-12-24 13:01:17 +01:00
13eb71e1ee
Fixed missing break in offset handling for horizontal springs
2019-12-24 12:58:12 +01:00
a57f903933
Move bonus time handling into new function P_SetBonusTime()
2019-12-24 12:52:43 +01:00
ac3a57aaf5
Allow P_SpawnItemRow to spawn different item types in the same row
2019-12-24 12:47:44 +01:00
72a1571937
Allow P_SpawnItemCircle to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:38:16 +01:00
2dac47a54c
Allow P_SpawnItemRow to spawn arbitrary mobjtypes (will be used in UDMF)
2019-12-24 12:19:13 +01:00
dd01fce1a8
Separate P_SpawnHoopsAndRings into different functions:
...
-Hoops are spawned in P_SpawnHoop
-Item patterns are spawned in P_SpawnItemPattern
-Ring-like items are spawned normally via P_SpawnMapThing
-Bonus time items are spawned via P_SpawnBonusTimeItem, which is a wrapper for P_SpawnMapThing
2019-12-24 10:50:49 +01:00
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
ffd6cf4aca
Replaced functions for spawning premade rows of rings with a function for spawning a generic row of rings (groundwork for UDMF)
2019-12-24 00:10:29 +01:00
50dd0a71db
Turn size and number of items for item circle into function parameters (in preparation for UDMF)
2019-12-23 22:58:58 +01:00
6939da0164
Turned nightsreplace into a macro so we have don't have to keep dragging it along as a function parameter
2019-12-23 21:35:03 +01:00
24f8d4ef51
Made a mapthing-independent version of P_GetMobjSpawnHeight so P_SpawnHoopsAndRings subfunctions can use it instead of duplicating code.
2019-12-23 21:17:12 +01:00
2b3922a8f3
Set mthing->mobj before the flags handling code, since at this point the setup can't fail anymore
2019-12-23 20:12:45 +01:00
eab5f8c851
P_SpawnMapThing(): Separate handling of MTF_AMBUSH and MTF_OBJECTSPECIAL in its own functions
2019-12-23 19:08:40 +01:00
e382c2e094
P_SpawnMapThing(): Separated the giant post-Lua hook switch-case statement into its own function, and separated some of the larger cases into their own function as well
2019-12-23 18:59:11 +01:00
8ddd078b20
P_MapThingSpawn(): Move early returning/substitution code into their own functions
2019-12-23 17:28:21 +01:00
e90eb9a5e7
Move P_GetMobjtype above first use
2019-12-23 16:54:26 +01:00
6a69aa4ffa
Separate handling of non-mobj mapthings in P_SpawnMapThing into its own function
2019-12-23 16:53:45 +01:00
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
97adf3e246
Merge branch 'next' into hoop_refactor
...
# Conflicts:
# src/p_mobj.c
2019-12-22 18:12:58 +01:00
dacd5614f9
Make both NiGHTS hoop types use the same spawning code.
...
As a result, the old generic hoops now use 24 sprites instead of 32.
2019-12-22 17:37:54 +01:00
4ad1727b66
Don't spawn End Level Signs without the GTR_ALLOWEXIT rule
2019-12-19 17:06:07 -03:00
f4bb618f93
Organise rules
2019-12-19 16:12:10 -03:00
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
5daedc70e7
Special Stages/token stuff
2019-12-18 22:46:17 -03:00
7c3cde4564
How did I mess this up?
2019-12-18 15:23:41 -03:00
7768e2c7f9
More spectator tweaks
2019-12-18 15:14:24 -03:00
d3d91726f5
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 14:57:42 -03:00
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
ea5e0d28ed
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
4da57653eb
Merge branch 'spawn_z_refactor' into 'next'
...
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
2019-12-16 23:21:07 -05:00
bcfd9fe504
Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?
2019-12-15 00:22:17 +01:00
c5d8fe4752
Fix oversight on mapthing spawn Z calculation; ONFLOORZ and ONCEILINGZ don't equal to spawning the object at the base plane intersection.
2019-12-12 15:04:48 +01:00
d40359ee02
Hugging now requires being in the same Z position
...
Don't try this at home
2019-12-11 19:13:22 -06:00
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
d2cbdd4fb1
Do not overwrite the mapthing Z when spawning rings and similars, as it now causes them to respawn in wrong places because it is being actually used now.
2019-12-11 11:10:31 +01:00
584348b91e
Do not use mapthing flags to spawn hoops and rings; use the the previously set mapthing Z instead.
2019-12-11 10:13:52 +01:00
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
0bd1399c52
Revert paperprojection, but keep it as a #define in case someone fixes it in a patch.
2019-12-07 10:22:10 +00:00
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
4a26aec031
Actually fix F12 issues
2019-12-07 02:27:48 +08:00
e7574957bc
Hopefully fix F12 issues
2019-12-07 01:52:40 +08:00
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
6928763961
Merge branch 'nullplayerslopelaunch' into 'master'
...
Fix slope launch with NULL player causing SIGSEGV.
See merge request STJr/SRB2Internal!595
2019-12-04 17:07:04 -05:00
01da9f7f16
Merge branch 'tokenultimate' into 'master'
...
Fix tokens not spawning in ultimate mode
See merge request STJr/SRB2Internal!594
2019-12-04 17:06:43 -05:00
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
c843f22a24
Spawn tokens in ultimate mode now they no longer give you rings on successful special stage completion.
2019-12-03 23:21:36 +00:00
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
0d4158bbd0
Fix the flung Brak not being removed on deathpits.
2019-11-30 10:29:51 +00:00
MascaraSnake