thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-06 06:27:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
22279 commits 2 branches 14 tags 207 MiB
Commit graph

22279 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
b565e537a8 * Make the OpenGL loading screen work with the fades better. 
* Make the closed captions not mess with fades, and improve their movement calculation.
 2018-06-14 22:23:20 +01:00
Monster Iestyn
71d2280020 Added linedef 447 as the change colormap linedef exec special. 
IMPORTANT NOTE: UNTESTED
 2018-06-14 21:51:21 +01:00
Monster Iestyn
18aa5bda18 Merge branch 'master' into leveltitle-tinkering 
# Conflicts:
#	src/hu_stuff.h
#	src/st_stuff.c
 2018-06-14 21:26:44 +01:00
toaster
de91c0e846 * Level title movement begins before the fade in! 
* https://cdn.discordapp.com/attachments/400761370800422922/456833651645349888/srb20051.gif
* Fix some wipe bugs.
	* Solved that thing where there was no fade between two back-to-back cutscenes.
	* Fixed there being no effective wipe between the end of the vanilla intro cutscene and the title screen.
	* Smoothed out the behaviour of titlemap fades to prevent conflicts.
* [COMPLETELY UNRELATED] Kill the pause graphic and replace with a blue box with text in it, like what happens when the window loses focus. Much harder to miss.
 2018-06-14 20:17:31 +01:00
toaster
bdee4dd694 Improve retrying text presentation. 
* Now reads "HOLD TO RETRY...".
* Behind the white flash.
* Shows on button tap for about half a second.
 2018-06-14 14:41:14 +01:00
TehRealSalt
2689d9cf1b Random items poof instead of sparkle 
Also added a poof when they respawn in Battle
 2018-06-13 23:37:37 -04:00
TehRealSalt
a303ccfacb Fix invincibility white flash 
Calls P_TeleportMove instead of A_CapeChase, object was given a dispoffset
 2018-06-13 22:24:31 -04:00
TehRealSalt
103ad41994 Readd voting cheating, just in an entirely different way 
Will need tested for desyncs, since it adds some RNG into the vote ticker. Which may or may not matter.
 2018-06-13 21:58:21 -04:00
TehRealSalt
e0ad46d416 Different, nicer way of doing fakeouts 
Means it can no longer cheat, but I never saw it cheat in action anyway.
 2018-06-13 21:47:27 -04:00
TehRealSalt
632aabbb60 Fix player arrows in this branch again 2018-06-13 21:33:55 -04:00
TehRealSalt
ebda1ed9e8 Fix karma items in this branch 2018-06-13 21:32:33 -04:00
toaster
f080921305 * Hold the pause button to restart a record attack run! 
* Obligatory GIF: https://cdn.discordapp.com/attachments/400761370800422922/456586705424875520/srb20047.gif
* Show powerup display in singleplayer even while holding Game Status button.
 2018-06-14 00:58:28 +01:00
toaster
d655359544 Fixing dehacked.c consistency. 2018-06-13 18:10:32 +01:00
toaster
25ac5a9bf4 * Record attack tab-HUD tweaks. 
* Do not subtract a life when retrying if you have infinite lives.
 2018-06-13 17:52:23 +01:00
TehRealSalt
0cff3aa0e1 Messing with the SPB item odds themselves 
I'm pretty sure this is why it feels like we can't hit a decent balance.
 2018-06-12 23:01:17 -04:00
TehRealSalt
c9b0f15e60 Voting fakeouts 
The voting cursor can land early, or go up a position, on vote end. Not only is this hilarious and makes it more unpredicatable, it also makes it easier for the game to pick a vote and move on to the next level .

(I bet people will mistake this for a bug on release :V)
 2018-06-12 22:10:26 -04:00
TehRealSalt
726fe61238 Minor vote screen fixes 2018-06-12 19:05:11 -04:00
TehRealSalt
5820cd1d40 Fix a few minor player arrow bugs 2018-06-12 18:01:17 -04:00
TehRealSalt
6073c69827 More frequent SPB, and fixed CHECK 
The new distance setting on SPB is directly inbetween the previous "way too rare" setting and the "way too frequent" setting before that. Hopefully they should come up in reasonable intervals now.
 2018-06-12 17:14:32 -04:00
TehRealSalt
759aac7f5b Shrink buffed HEAVILY 
It now does its job properly: repairing races when there is one straggler far in the back.
- Wipeout instead of spinout, to prevent cheap deaths
- Lose all of your items when you get shrunk.
- You cannot pick up any items while shrunk.
- x2 duration.
- Appears in the very back, with 10% chance.
 2018-06-12 16:27:51 -04:00
