Commit graph

7183 commits

Author SHA1 Message Date
Jaime Passos de4a609421 Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-06 16:08:18 -03: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
Jaime Passos 6aedca899f 2.2 skies aren't flipped 2019-09-05 17:42:36 -03:00
Jaime Passos c6f3e4d53d Make sky dome look a bit better 2019-09-04 13:59:09 -03:00
toaster 5bc034bc3e [slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter 2019-09-04 15:52:25 +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
toaster 7177d76cfd Seperate "Game" and "Over" assets, per Sev's request and design.
https://cdn.discordapp.com/attachments/428262628893261828/618812279127015475/srb20069.gif
2019-09-04 15:21:00 +01:00
Jaime Passos f0b4a609a8 Very tiny fix 2019-09-03 23:44:04 -03:00
Monster Iestyn 4c39225c3e Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
Jaime Passos f6d2b5109b PRBoom sky dome 2019-09-03 02:12:17 -03:00
Jaime Passos 6b151ef4ea Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-02 23:36:15 -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
toaster fe99c64511 Give the Spectator Eggrobos the ability to move left and right relative to their angle, with initial direction depending on MTF_OBJECTSPECIAL/MTF_AMBUSH flag presence. (May need more tweaking before putting in CEZ3) 2019-09-01 11:43:30 +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
MascaraSnake a5ae8abdb2 Pyre Fly: Use MF2_BOSSNOTRAP instead of MF2_AMBUSH 2019-08-31 12:53:55 +02:00
toaster 6a9da63d7f Motor's new Eggman sprites, along with some other sweet bits of boss polish. What else can I say? Just play it. 2019-08-30 19:19:54 +01: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
MascaraSnake 8ddcced6f0 Pyre Fly: Don't spawn smoke and flames if no player is in range 2019-08-30 09:05:49 +02:00
MascaraSnake 4cece9fe36 Pyre Fly: Don't run the fuse code when dead 2019-08-30 08:55:29 +02:00
MascaraSnake 806b106905 Hardcoded the Pyre Fly 2019-08-30 08:17:25 +02:00
Steel Titanium 8167a88bec
Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium 5c295d285b
Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium 10ea0f21ae
Fix spawning within random range 2019-08-29 23:56:15 -04:00
Alam Ed Arias 028996915d Merge branch 'master' into next 2019-08-29 19:28:02 -04:00
Alam Ed Arias dadec1196b Warn on implicit fallthrough 2019-08-29 19:27:52 -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 8655b8f1f1
Add spawn object linedef special.
Note that spawning a object within a random range does not fully work yet and crashes the game
2019-08-29 01:57:58 -04:00
Steel Titanium 1040a93a6e
Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium 7ccff2e6e3
Merge branch 'master' into mprelated-tweaks 2019-08-28 22:26:52 -04:00
Steel Titanium 7e47117afa
Add warning message when attempting to use the master server browser while modifiedgame is true. 2019-08-28 20:24:30 -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
Steel Titanium b4d8126675
Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
MascaraSnake 2933ec3e9c Simplified the lavafall rock states with FF_RANDOMANIM, fixed Var1 for the FF_ANIMATE states 2019-08-27 19:33:54 +02:00
Steel Titanium a98862b3ed
Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium b2712af2d0
Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00
Steel Titanium 1416312200
Move some cvars out of D_ClientServerInit and save them
Ported over from Kart
2019-08-26 20:38:32 -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
MascaraSnake 671da01607 Only spawn lavafall rocks if a player is nearby 2019-08-25 23:43:07 +02:00
MascaraSnake 7ca67a8688 Added reverse gravity support to lavafalls 2019-08-25 23:31:12 +02:00
Monster Iestyn db3a2e02a5 Modify defaults for smpstage_start and smpstage_end to 60 and 66 respectively 2019-08-25 22:24:08 +01:00
MascaraSnake 50e51c137e Hardcoded the lavafall 2019-08-25 23:05:38 +02:00
MascaraSnake 57d28c7814 Rejig the thing type numbers 2019-08-25 20:01:08 +02:00
Monster Iestyn d1105abdb3 Merge branch 'public_next'
# Conflicts:
#	src/d_netfil.c
2019-08-25 18:18:59 +01:00
MascaraSnake 2a5c576c1c Hardcoded the RVZ scenery 2019-08-25 12:40:32 +02:00
Monster Iestyn 964693d542 Merge branch 'master' into next 2019-08-24 23:28:38 +01:00
toaster b746ef66ac Fix range print for getter error (setter was caught ahead of time) 2019-08-24 22:56:20 +01:00
Steel Titanium fbec4af086
Fallback graphic for firework display, if the character lacks one. 2019-08-24 17:17:55 -04:00