MascaraSnake
112b15cca2
Add P_GetMobjtype for finding the mobjtype for a given mapthingnum
2019-12-23 14:45:43 +01:00
MascaraSnake
21dcbc856c
Split up P_SpawnHoopsAndRings() into subfunctions
2019-12-23 12:42:09 +01:00
MascaraSnake
efb47b3786
Move spawning of ring-like items into its own function, use P_GetMobjSpawnHeight()
2019-12-23 12:07:03 +01:00
MascaraSnake
97adf3e246
Merge branch 'next' into hoop_refactor
...
# Conflicts:
# src/p_mobj.c
2019-12-22 18:12:58 +01:00
MascaraSnake
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
James R
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
MascaraSnake
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
Nev3r
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
Tatsuru
d40359ee02
Hugging now requires being in the same Z position
...
Don't try this at home
2019-12-11 19:13:22 -06:00
Nev3r
d34fd4b755
Epic oversight in upside-down spawn offset.
2019-12-11 15:48:44 +01:00
Nev3r
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
Nev3r
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
Nev3r
ca6a7ffbb3
Fix NiGHTS bumpers height.
2019-12-10 18:53:49 +01:00
Nev3r
8466dc5813
Move mobj spawn Z calculating to a separate function.
2019-12-10 18:03:15 +01:00
toaster
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
MascaraSnake
a3549cc8f2
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
lachwright
4a26aec031
Actually fix F12 issues
2019-12-07 02:27:48 +08:00
lachwright
e7574957bc
Hopefully fix F12 issues
2019-12-07 01:52:40 +08:00
Alam Ed Arias
3120c99eeb
Fix compiling for MSVC
2019-12-05 12:38:50 -05:00
MascaraSnake
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
MascaraSnake
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
toaster
7f82d7451d
Fix slope launch with NULL player causing SIGSEGV.
2019-12-04 12:13:27 +00:00
toaster
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
Alam Ed Arias
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
toaster
0d4158bbd0
Fix the flung Brak not being removed on deathpits.
2019-11-30 10:29:51 +00:00
MascaraSnake
0d433b9e51
Merge branch 'brakyeet' into 'master'
...
This Black Eggman? ***YEET*** (resolves #399 )
Closes #399
See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
toaster
c2bd91af50
Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.
2019-11-30 10:12:45 +00:00
toaster
339907fd5d
This Black Eggman? ***YEET***
...
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
MascaraSnake
ebcb17d607
Merge branch 'sleepwalkin' into 'master'
...
Sleepwalkin (resolves most of #382 )
Closes #382
See merge request STJr/SRB2Internal!567
2019-11-28 16:08:40 -05:00
MascaraSnake
2495e58bdb
Merge branch 'campokes' into 'master'
...
Camera pokes (resolves #359 , #363 , and #383 ).
Closes #359 , #363 , and #383
See merge request STJr/SRB2Internal!566
2019-11-28 14:21:18 -05:00
toaster
803b22a3e7
Change required for Tails' tails to behave like falling sprite.
2019-11-27 13:54:13 +00:00
toaster
ae84246721
Fix camera not being flipped when camera is stopped due to game design hack reasons ( resolves #383 ).
2019-11-27 13:37:03 +00:00
LJ Sonic
c29540a201
Merge branch 'exit-move-lj' into 'master'
...
No more drowning with exitmove now.
See merge request STJr/SRB2Internal!563
2019-11-27 08:17:22 -05:00
MascaraSnake
73bb913ec9
Merge branch 'paperprojection' into 'master'
...
Papersprite projection tweak
See merge request STJr/SRB2Internal!535
2019-11-25 16:53:48 -05:00
MascaraSnake
8adcea56c3
Merge branch 'minusflip' into 'master'
...
Have Minus rotate in mid-air
Closes #326
See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
toaster
71e74ca363
Fix a bunch of shit with MP special stages!
...
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347 ).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
2019-11-25 14:33:15 +00:00
toaster
3594623891
Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
...
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
2019-11-24 16:42:13 +00:00
lachwright
9a7979d841
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
Louis-Antoine
032f53ce07
Prevent drowning after completing the level
2019-11-19 22:44:33 +01:00
toaster
2bba25c1e1
As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303 .
2019-11-19 15:59:24 +00:00
James R
f3e66f7b58
dist is unused
2019-11-18 15:53:30 -08:00
MascaraSnake
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
MascaraSnake
1365ef49b3
Merge branch 'jester-fireball' into 'master'
...
Mario fireball by Jester (resolves #296 )
Closes #296
See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
MascaraSnake
baaec6f191
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
lachwright
f786a8dbf6
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
Jaime Passos
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
lachwright
cf53e255eb
Remove tester console prints
2019-11-18 05:31:26 +08:00
lachwright
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
toaster
0c98fb746c
Add some NiGHTS animations which default to normal player sprite2s to the existing player->panim set list, which makes Tails' tails appear due to how P_DoTailsOverlay is coded (assuming the skin is Tails, requiring them to have SPR2_NFLY available).
2019-11-17 18:04:02 +00:00