toaster
05afb28b57 Fix the starposts not being cleared properly. 2018-06-12 02:26:42 +01:00
toaster
653d6112e8 Fix all the Floral Fieldsing pv2 discovered. 2018-06-12 01:08:03 +01:00
toaster
fa82bb11db Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-12 00:57:21 +01:00
Monster Iestyn
d98a95b4b0 Do the usual hack for loading a lump from a map WAD in a pk3, but this time for P_LoadThingsOnly 2018-06-11 20:23:00 +01:00
Monster Iestyn
837ad5bcb1 Merge branch 'public_flatsprite' 
# Conflicts:
#	src/hardware/hw_main.c
#	src/r_things.c
 2018-06-11 19:53:16 +01:00
Monster Iestyn
f92a8c7f1e Merge branch 'public_flatsprite' into 'public_flatsprite' 
OpenGL: Paper Sprites: The Thousands of Bugs

See merge request STJr/SRB2!253
 2018-06-11 14:46:51 -04:00
Sryder
34aa7df43a Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite 2018-06-11 19:40:35 +01:00
Monster Iestyn
358a47967b backport fix to L/R sprite loading code from internal 
basically we don't want L/R sprites to always be flipped, for obvious reasons
 2018-06-11 19:36:47 +01:00
toaster
82199131e5 In another branch because you're meanies :( 
Distance limitation before doing mace stuff unless EFFECT5 is used.
 2018-06-11 15:36:02 +01:00
TehRealSalt
8c748120b7 MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers 2018-06-11 02:15:27 -04:00
TehRealSalt
d8f4f7c8a7 Forgot to uncomment after finished testing. 2018-06-11 01:56:41 -04:00
TehRealSalt
c1b1427676 SPB fixes 
Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
 2018-06-11 01:51:50 -04:00
TehRealSalt
8dca2bf5b1 Fixed Battle arrows 2018-06-11 00:59:20 -04:00
TehRealSalt
b783c54c44 Whoops, no break here 2018-06-10 21:05:09 -04:00
TehRealSalt
6fbb4f9b91 Maintenence 
- Fix merge issues
- Update invincibility flash to use its own object instead of MT_OVERLAY, so extra hacks don't need baked into overlay thinking
- K_SpawnSparkleTrail can accept mobjs now, since there really wasn't any reason it needed a player.
- Comment out a few old MK/vanilla SRB2 effects for now
 2018-06-10 16:10:24 -04:00
toaster
db1992a429 Remove unpopular exitlevel limitation. 2018-06-10 20:02:34 +01:00
TehRealSalt
a041efde6c Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder
963c4ae96b Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:Sryder/SRB2.git 
# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 23:43:25 +01:00
Sryder
ca4da92470 Fix papersprites more for real this time 
(Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)
 2018-06-09 22:58:03 +01:00
Sryder
52c41fb550 Fix the issue from the merge 2018-06-09 22:25:00 +01:00
toaster
7355c1482b At FF and Sphere's suggestion, make the ring hoops work natively in normal stages and require more replacing for special stage conversion purposes. 2018-06-09 21:42:37 +01:00
toaster
35188076ba Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 21:18:17 +01:00
Monster Iestyn
b2caed8528 Merge branch 'public_flatsprite' 
# Conflicts:
#	src/dehacked.c
#	src/hardware/hw_main.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_map.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_pspr.h
#	src/p_user.c
#	src/r_defs.h
#	src/r_things.c
#	src/r_things.h
 2018-06-09 21:14:41 +01:00
toaster
fe750464ae Restore music upon successful completion of old-style special stage 2018-06-09 21:12:56 +01:00
Sryder
f1a4042d55 Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git 
# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 21:01:59 +01:00
toaster
c85e97a05d Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again 2018-06-09 19:36:48 +01:00
Monster Iestyn
105eee7e0a Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/d_netfil.c
#	src/p_setup.c
 2018-06-09 19:35:36 +01:00
Monster Iestyn
241ec4123b Merge branch 'public_flatsprite' into 'public_flatsprite' 
OpenGL: Public flatsprite: The Fixening

See merge request STJr/SRB2!252
 2018-06-09 14:25:52 -04:00
toaster
6203a867f6 Disable bumper score icon in NiGHTS to match enemies. 2018-06-09 19:22:28 +01:00
Sryder
41cb51159d Merge branch 'next' into public_flatsprite 
I also fix papersprites in regards to flipping on one sprite fits all rotation stuff

# Conflicts:
#	src/hardware/hw_main.c
 2018-06-09 18:47:42 +01:00