Commit graph

1097 commits

Author SHA1 Message Date
MascaraSnake 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
MascaraSnake 7dc3484e5d Merge branch 'dragonbomber' into 'master'
Dragonbomber

See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster 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
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 2001cad144 Merge branch 'capsuletweaks' into 'master'
Egg Capsule tweaks

See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
MascaraSnake 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
MascaraSnake 3e7e749327 Merge branch 'reset-rollangle' into 'master'
Reset rollangle

See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
MascaraSnake 881524a2d7 Merge branch 'signpost-cleanup' into 'master'
Signpost camera cleanup

See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
lachwright 280d151d76 Allow positive momentum retention when jumping off rollout rocks 2019-11-18 22:36:25 +08:00
lachwright 27fcaf0f93 Whoops, deleted a little too much by accident 2019-11-18 16:26:15 +08:00
lachwright 4c432c376e Make camera use signpost's ground z coordinate instead of the player's z coordinate 2019-11-18 16:22:12 +08:00
lachwright f682de3f1b Fix controllable flight ending when player hits the ground while being carried by Tailsbot 2019-11-18 15:55:55 +08:00
lachwright 52a24e0bc4 Allow AI Tails to carry the player 2019-11-18 13:30:07 +08:00
Jaime Passos 635e121bfc Restore old sound effect 2019-11-17 21:33:59 -03:00
Jaime Passos 64939816fb Fireball 2019-11-17 21:25:17 -03:00
lachwright 5cafed5c72 Make rollout rocks more friendly 2019-11-18 05:30:14 +08:00
Louis-Antoine 29501a992b Merge branch 'master' into exit-move-lj 2019-11-15 19:35:47 +01:00
toaster 98712ad703 Resolve #291. 2019-11-15 16:39:30 +00:00
toaster 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
Louis-Antoine 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
Jaime Passos 88fb22d688 Yeah, yeah... 2019-11-14 22:14:40 -03:00
MascaraSnake 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
toaster 15da6c153a Woops, condition was accidentially inverted... but also I decided this looks nicer instead. 2019-11-14 19:09:17 +00:00
toaster 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
Jaime Passos 10d1b63ff2 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-14 12:49:03 -03:00
Jaime Passos cb4820c505 Oh. Sorry. 2019-11-14 12:42:45 -03:00
Jaime Passos 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
toaster 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
MascaraSnake 14477748be Merge branch 'stopclock' into 'master'
Stop the clock!

See merge request STJr/SRB2Internal!450
2019-11-13 14:39:59 -05:00
Jaime Passos 9caf98aa0b nevermind 2019-11-13 13:20:55 -03:00
Jaime Passos 69fe096140 reset rollangle 2019-11-13 13:03:02 -03:00
Jaime Passos c51e116c7d actually, 2019-11-13 13:00:57 -03:00
Jaime Passos 245881ec55 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-12 21:38:02 -03:00
toaster 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
MascaraSnake 6b567bfb5c Merge branch 'dashmodecut' into 'master'
Dashmode polish

Closes #266

See merge request STJr/SRB2Internal!418
2019-11-12 15:40:46 -05:00
MascaraSnake 857dbd8488 Merge branch 'knuxstuff' into 'master'
Knuckles changes: the fixes

See merge request STJr/SRB2Internal!428
2019-11-12 15:40:15 -05:00
Jaime Passos 91a01be891 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-11-11 14:41:55 -03:00
MascaraSnake 049e599f2e Merge branch 'spinny-sign' into 'master'
Papersprite end signpost

See merge request STJr/SRB2Internal!442
2019-11-11 11:39:56 -05:00
MascaraSnake 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
MascaraSnake 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
toaster 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
lachwright 3734eab7b6 Add signpost camera (and fix a typo whoops) 2019-11-09 00:47:51 +08:00
toaster 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
toaster 292791ffaf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording 2019-11-08 13:02:32 +00:00
James R b157c21a35 There's some whitespace... 2019-11-07 14:56:42 -08:00
James R ed94549a37 Whitespace 2019-11-07 14:15:57 -08:00
toaster 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
toaster 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
toaster 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
toaster 126fc44d6e Change sounds, after discussing with Lach. 2019-10-30 17:37:42 +00:00
toaster f0f8b544de * Add thok auras to Metal playback.
* Add height changes to demos and Metal playback (to properly place thok aura relative to object).
* Fix followmobj recordings in reverse gravity (done via more strenuous flag setting + info height serialisation).
* Make RA ghosts fade in from start tic, and go colorized on their final one.
* Fix thok auras potentially doing bad things if they're set to MT_NULL.
* Add sprite change support to Metal playback.
* Re-enable some stuff I previously disabled for Metal recording/playback.
* Make ALL objects spawned with skins properly acknowledge that their spawnstate's frame is a sprite2, rather than just specific objects.
* Fix placement of Metal Sonic fume in reverse gravity.
* Since not backwards compatible with the previous test build, increment DEMOVERSION again. (Don't worry, we've got like 65524 more versions allowed before we run out of possible DEMOVERSIONs...)
2019-10-29 15:32:22 +00:00
toaster 1906709cf2 * Improve the Metal Sonic recording/playback system.
* Make the skin to record with Metal rather than Flesh Sonic. (Allowed even if not unlocked!)
    * Make the object that plays back the recording actually use the Metal skin, rather than just a seperate spriteset. (The boss will still need the spriteset, though.)
    * Actively record the player's sprite2, frame, and followmobj, just like regular ghosts do.
    * Disable dashmode while recording, for a fairer race.
    * Fix a probably long-standing bug where, while recording, being "hurt" would get Metal stuck in pain frames until they physically left the area of hurt.
    * Always start Metal recording in wait frames for bonus taunting.

