Commit graph

6030 commits

Author SHA1 Message Date
Jaime Passos
1095c4a4c7 fix non powers of two spans 2019-09-07 18:20:49 -03:00
toaster
09f7dc1350 * Store gravflip (resolves #206) and destscale in starposts. (Using the same field, taking advantage of the fact that object scale will always be positive!)
* Update the function signature of P_MixUp to accomodate both it and drawangle instead of doing it outside of the function.
* If the player is spawning from the start of the stage and it's from the ceiling, be in fall frames as requested (resolves #191).
2019-09-07 22:12:47 +01:00
Jaime Passos
27970e22e1 fix translucency 2019-09-07 16:54:26 -03:00
toaster
bc911c2b20 Fix detection of GRADE_ constants in SOC. 2019-09-07 20:08:05 +01:00
Monster Iestyn
86c72eb5e6 Merge branch 'musicfixes' into 'master'
Minor musicplus-related fixes

See merge request STJr/SRB2Internal!310
2019-09-07 11:45:15 -04:00
Monster Iestyn
57cacd1b58 Merge branch 'stop-bullying-tails' into 'master'
Ignore bots when looking for a player

Closes #190

See merge request STJr/SRB2Internal!301
2019-09-07 11:44:46 -04:00
Monster Iestyn
818ccf02c5 Merge branch 'fix_skipintro' into 'master'
Fix -skipintro in OpenGL

See merge request STJr/SRB2Internal!308
2019-09-07 11:44:09 -04:00
Monster Iestyn
490f41543c Merge branch 'devmode-toggletwod' into 'master'
DEVMODE: 2D toggle command

See merge request STJr/SRB2Internal!309
2019-09-07 11:43:01 -04:00
toaster
135a6636a7 Fix compilation warning for Match penalty string. (Egads, straight into master! Shock! Horror!) 2019-09-07 12:10:50 +01:00
toaster
64ceaa2051 Fix the V_DrawCroppedPatch bleeding on the current charsel screen. 2019-09-07 12:07:29 +01:00
toaster
5e4dec8dfc * Comment out the notices that the two types of music are disabled (see issue #179; not a perfect fix, but good enough for now). 2019-09-07 11:49:13 +01:00
toaster
3eb4866a2d * 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
5040f4d7f7 * 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
Steel Titanium
16b17840d9 2D toggle command 2019-09-06 20:51:39 -04:00
Jaime Passos
25bb9d1f88 define stuff idk 2019-09-06 19:41:29 -03:00
Jaime Passos
3590a1160c Fix tilted spans. 2019-09-06 19:37:07 -03:00
Jaime Passos
6acdf893e1 test 2019-09-06 19:26:05 -03:00
Jaime Passos
b28af03b1c Merge remote-tracking branch 'jimita/flats-png' into flats-png_port 2019-09-06 19:20:45 -03:00
Jaime Passos
7bc484206f Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-06 16:08:18 -03:00
toaster
1311542c7f 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
0db1d5d225 2.2 skies aren't flipped 2019-09-05 17:42:36 -03:00
Jaime Passos
16956f1c56 Make sky dome look a bit better 2019-09-04 13:59:09 -03:00
toaster
7f69b52708 [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
ffec691023 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
b5ddea4827 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
557e29b83c Very tiny fix 2019-09-03 23:44:04 -03:00
Monster Iestyn
0b3975dff8 Merge branch 'public_next' 2019-09-03 19:07:57 +01:00
Jaime Passos
6573e94e3a PRBoom sky dome 2019-09-03 02:12:17 -03:00
Jaime Passos
ee4bd8dbf2 Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-02 23:36:15 -03:00
toaster
0700ad229f 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
226a23c90b 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
a606dd2a38 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
0efeaa5d5f Merge branch 'camorbit-sev' into camerafix 2019-08-31 14:53:43 -04:00
toaster
b2d57e6045 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
7f1e13b746 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
Steel Titanium
2821ec1807 Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium
4f71e2a3b0 Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium
4d94c0b1ac Fix spawning within random range 2019-08-29 23:56:15 -04:00
Alam Ed Arias
475e2fa981 Merge branch 'master' into next 2019-08-29 19:28:02 -04:00
Alam Ed Arias
d6a3f3f4d8 Warn on implicit fallthrough 2019-08-29 19:27:52 -04:00
James
afabfa57ae Forgot to account for z axis -- thanks James R 2019-08-29 17:17:58 -04:00
James
ddb4f1b765 Is this thing working? 2019-08-29 15:56:46 -04:00
Steel Titanium
9fcf7695c0 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
e86484a64a Ignore bots when looking for a player 2019-08-28 23:12:25 -04:00
Steel Titanium
3f9076fd80 Merge branch 'master' into mprelated-tweaks 2019-08-28 22:26:52 -04:00
Steel Titanium
9f197df5e9 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
3a08761a8f 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
1ae5987502 Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
Steel Titanium
27e125e782 Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium
74bcfda7dd Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00