c46bfa2be9
Merge branch 'saloondoor-fix' into 'next'
...
Fix saloon doors not letting players through when marked with the Ambush flag
See merge request STJr/SRB2!600
2019-12-30 00:25:37 -05:00
3d724f302d
Fix saloon doors not letting players through when marked with the Ambush flag
2019-12-30 01:16:50 -03:00
5ed1dc5410
Remove MF_NOTHINK from join-breaking referenced objects
2019-12-29 03:01:09 +08:00
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
d401ba558d
Fix pflags not being properly reset when entering dust devil from top
2019-12-19 12:03:36 +08:00
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
0e371774c8
Fix crash on mapload when removing Dragonbomber with Lua
2019-12-16 21:25:41 -05:00
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
ae2594e5ce
Merge branch 'metalfix' into 'master'
...
Boss Scream fix
See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
9d442ae6ea
Wait, no, I'm an idiot.
2019-11-30 14:56:43 +00:00
e664e8b7f3
Merge branch 'jumphood' into 'master'
...
Jumphood
See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
85e3180056
Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA.
2019-11-30 10:31:18 +00:00
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
1fa87611f7
Give the Robo-Hood a cute jump sound whenever it's fleeing you.
2019-11-29 19:18:05 +00:00
613ae0c9f8
Resolve #374 .
2019-11-26 17:06:30 +00:00
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
4e9e5a072f
Have Minus spawn debris upon landing, as suggested
2019-11-24 23:42:27 +08:00
4be45a5e43
Fixed crash when BASH's target disappears during chasing
2019-11-24 10:22:00 +01:00
cdc7a88b04
Add bump sounds to rollout rock & add Newton's third law to jumping off them
2019-11-20 23:45:34 +08:00
eefc285b5c
locvars not needed
2019-11-18 15:48:29 -08:00
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
7a48a8d72d
Merge branch 'poledance' into 'master'
...
Make ACZ3's slapstick signpost taller (resolves #267 ).
Closes #267
See merge request STJr/SRB2Internal!473
2019-11-18 15:14:48 -05:00
f786a8dbf6
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
892f6eca27
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
66001cc73c
Resolve #288 .
...
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
2019-11-15 12:47:21 +00:00
80fd112009
Merge branch 'papersign2' into 'master'
...
Paper sign tweaks
See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00
6c6d89ca57
Merge branch 'flickies_not_in_walls' into 'master'
...
Flickies not in walls
See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
a3de6d21c4
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
...
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
14477748be
Merge branch 'stopclock' into 'master'
...
Stop the clock!
See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
ec44b24f72
Ok, I'm really paying for my hubris. Corrected a faulty optimisation in my fix.
2019-11-13 17:06:54 +00:00
527195c214
I should be more careful when commiting, lmao. (Just a little bit of tying off loose ends for peace of mind.)
2019-11-13 16:59:29 +00:00
fc8392dac4
Typo (my fault).
2019-11-13 16:54:51 +00:00
b4da50b7fb
When you have the skin to set to in A_SignPlayer be "next skin", it's possible the initial skin to pick is a not-available character. This commit prevents that.
2019-11-13 16:51:50 +00:00
471ae8ecb4
Paper sign tweaks.
...
* Add "twinkling" and "landing sounds to paper signpost.
* Fix whitespace on definitions.
* It says locvar2 is unused in the comment for A_SignSpin, but it's used for the "doesn't have a spawnpoint" thing. Make it deathstate instead, so the object doesn't disappear.
2019-11-13 16:33:53 +00:00
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
c87297e3df
Merge branch 'a_skullattack-hang' into 'master'
...
GFZ3's boss hangs when dodging
See merge request STJr/SRB2Internal!403
2019-11-12 18:25:58 -05:00
5729ba3cd2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
17013bf1b7
Merge branch 'jingle-fixes' into 'master'
...
Fix some jingle resuming behavior when also changing base level music
See merge request STJr/SRB2Internal!415
2019-11-12 15:41:53 -05:00
91a01be891
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-11 14:41:55 -03:00
049e599f2e
Merge branch 'spinny-sign' into 'master'
...
Papersprite end signpost
See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
26e534304d
Signed/unsigned comparison error
2019-11-09 16:43:44 +00:00
3734eab7b6
Add signpost camera (and fix a typo whoops)
2019-11-09 00:47:51 +08:00
d8ad0b4eaa
STOP THE CLOCK linedef exectutor!
...
* When activated, stops the timer in SP/MP.
* Applies to the mapheader countdowntimer as well.
* If you're playing Record Attack, also exits the level immediately.
* It has no special modes, no linedef flags, no parameters, nothing.
* Only not an innate property of A_BossDeath because people may want it to NOT happen sometimes, or make it happen with non-boss events too.
Also, skip over calling P_DoPlayerExit if the player isn't in game.
2019-11-08 15:47:12 +00:00
8203c6ae90
Add support for custom sign color with var2 (shortcut for requests I sometimes got from character spriters in 2.1, e.g. neon green Pointy Sonic using a purple sign)
2019-11-08 20:09:12 +08:00
James R