2418e33a00
Merge branch 'cobalt-ai' into 'master'
...
CobaltBW's Tails AI
See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
1fdcc270d8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
...
# Conflicts:
# src/p_map.c
2019-11-18 21:33:51 +00:00
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
2001cad144
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
233ff8bd27
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
3e7e749327
Merge branch 'reset-rollangle' into 'master'
...
Reset rollangle
See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
881524a2d7
Merge branch 'signpost-cleanup' into 'master'
...
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
280d151d76
Allow positive momentum retention when jumping off rollout rocks
2019-11-18 22:36:25 +08:00
27fcaf0f93
Whoops, deleted a little too much by accident
2019-11-18 16:26:15 +08:00
4c432c376e
Make camera use signpost's ground z coordinate instead of the player's z coordinate
2019-11-18 16:22:12 +08:00
f682de3f1b
Fix controllable flight ending when player hits the ground while being carried by Tailsbot
2019-11-18 15:55:55 +08:00
52a24e0bc4
Allow AI Tails to carry the player
2019-11-18 13:30:07 +08:00
635e121bfc
Restore old sound effect
2019-11-17 21:33:59 -03:00
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
5cafed5c72
Make rollout rocks more friendly
2019-11-18 05:30:14 +08:00
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
98712ad703
Resolve #291 .
2019-11-15 16:39:30 +00:00
52bd4b05e1
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times.
...
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
ff62a0732a
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
88fb22d688
Yeah, yeah...
2019-11-14 22:14:40 -03: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
15da6c153a
Woops, condition was accidentially inverted... but also I decided this looks nicer instead.
2019-11-14 19:09:17 +00:00
afe28b0a0a
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
...
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
cb4820c505
Oh. Sorry.
2019-11-14 12:42:45 -03:00
4292c5fc0b
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
2019-11-14 12:27:22 -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
9caf98aa0b
nevermind
2019-11-13 13:20:55 -03:00
69fe096140
reset rollangle
2019-11-13 13:03:02 -03:00
c51e116c7d
actually,
2019-11-13 13:00:57 -03:00
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03: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
6b567bfb5c
Merge branch 'dashmodecut' into 'master'
...
Dashmode polish
Closes #266
See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
857dbd8488
Merge branch 'knuxstuff' into 'master'
...
Knuckles changes: the fixes
See merge request STJr/SRB2Internal!428
2019-11-12 15:40:15 -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
d1e800e1a8
Merge branch 'inflivesfix' into 'master'
...
Prevent infinite lives rollover to extremely negative numbers.
See merge request STJr/SRB2Internal!446
2019-11-11 11:25:20 -05:00
2edb852f2c
Merge branch 'pmomztweak' into 'master'
...
Fix pmomz (resolves #64!?)
Closes #64
See merge request STJr/SRB2Internal!447
2019-11-11 11:24:01 -05:00
8e2cb88576
Lach wanted to do this, but we might have a release candidate before he gets back, so did it myself.
...
Make the wall transfer while spinning PF_SPINNING|PF_THOKKED. This:
* Prevents PF_MULTIABILITY players from using their ability after a wall transfer.
* Has a more specialised case which allows players to roll after having wall-transferred while spinning.
* (side effect) allows modders to apply PF_THOKKED any time for more controllable spinning.
2019-11-09 17:49:26 +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
292791ffaf
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
2019-11-08 13:02:32 +00:00
b157c21a35
There's some whitespace...
2019-11-07 14:56:42 -08:00
ed94549a37
Whitespace
2019-11-07 14:15:57 -08:00
f11fc92fd7
Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...)
2019-11-07 17:10:59 +00:00
d2c6d6ad73
Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.)
2019-11-07 14:06:27 +00:00
fc22d1adc3
* Restart Metal recording from beginning if retry is used.
...
* Disable lives when Metal recording (and have a big flashing REC instead, because I'm a riot).
* Correct some minor directionchar issues (some introduced in this branch, some not).
2019-11-02 11:56:51 +00:00
126fc44d6e
Change sounds, after discussing with Lach.
2019-10-30 17:37:42 +00:00
MascaraSnake