Commit graph

2732 commits

Author SHA1 Message Date
TehRealSalt
118721ebc1 Random items poof instead of sparkle
Also added a poof when they respawn in Battle
2018-06-13 23:37:37 -04:00
TehRealSalt
ff09a51915 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
8f9595b72f 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
5f4c0bb052 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
c818689dc1 Fix player arrows in this branch again 2018-06-13 21:33:55 -04:00
TehRealSalt
b0d6e2606d Fix karma items in this branch 2018-06-13 21:32:33 -04:00
TehRealSalt
ed73984d3e 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
d5f311681f 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
d1e206072a Minor vote screen fixes 2018-06-12 19:05:11 -04:00
TehRealSalt
510cf8b521 Fix a few minor player arrow bugs 2018-06-12 18:01:17 -04:00
TehRealSalt
1bfcb35eff 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
8bb6cc6c19 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
TehRealSalt
35eb978c69 MFE_DRAWONLYFORPx stuff ported to OpenGL, and MT_DRIFTDUST respects Boo powers 2018-06-11 02:15:27 -04:00
TehRealSalt
e415bae2e5 Forgot to uncomment after finished testing. 2018-06-11 01:56:41 -04:00
TehRealSalt
e6b33ef65f SPB fixes
Shrink also plays its sound, and Shrink/Grow have slower scaling speeds
2018-06-11 01:51:50 -04:00
TehRealSalt
a417b57bc7 Fixed Battle arrows 2018-06-11 00:59:20 -04:00
TehRealSalt
ea3b82791f Whoops, no break here 2018-06-10 21:05:09 -04:00
TehRealSalt
a554763128 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
TehRealSalt
07a18e5185 Merge branch 'master' into sonicitems 2018-06-09 22:50:21 -04:00
Sryder
fffa3db5a8 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
ea915e5778 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
82b92d1881 Fix the issue from the merge 2018-06-09 22:25:00 +01:00
Sryder
00ac4dd59b 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
Monster Iestyn
d3a60d9921 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
Sryder
0f4e8c1eda 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
Sryder
0a85e75eb8 Accidentally made HitEm sounds always play, even when hitting your own items 2018-06-09 16:42:03 +01:00
Sryder
2adbcd6dfd Merge branch 'master' into dust-kart 2018-06-09 01:00:03 +01:00
Sryder
17245b2d6b Merge branch 'master' into voice-loss-jpg
# Conflicts:
#	src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder
10270d20dd HitEm voice line can always play
Still starts the timer to at least 3 seconds on other voices though
2018-06-09 00:18:49 +01:00
Sryder
3daf6fbfd7 Slightly longer delay between voices
Fix win/lose quotes to work based on actual win/lose criteria
Don't play overtake sound until at least 10 seconds into the race
2018-06-09 00:05:05 +01:00
Sryder
f00e3dfd5a New Drift dust
Applies all the time as long as the object is turning tight enough
New Sound
Works on Red Shells too!
2018-06-08 21:13:52 +01:00
TehRealSalt
3dac0e21cc A better method of
Instead of returning at the very start of P_MoveChaseCamera, just set camstill to true, and add another exiting check to momentum. This lets the mirror mode post process effect to continue working.
2018-06-08 01:12:07 -04:00
TehRealSalt
4e2b30fcae Fixes 2018-06-08 00:02:28 -04:00
TehRealSalt
889d790ea0 Disable MT_QUESTIONBOX again
I refuse to give up the name "cv_invincibility" to another vanilla cvar that we will never use seriously.
2018-06-07 19:46:48 -04:00
TehRealSalt
9b3751b30c Merge branch 'master' into sonicitems 2018-06-07 19:39:45 -04:00
Sryder
97caf79f16 Whoops, accidental rename 2018-06-07 20:03:47 +01:00
Sryder
213749b115 Big voices change
When using a taunt voice (item usage) there's a 5 second delay on more taunts and a 2 second delay on other voices
When using other voices, there's at least a 2 second delay on all other voices
2018-06-07 19:56:26 +01:00
Sryder
6023f794ac Restore the removed voices 2018-06-07 19:34:13 +01:00
TehRealSalt
7f996c6dfd P_RestoreMusic fix 2018-06-07 02:51:18 -04:00
TehRealSalt
7611f2c610 1v1 battle no items fix 2018-06-06 20:52:13 -04:00
TehRealSalt
7100db62ca No bumping when respawning 2018-06-06 20:41:23 -04:00
TehRealSalt
adc1fa38f5 This print doesn't work for some reason?!
It keeps replacing actnum with zonttl, but ONLY if zonttl is set. Weird as heck, can't figure out why, commenting out for now.
2018-06-06 20:25:28 -04:00
TehRealSalt
babc8be5da Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
TehRealSalt
eb8464744b Adjustin' BL based off the netgame, and mashing is back
Now it just cripples your chances for good items, mwaha
2018-06-05 23:46:25 -04:00
TehRealSalt
6301d0ee38 Lightning cooldown change
- Lightning cooldown reduced to 20 seconds
- You can no longer mash to get an item quicker
2018-06-05 21:45:54 -04:00
TehRealSalt
5f610982ea The Lightning Update
- 30 sec cooldown on all lightning types
- Delay before Blue Lightning hits, based off of distance
- Blue Lightning can swap targets if 1st place is passed
- Blue Lightning can only be handed out if 2nd is far away enough from first
2018-06-05 21:36:48 -04:00
TehRealSalt
8de3890f26 Dang it, I always forget these... 2018-06-05 18:47:15 -04:00
TehRealSalt
e39de53fa2 Use strlen for all of the valid zone title/act num checks 2018-06-05 17:28:46 -04:00
TehRealSalt
d3793cb19c Lots of cmd restructuring.
- cmd->driftturn exists now, for figuring out how far you're turning. Added to prevent analog sticks from being able to get drift sparks faster.
- Feather bounce strafing moved to use cmd->sidemove, which means it also supports analog now.
- Braking now waits a few tics for you to be stopped for a few tics before it lets you go in reverse, as per Sev's request.
- Removed a lot of unused/redundant/commented out control code, and reorganized some of the existing code.
2018-06-05 17:12:42 -04:00
TehRealSalt
173d780ab7 P_RestoreMusic restores level exit music as well
Splitscreen fix
2018-06-05 02:41:55 -04:00