Other relevant changes:
* Increment DEMOVERSION *again*.
* Improve the Record Attack ghost followmobj recording to accomodate Metal's jet.
* Increase the datatype width of spritenum_t read/write for Record Attack ghosts because SUGOI 4: Back With A Revengance will probably also use more than 255 sprites alone.
* Return to standing frames (or prolong them if you're in them, rather than going to wait frames) if the player rotates on the spot with enough force.
    * This was specifically done *for* Metal recording, but I decided it looked good enough to enable all the time.
2019-10-28 22:12:47 +00:00
Jaime Passos f6e8226c4e Update p_user.c 2019-10-28 15:37:26 -03:00
Jaime Passos 79e99dc471 Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-10-28 14:29:10 -03:00
lachwright 8824cd64fd Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright 46ba988541 Slow climbing down underwater 2019-10-28 22:21:20 +08:00
toaster ce91bdaaab Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut 2019-10-28 14:19:25 +00:00
toaster 9a160823aa Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption 2019-10-28 14:19:07 +00:00
lachwright b93c2467e7 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
lachwright 1306b2bbc5 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster d9196485f6 Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake... 2019-10-28 13:01:15 +00:00
toaster 17dde0d91c Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster fa187a66e2 * Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag.
* Add a dashmode downpower sound.
2019-10-27 13:02:07 +00:00
toaster c221a89c67 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
lachwright e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
lachwright 6c9ad67c84 Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright aa34f74f75 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright ca768b044d Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright 63d24d529a Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake 4d022046fa Merge branch 'object_tweaks' into 'master'
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
2019-10-25 17:45:48 -04:00
MascaraSnake 2118b0e613 Merge branch 'hammer-landing' into 'master'
Twinspin landing option

See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
MascaraSnake 2a8e5b7bff Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
toaster f2596ab0bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
# Conflicts:
#	extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00
toaster a215eeabf0 * Fix Super players who die being eternally super.
* Fix music stack corruption in multiplayer where a super player dies and it's not you.
* Fix players in minecarts having their state eternally set to S_PLAY_STND (bug discovered/evident while super, so goes in this branch).

Resolves #259.
2019-10-24 18:51:12 +01:00
MascaraSnake 0ef50557c2 Merge branch 'spinbust' into 'master'
Make spinbust behavior consistent with other bustable blocks

Closes #254

See merge request STJr/SRB2Internal!398
2019-10-23 02:51:47 -04:00
lachwright 7be046e16c Fix compile warnings 2019-10-23 13:46:30 +08:00
lachwright 6d498fe357 Allow machine skins to damage objects in dashmode 2019-10-23 13:41:32 +08:00
lachwright c201879d69 Add Metal's jet fume 2019-10-23 12:35:17 +08:00
James R 5ac8a26814 Miscellaneous window de-focus options
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
2019-10-22 21:15:20 -07:00
James R d62674c184 Clang warnings 2019-10-22 19:18:56 -07:00
lachwright c52ee364f5 Only allow landing in the melee ability mid-twinspin if jump or spin is held 2019-10-21 12:49:12 +08:00
MascaraSnake 1604e4d439 Make spinbust behavior consistent with other bustable blocks and rename FF_ONLYKNUX to FF_STRONGBUST 2019-10-19 22:20:48 +02:00
toaster 7f26b90113 Decrease drag on directionchar in waterslides on sphere's request. 2019-10-19 14:32:34 +01:00
toaster ad09f2603d * New object types!
* Red and yellow Boost panels!
        * Added because SUBARASHII and KIMOKAWAIII had several levels using them, and I wanted to make them look better.
        * https://cdn.discordapp.com/attachments/359091121789468672/634486669202161674/srb20015.gif
        * Uses the mapthingnums of Glaber's SOC resource boosters, but absolutely nothing else - not even the magnitudes.
        * Apply MF_AMBUSH to force the player into a spin - even if they don't have a spin ability!
    * Banpyura!
        * A Crushstacean with a spring instead of a crushclaw.
        * https://cdn.discordapp.com/attachments/428262628893261828/634432099306176512/srb20019.gif
        * Wanted this for a while, finally added it.
* Improved springs.
    * Add pw_noautobrake to disable autobrake for half a second when touching yellow horizontal springs, and a second when touching red ones, even on the ground.
    * Add pw_justsprung to disable directionchar for a few tics while touching any springs with a horizontal component to their velocity.
    * Add the diagonal spring flag options Red and Yellow Diagonal Springs have to the Blue Diagonal Spring as well.
    * Started but decided against a tip of the hat to the CD spring spin, hidden behind #define SPRINGSPIN.
* Make directionchar "lag behind" a little bit in waterslides.
* Improved flame jets.
    * They now use new sprites for having their flames move upwards and sideways, instead of having them always face downwards like in 2.1!
* Fixed a mixed declaration and code error in A_RolloutRock. (Sorry Lach!)
* Make the Amy Cameo only spawn in SP, Record Attack, or Co-op unless it's the Clone Mode.
* Improved ZB config.
    * Add above new types.
    * Add Blue Diagonal Spring, which existed in the source but not the config.
    * Re-order enemies in ZB config by zone (but keep them in the Enemies section only).
2019-10-18 18:33:45 +01:00
sphere 26fed77671 Fix standalone hangable chains being broken, thanks to toaster. 2019-10-17 01:01:40 +02:00
lachwright 9ef72c0862 Fix directionchar issue from faulty merge conflict resolution 2019-10-15 02:57:18 +08:00
lachwright b48d8cf68b Merge branch 'master' into knuxstuff 2019-10-15 02:50:59 +08:00
lachwright 9cad882626 Merge branch 'master' into knuxstuff 2019-10-15 02:49:44 +08:00
lachwright 2417c5aab2 Remove glide landing dust; put player in landing state after glide-sliding off a ledge 2019-10-15 01:40:56 +08:00
lachwright 0836062edd Limit climb camera rotation to a 180 degree cone 2019-10-15 01:19:58 +08:00
lachwright c71213155d Unfuck glide slide/landing dust's P_RandomRange parameters 2019-10-14 04:08:07 +08:00
toaster a5b5712be9 Fixed NiGHTS spawnpoint angle camera jump fuckups. 2019-10-13 16:15:46 +01:00
MascaraSnake 71f93e7071 Merge branch 'sneakers-reduction' into 'master'
Reduce speed sneaker factor to 1.67x

See merge request STJr/SRB2Internal!368
2019-10-12 11:00:24 -04:00
MascaraSnake d401862714 Merge branch 'amytweaks' into 'master'
Amy tweaks

See merge request STJr/SRB2Internal!366
2019-10-12 09:52:44 -04:00
toaster 1560453797 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_map.c
2019-10-10 17:51:29 +01:00
lachwright b2529136e0 Reduce speed sneaker's top speed factor to 1.67x 2019-10-09 21:39:51 +08:00
toaster 1155a7c3a0 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rvz-hardcode
# Conflicts:
#	src/p_mobj.c
2019-10-08 19:43:43 +01:00
MascaraSnake bc794a2227 Players can jostle free from Pterabytes 2019-10-08 00:00:41 +02:00
toaster 46a1d6897c Address checkbox 1 and 2 of #235.
* If using twinspin and have melee ability too, go into melee landing when hitting the ground.
* Only have melee go directly forward if standing/idle, otherwise use drawangle.
2019-10-07 15:03:28 +01:00
lachwright 95f6e2008f Better rollout behavior in lava 2019-10-07 15:25:32 +08:00
lachwright bfb9bac5bd Collision polish 2019-10-07 14:51:32 +08:00
toaster a2f8b84b5a Good catch by MS. 2019-10-06 16:17:11 +01:00
toaster aec5f26819 Fix entering an intangible FOF causing minecart derailment explosions. (Probably; I didn't get the bug to happen in the first place, but this looks like a likely culprit.) 2019-10-06 15:44:24 +01:00
MascaraSnake 2f4edc0cb9 Players carried by Pterabyte cannot adjust their angle and are in their falling state 2019-10-05 20:29:47 +02:00
MascaraSnake cabc4e0294 Implemented lava splish. Feel free to suggest a different "splish" sound. 2019-10-05 10:00:59 +02:00
MascaraSnake 5c1fabfaae Lava is now either completely solid or completely intangible. No more half-assing 2019-10-01 21:58:18 +02:00
lachwright 7d57d53d45 Allow camera movement while climbing; allow sliding while landing from a glide 2019-09-30 14:38:58 +08:00
lachwright c72b5d8a49 Allow retention of momentum when climbing off surfaces 2019-09-30 10:55:57 +08:00
lachwright 906a2b1f59 Merge branch 'master' into knuxstuff
Update to master (necessary for climbing changes)
2019-09-30 09:56:04 +08:00
lachwright 6c0e4a154d Resolve merge conflicts 2019-09-30 03:07:03 +08:00
lachwright e57b0f7126 (Hopefully) cover all cases for resetting rock usability 2019-09-30 03:05:08 +08:00
MascaraSnake cd45bca848 Pterabyte: Don't drop off player in the first ten tics after grabbing 2019-09-29 19:51:27 +02:00
MascaraSnake 9431497f7d Merge branch 'rvz-hardcode' of git.magicalgirl.moe:STJr/SRB2Internal into rvz-hardcode
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/p_map.c
#	src/p_user.c
2019-09-29 18:49:53 +02:00
MascaraSnake 26ecab14d7 Implemented the Pterabyte grabbing mechanic 2019-09-29 18:42:17 +02:00
lachwright 8abb6129c1 Hardcode pumice ball
Current known issues: players detached from the ball via any means other than jumping or pain do not have their ball reset properly
2019-09-29 20:18:40 +08:00
Jaime Passos 5118f8589d Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-28 12:14:55 -03:00
toaster 55a2f1ee1f Merge branch 'bossprovements' into 'master'
ACZ3 intro

Closes #217

See merge request STJr/SRB2Internal!346
2019-09-27 08:55:19 -04:00
lachwright fb9248793a Fix errormode compilation error 2019-09-25 23:09:05 +08:00
lachwright c1750d9359 Fixes shield ability usage when pressing spin on ACZ ropes (and also changes flame shield angling) 2019-09-25 22:36:48 +08:00
toaster 9504d078e4 Don't lock on if something is literally intangible. 2019-09-25 15:12:19 +01:00
lachwright 77613018f8 (Crudely) fixed camera jitter on certain FOF slopes 2019-09-25 21:15:19 +08:00
lachwright 3fdf48f9b0 Further cleanup 2019-09-24 03:21:01 +08:00
lachwright 41d718dabf Cleanup 2019-09-24 03:10:41 +08:00
lachwright de294d84e7 Lots of CA_GLIDEANDCLIMB changes:
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
lachwright e897f5df45 Sneakers affect max glide speed, changed glideslide behavior 2019-09-23 02:56:01 +08:00
lachwright 0772ee693c Merge remote-tracking branch 'origin/master' into knuxstuff
Update to master branch
2019-09-23 00:21:35 +08:00
lachwright e9d211d2bc reallowed strafe key leeway, increased leeway strength 2019-09-23 00:21:28 +08:00
lachwright 203f9d8c1a Trying out a new glide 2019-09-22 21:11:49 +08:00
toaster 7da89e3bc9 Merge branch 'camerafix' into 'master'
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
lachwright 19e0e43e87 test?? 2019-09-20 12:07:57 +08:00
lachwright 222d4f2b7c Improved orbital camera in Software; cam_adjust cvars changed to on by default 2019-09-20 02:02:17 +08:00
toaster 802ddf94b1 Always pretend cv_playersforexit is 4 in co-op special stages. 2019-09-19 18:44:55 +01:00
toaster ca9e6e31da * Resolve #224 (landing frames on ceiling contact).
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00
toaster cf14d5fe5d * Remove sounds from swimming.
* Lower default swim animation speed.
* Make speed of flight/swim animation increase whenever mashing jump.
2019-09-19 12:30:30 +01:00
lachwright 5015f8e142 Added Camera Options submenu (provided my files aren't broken again (please D:)) 2019-09-19 17:34:04 +08:00
toaster 5d37ddd676 Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed. 2019-09-18 14:16:52 +01:00
toaster a8a8ae0d0b Only set flight time to 0 if skin has SPR2_SWIM spriteset. 2019-09-18 14:11:06 +01:00
toaster 9d774f7578 More swim stuff!
* Prevent being able to damage enemies from below while swimming.
* Make the swim-specific bubbles happen at the hands instead of where the propeller would be.
* Improve placement/angle of swimming tails overlay.
* Immediately set flight time to 0 if a player is being carried underwater.
2019-09-18 13:46:17 +01:00
toaster e230d7351c Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is:
* Fix S_PLAY_FLY_TIRED animation being fast.
* Add moving tails to S_PLAY_SWIM animation!
* Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219, hopefully..?)
2019-09-18 12:46:18 +01:00
Nev3r 777e7f8760 Merge branch 'deathstuff' into 'master'
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
2019-09-16 16:32:45 -04:00
Nev3r 21b5ebf6fa Merge branch 'abilityclean' into 'master'
Clean up an ungodly amount of shit relating to abilities.

Closes #195, #167, and #177

See merge request STJr/SRB2Internal!307
2019-09-16 16:09:20 -04:00
James 737690c8b8 Added cam_adjust, de-ghettoified the camera in general 2019-09-11 10:45:59 -04:00
James 4be108fa76 Lach has blessed us with a remade cam_adjust. 2019-09-10 10:11:03 -04:00
toaster 4dc9a95224 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-08 18:00:25 +01:00
toaster 54b89eefbb * Fix jingle captions dying immediately (caused by an S_StopMusic call in P_PlayJingle; resolved by modifying order of operations). 2019-09-07 11:48:58 +01:00
toaster 99b4439b2a * Allow CA2_GUNSLINGER users to pop monitors with their ability (as long as their weapon type isn't a pre-existing weapon ring).
* Correct the position of a carried player relative to Tails.
2019-09-07 11:33:26 +01:00
toaster bb2012a8d0 Clean up an ungodly amount of shit relating to abilities.
* Put everything in P_DoJumpStuff, instead of half in that function and half spread across the player thinker.
* Have a proper if else cascade that first tries shield abilities, then super transformation, then random abilities like CA_TELEKINESIS.
* Use this new arrangement to allow CA_TWINSPIN users to use their ability on spin if their secondary ability is CA2_MELEE (resolves #195).
* Random bugfixing. Didn't keep track of what I'd caused while working on this and what was already there, but there was a lot of it.

The only two abilities which have spin-button properties outside of the else block is CA_AIRDRILL and CA_FLY/CA_SWIM (which now also prevents you from swimming down in goowater).
2019-09-06 19:01:46 +01:00
toaster 0986195d21 Bunch of fixes for dying in MP special stages.
* Don't allow the stage to be reloaded in G_DoReborn.
* If you do ANY spawn after the very beginning moment, you're forced to be a spectator.
* Have the "%d player%s remaining" Co-op exiting count visible at the same time as spectator controls.
2019-09-04 15:51:14 +01:00
Jaime Passos 1fca5a749e Merge remote-tracking branch 'origin/master' into rotsprite_i 2019-09-02 23:36:30 -03:00
toaster f07309707d Lots of death stuff.
* Genesis-style love and attention to the death event.
	* Only visibly decrement lives/rings when you're respawning (or game over, see below).
	* Faster no-button-press respawn.
* Game Over specific love.
	* Animation of Level Title font coming in from the sides.
	* https://cdn.discordapp.com/attachments/428262628893261828/617692325438554132/srb20067.gif
	* Change gameovertics to 10 seconds instead of 15.
	* Make the minimum time before you can force going to the Continue screen longer.
* Accomodate death in MP special stages as a form of exit.
	* Don't have your rings or spheres reset when you die in a special stage, so that the stage isn't softlocked with the new harder limits.
* Fix a bug with CoopLives_OnChange where changing to infinite lives didn't force a game-overed player to respawn.

Also, two not-quite death things which nonetheless were relevant to change:

* Fix quitting a special stage having some of the shared spheres/rings disappear into the aether.
* Fix a warning during compilation for the Ring Penalty print.
2019-09-01 15:55:23 +01:00
James bbe8ef9ff7 Merged orbital cam, made my reset code not run in NiGHTS, 2D mode, or when exiting levels. 2019-08-31 17:06:01 -04:00
James 577a8fd387 Merge branch 'camorbit-sev' into camerafix 2019-08-31 14:53:43 -04:00
Monster Iestyn 602154fe8b Merge branch 'ring-penalty-graphic' into 'master'
Weapon ammo penalty indicator

See merge request STJr/SRB2Internal!297
2019-08-30 13:28:05 -04:00
James bcd0b04488 Forgot to account for z axis -- thanks James R 2019-08-29 17:17:58 -04:00
James 656879b90b Is this thing working? 2019-08-29 15:56:46 -04:00
Steel Titanium 121d8b7838 Merge branch 'abpolish' into 'master'
Autobrake polish

Closes #176

See merge request STJr/SRB2Internal!293
2019-08-28 00:34:21 -04:00
James R 89c4989987 Show a negative number to indicate ammo penalty 2019-08-26 16:07:17 -07:00
Monster Iestyn ab90526541 Merge branch 'candamagefix' into 'master'
P_PlayerCanDamage fix

See merge request STJr/SRB2Internal!291
2019-08-26 11:32:10 -04:00
Monster Iestyn 9d2e7b66ba Merge branch 'gfz_boss_rework' into 'master'
GFZ boss rework + boss explosion fun

See merge request STJr/SRB2Internal!290
2019-08-22 11:27:24 -04:00
toaster fc1abdd7f8 Autobrake polish!
* Make it actually look like a brake, so people can tell it's on instead of just having high friction.
* Fix it fucking with spring chains (caused by being unwittingly active for the first tic of spring collision).
2019-08-22 16:13:00 +01:00
Monster Iestyn 7f5034bb75 Merge branch 'mi-cleanup-returns' into 'master'
MI cleanup returns

See merge request STJr/SRB2Internal!292
2019-08-20 09:35:36 -04:00
Monster Iestyn 54dbd7b4c1 Merge branch 'landingbetter' into 'master'
Fix all our landing woes. (For now.)

See merge request STJr/SRB2Internal!289
2019-08-20 09:28:40 -04:00
Monster Iestyn f3484f7ded Merge branch 'public_next'
# Conflicts:
#	src/config.h.in
#	src/d_clisrv.c
#	src/d_netcmd.c
#	src/doomdef.h
#	src/p_map.c
#	src/p_maputl.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-08-20 13:54:48 +01:00
Jaime Passos f68652aa66 I 2019-08-18 14:16:48 -03:00
Monster Iestyn 450ea0cc43 Disable the level end music fade code for now, because we discovered it causes freezes sometimes. 2019-08-16 23:19:43 +01:00
Monster Iestyn 5c2786b163 Make the various carry types' handling code into a switch case 2019-08-15 18:02:30 +01:00
Monster Iestyn d55790097f split MT_TAILSOVERLAY handling code into a function of its own, since there's so much of it
# Conflicts:
#	src/p_user.c
2019-08-15 18:02:22 +01:00
toaster 35f90e3322 Use the softer explosion sound from s3k to go with the increased quantity of explosions. 2019-08-13 20:24:46 +01:00
toaster 598e9017b1 Fix P_PlayerCanDamage for CA_FLY and CA_BOUNCE to be less lenient in causing damage, by making them based off the top and bottom of the player object respectively rather than its vertical center. 2019-08-13 20:11:44 +01:00
toaster 640b39d9aa Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into gfz_boss_rework 2019-08-12 18:50:42 +01:00
toaster 9ae750d09c Since I had to do a clean build to get this up to date (the state list was updated), I decided to redo all the boss explosion animations to be way more aesthetically pleasing.
Basically, think "Sonic 3". https://cdn.discordapp.com/attachments/371082353990303745/610233312765673493/srb20047.gif
2019-08-12 00:34:42 +01:00
Monster Iestyn 92b47f8729 Fix uninitialised variable error toaster found in P_MinecartThink 2019-08-11 22:14:50 +01:00
toaster f85bc7c61f Fix Rob's Knuckles issue. 2019-08-11 19:37:15 +01:00
toaster ed8ad7abde Did some testing, needed to fix one more issue with moving surfaces and spinning. 2019-08-11 14:36:52 +01:00
toaster e3aec8e067 Fix all our landing woes. (For now.)
* Player state upon collision with ground after rolling now sets state properly.
* Fix the thing where Knuckles can glide up a slope like it's nothing WHILE keeping things working for bouncers.
2019-08-10 16:06:59 +01:00
MascaraSnake aac9592e31 Set Fang's minimum bounce strength to 1.5 times jump strength 2019-08-06 23:35:20 +02:00
toaster 3add792986 Fix spindashing on a moving surface causing you to change state to rolling instead of spindashing.
(MI said I could commit to master since it was only a single line.)
2019-08-04 19:11:58 +01:00
toaster b06af59907 Merge branch 'revert_revert_musicplus' into 'master'
Revert "Revert MusicPlus"

See merge request STJr/SRB2Internal!282
2019-08-04 13:58:01 -04:00
toaster 1fbd3eff40 * Fix the thing where you "roll" in run/walk frames if you hold spin after jumping.
* Fix the thing where you don't go through super transformation frames when starting NiGHTS.
2019-08-04 15:25:13 +01:00
toaster 384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
This reverts commit 603d5805f7.
2019-08-04 12:03:57 +01:00
toaster 603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
2019-08-04 11:32:55 +01:00
mazmazz da55b4b82a Fix 1up intermission jingle not playing 2019-08-04 00:15:31 -04:00
mazmazz dd9efebab5 Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
Monster Iestyn af38c0e227 Merge branch 'bustables_misc' into 'master'
Bustables and landing events

Closes #157 and #162

See merge request STJr/SRB2Internal!262
2019-08-02 13:16:53 -04:00
Monster Iestyn 8520243ab6 Merge branch 'emeraldfixes' into 'master'
Special stage related fixes

See merge request STJr/SRB2Internal!269
2019-08-02 13:08:20 -04:00
toaster f2349c5ce4 fixed sphere's CA2_MELEE stasis issue 2019-08-02 13:18:57 +01:00
toaster 39c15e71b0 Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that... 2019-08-01 08:01:29 -04:00
toaster 2ae07bdf3b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc
# Conflicts:
#	src/p_user.c
2019-07-30 18:14:52 +01:00
toaster d541bb7ead * Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated. 2019-07-30 17:24:21 +01:00
toaster 18e43a5cef * Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage.
* Correct a potential source of desync in P_GiveEmerald.
2019-07-30 16:44:40 +01:00
Alam Ed Arias b77780e1e7 Fix building with MSVC 2019-07-29 19:02:45 -04:00
toaster 1d5e8e249e Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground. 2019-07-17 23:25:49 +01:00
toaster 82acf2de6b Fix Knuckles-in-quicksand messup. 2019-07-17 23:24:44 +01:00
toasterbabe 385d34e67e * Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector.
* Make CA2_GUNSLINGER not get overridden by being in quicksand.
2019-07-17 21:34:04 +01:00
toaster 438c4d1d51 Fix spindash being broken in quicksand
# Conflicts:
#	src/p_mobj.c
#	src/p_user.c
2019-07-17 21:33:18 +01:00
toaster 47f138ac34 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
Jonas Sauer 166f1fac66 Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list.
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
2019-07-13 01:42:03 +02:00
Monster Iestyn 63d337211e Merge branch 'eggcolosseum' into 'master'
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
2019-07-09 16:32:24 -04:00
Monster Iestyn 11a24b88ee Merge branch 'seaegg_tweaks' into 'master'
Sea Egg

See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
toaster 2df90888bb Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
# Conflicts:
#	src/p_mobj.c
#	src/sounds.c
#	src/sounds.h
2019-07-09 19:52:52 +01:00
Monster Iestyn ef984eb336 Merge branch 'metalfixes' into 'toast_cleanup'
Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
toaster 98b6280d03 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-07-08 13:53:31 +01:00
toaster 1f15209eb5 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
2019-07-08 13:52:11 +01:00
toaster 867f7ecfca ha ha ha how can i possibly describe this commit
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
toaster 4ad1703ae3 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
This reverts commit c04b560e92.
2019-07-03 00:58:02 +01:00
MascaraSnake c04b560e92 Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
This reverts merge request !239
2019-07-02 23:49:10 +00:00
MascaraSnake e9978b2955 Merge branch 'master' into thinkerlists
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
2019-07-02 23:08:37 +02:00
toaster a3f758f34f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks
# Conflicts:
#	src/p_mobj.c
2019-07-02 14:19:36 +01:00
toaster f9f92abc44 ha ha ha ha ha ha ha ha
Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).

Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.

Will upload map to fight the new battle in on the MR.
2019-06-30 15:37:33 +01:00
mazmazz 0c96c5404c 2.2 jingle name fixes 2019-06-29 18:44:45 -04:00
mazmazz 923dc34215 Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
mazmazz 6244489fd0 Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle 2019-06-29 18:10:44 -04:00
Monster Iestyn 9913cc39a1 Merge branch 'public_next'
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c
2019-06-29 20:55:58 +01:00
Steel Titanium 2c906e9c29 Merge branch 'jimita-unfuck-awayview' into 'next'
unfuck awayview

See merge request STJr/SRB2!493
2019-06-28 18:21:52 -04:00
toaster faebe0f9af Metal Sonic fixes!
* Add more context clues to his fight, including an indicator for which laser attack is being used after chargeup.
* Make missiles able to vectorise him.
* Add another laser orb attack - vertical slice - and change the laser orb sequence to accurately reflect that horizontal is the hardest of the ones in 2.1.
* Optimise TC_BLINK, and fix an issue with TC_ALLWHITE that somehow avoided coming up in testing.
* Fix colorized bosses losing their colorization when flashing, by forcing TC_ALLWHITE.
2019-06-28 20:48:14 +01:00
toaster 8f6973cb51 Now it's CA_TWINSPIN's turn to get the improvements!
* Remove PF_THOKKED every time a successful damage bounce occours.
* When this happens, spawn a number of particles based on thokitem at half scale! (Optimised, again, for MT_LHRT.)
* Also spawn these particles when a successful spring boost occours, as well as playing a twisted spring sound.

Also, some other related tweaks:

* Optimisations to A_VultureBlast, which was used as a base for the particle creation.
* Make the Metal Sonic boss use P_PlayerCanDamage instead of a custom, somewhat broken player damage detection mechanism.
* P_SpawnGhostMobj takes colorized into account.
* Fold Tails propeller damage into P_PlayerCanDamage.
* When performing an Attraction Blast, place the player in roll frames.
* Update all conditions preventing SH_PINK to incorporate thokitem and spinitem as well.
* Buff MT_LHRT travel distance at slow speeds.
2019-06-26 23:26:05 +01:00
toaster d5988c4f8c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
# Conflicts:
#	src/p_mobj.c
2019-06-26 20:43:37 +01:00
MascaraSnake 287c25b8f9 Forgot to copy something over from the CR_ROPEHANG case 2019-06-21 23:42:48 +02:00
MascaraSnake 4385e07c0b Always use the white sidemark sprite, since track switching is no longer "activated" 2019-06-21 23:40:28 +02:00
MascaraSnake ed7a109ce9 Also back by popular demand: Restricting the camera angle during a minecart ride 2019-06-21 23:34:49 +02:00
MascaraSnake 28abc883be By popular demand: Track switching only requires strafe instead of jump+strafe 2019-06-21 20:13:30 +02:00
toaster 3597b1c485 Make minor adjustments to the CA2_MELEE and CA_TWINSPIN stuff. 2019-06-21 00:43:03 +01:00
Monster Iestyn f7a32835d5 Fix warnings/errors found during compiling, mostly of the mixed-declaration-and-code or shadowed variables variety 2019-06-20 20:05:07 +01:00
Nev3r 0e162f8f61 Add Sryder's orbital camera thing as an option. 2019-06-20 13:33:31 +02:00
toaster 2e6898f29e PITY IN PINK!
* Smoothen Pity Shield animation to go with sphere's updates to Nev3r's sprites.
* Added LHRT object, designed to be summoned with CA2_MELEE.
    * Gives a pink Pity Shield (SH_PINK) on same-team player contact.
    * Deals damage to non-player enemies.
    * Harmlessly fades into nothing when touching an enemy player, players with SH_PINK already, and players capable of applying SH_PINK to others (through non-Lua methods).
* Basically, you-know-who is the Healer of the party whenever they're around. Fun consequences for the Co-op and CTF metas.
2019-06-19 23:20:24 +01:00
toaster 6a58ae34d1 In order to make P_PlayerCanDamage more flexible, I ended up bundling the invincibility/super checks into there.
Also, the start of my improvements to CA2_MELEE. Users of that abiliy can only damage enemies/monitors if they touch the front of the player object, but to make up for it, the player is no longer forced away from the direction of the screen at bigger movement speeds.
2019-06-19 13:20:34 +01:00
toaster 3eb9b85fd4 "PlayerCanDamage" hook!
* Takes function(player, mo) input.
* Return TRUE for stating that yes, the player is in a state that can cause contact damage, do with that what you will.
* Return FALSE for stating that no, the player is weak and vulnerable and cannot cause contact damage, do with that what you will.
* Return NIL for allowing the function to continue regular operation.

Fills a different ideological niche than ShouldDamage - that's for determining whether damage dished between two objects should happen, this is for determining which way around damage should be dished when considering a player-object interaction.

Or, in other words, think of it as "ShouldDamage is whether damage that has been requested should be granted, for object-object interaction, while PlayerCanDamage is for whether global player properties should cause damage to enemies and monitors in the first place, like spinning, hammering or stomping."
2019-06-19 12:55:05 +01:00
toaster ef6e00e8a2 P_PlayerCanDamage(player_t*, mobj_t*), ported from the abandoned project_birthday because GOD the code looks awful with those huge monolith conditions in it. Available to Lua.
(Also, minor fixes to lib_pSpawnLockOn, and removing the SH_OP fuckery.)
2019-06-19 12:09:02 +01:00
MascaraSnake d388547021 Some more minecart fixes 2019-06-19 00:10:28 +02:00
MascaraSnake 647520e067 Adjusted the height difference for track switching 2019-06-17 08:41:51 +02:00
MascaraSnake e23ef050d5 Repaired the height difference check during track switching 2019-06-16 22:00:50 +02:00
MascaraSnake 71a25eef92 Don't jump repeatedly when holding jump 2019-06-15 21:58:58 +02:00
MascaraSnake 39deb64e4f Streamlined the minecart death handling 2019-06-15 21:43:36 +02:00
MascaraSnake 24c6dd1a68 Many more bugfixes 2019-06-15 20:21:18 +02:00
MascaraSnake 943ddeeabf You can now jump onto tracks that are running antiparallel to yours 2019-06-15 13:49:30 +02:00
MascaraSnake cede95fc21 Some more bugfixes 2019-06-15 00:59:13 +02:00
MascaraSnake 981443c826 Another bugfix 2019-06-15 00:12:58 +02:00
MascaraSnake cc9d7bee80 A bunch of bugfixes 2019-06-15 00:04:50 +02:00
MascaraSnake 018fb9b461 "Finished" minecart hardcoding (still untested and buggy) 2019-06-14 21:19:52 +02:00
MascaraSnake ba9c7d9310 More incomplete minecart hardcoding 2019-06-13 21:45:30 +02:00
Steel Titanium 34ce368895 Merge branch 'next' into jimita-unfuck-awayview 2019-05-25 19:47:45 -04:00
Nev3r a9110c0645 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r b60c66325c Added a mobj-only list entry for mobj thinkers
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r 39ba20be6b Basic multiple thinker list implementation
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
mazmazz 8317155c40 Merge branch 'public-gl-next' into public-musicplus-jingle 2019-03-15 18:42:19 -04:00
mazmazz 587a51a957 Fix end-of-level fading for cv_playersforexit
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
2019-03-15 03:47:30 -04:00
mazmazz a1ccb8512d Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel 2019-03-15 02:07:53 -04:00
mazmazz 773f9dc2ba Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
mazmazz 3b6be9b419 Remove redundant music reset block for MIXNIGHTSCOUNTDOWN 2019-03-14 23:21:52 -04:00
mazmazz 469ed9cbe3 Implement MIXNIGHTSCOUNTDOWN
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
2019-03-14 23:10:14 -04:00