thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6836 commits 1 branch 12 tags 205 MiB
Commit graph

6836 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
534cc1fa67 Fix the Save Select platter drawing for the new player signpost art. 
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
 2019-09-11 13:32:12 +01:00
toaster
1695e4102f Tweak gameovertics slightly to avoid having no sound for too long. 2019-09-11 13:30:24 +01:00
toaster
667dcd5bca Continue screen! With aaaaaall the new assets to go with it. 
* https://cdn.discordapp.com/attachments/428262628893261828/621129794045870108/srb20077.gif
* https://cdn.discordapp.com/attachments/428262628893261828/621129785124585502/srb20078.gif
* I will be accepting no further questions at this time.
 2019-09-11 00:50:51 +01:00
toaster
ca616fe314 Add the new s1, s2, cd, 3db and kc sounds to sounds.c and sounds.h! 
These have been in srb2.pk3 for a while, but they were inaccessible because of not having in-game references.
 2019-09-10 15:06:20 +01:00
toaster
038340ff46 Update SPR2 defaulting for SPR2_CNT1. 2019-09-10 14:44:04 +01:00
toaster
41727318ff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
toaster
7eaf43810a DON'T PUSH ALONE - first dregs of continue screen 2019-09-09 15:25:36 +01:00
toaster
ec76002d9f Merge branch 'lightning_polys' into 'master' 
Lightning Polys

See merge request STJr/SRB2Internal!294
 2019-09-08 19:04:56 -04:00
toaster
74e6c147d7 Merge branch 'spawnobject-linedef' into 'master' 
Linedef type 461 (Spawn Object)

See merge request STJr/SRB2Internal!304
 2019-09-08 18:58:50 -04:00
Steel Titanium
8d2f3eb575 Move mobj_t declaration to top of the block 2019-09-08 17:14:47 -04:00
Monster Iestyn
361fbf8f6a Merge branch 'mprelated-tweaks' into 'master' 
Various improvements and changes to multiplayer menu

See merge request STJr/SRB2Internal!300
 2019-09-08 16:45:14 -04:00
toaster
14c44a6825 Merge branch 'nightsattackfixes' into 'master' 
NiGHTS attack fixes

Closes #205

See merge request STJr/SRB2Internal!319
 2019-09-08 16:42:45 -04:00
toaster
0217d693f2 Merge branch 'ending-star' into 'master' 
Endings: Fireworks fallback graphics.

See merge request STJr/SRB2Internal!296
 2019-09-08 16:28:52 -04:00
toaster
380f9ec07d Update SPR2_XTRA references for adjusted player.dta content. 2019-09-08 21:28:12 +01:00
toaster
1e11fe650f Merge branch 'flippost' into 'master' 
Flippost

Closes #206 and #191

See merge request STJr/SRB2Internal!320
 2019-09-08 16:24:58 -04:00
toaster
17a2038489 Change flipped starpostz to define the top of the player object, for cases where scale on contact with starpost is different to spawn scale. 2019-09-08 21:21:36 +01:00
toaster
f523cb107e Merge branch 'newegg' into 'master' 
Newegg dot blag

See merge request STJr/SRB2Internal!305
 2019-09-08 16:11:50 -04:00
toaster
8acf86cf10 Extend gameovertics again by two seconds. 2019-09-08 18:03:51 +01:00
toaster
abcf4f82ad Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-08 18:00:25 +01:00
toaster
5eb6b408a1 Fade time before Game Over track. 
Notably, can no longer use P_PlayJingle because of pre-fade.
 2019-09-08 18:00:01 +01:00
mazmazz
f3d287990c Fix NiGHTS attack menu not drawing correct background 2019-09-07 22:00:38 -04: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
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
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
Steel Titanium
16b17840d9 2D toggle command 2019-09-06 20:51:39 -04:00
Jaime Passos
7bc484206f Merge remote-tracking branch 'origin/master' into fix_skipintro 2019-09-06 16:08:18 -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
Monster Iestyn
0b3975dff8 Merge branch 'public_next' 2019-09-03 19:07:57 +01: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
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
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