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
0a85e75eb8
Accidentally made HitEm sounds always play, even when hitting your own items
2018-06-09 16:42:03 +01:00
2adbcd6dfd
Merge branch 'master' into dust-kart
2018-06-09 01:00:03 +01:00
17245b2d6b
Merge branch 'master' into voice-loss-jpg
...
# Conflicts:
# src/k_kart.c
2018-06-09 00:56:39 +01:00
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
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
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
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
4e2b30fcae
Fixes
2018-06-08 00:02:28 -04:00
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
9b3751b30c
Merge branch 'master' into sonicitems
2018-06-07 19:39:45 -04:00
97caf79f16
Whoops, accidental rename
2018-06-07 20:03:47 +01:00
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
6023f794ac
Restore the removed voices
2018-06-07 19:34:13 +01:00
7f996c6dfd
P_RestoreMusic fix
2018-06-07 02:51:18 -04:00
7611f2c610
1v1 battle no items fix
2018-06-06 20:52:13 -04:00
7100db62ca
No bumping when respawning
2018-06-06 20:41:23 -04:00
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
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
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
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
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
8de3890f26
Dang it, I always forget these...
2018-06-05 18:47:15 -04:00
e39de53fa2
Use strlen for all of the valid zone title/act num checks
2018-06-05 17:28:46 -04:00
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
173d780ab7
P_RestoreMusic restores level exit music as well
...
Splitscreen fix
2018-06-05 02:41:55 -04:00
ce14c13699
Multiplayer cursors in voting
2018-06-05 02:11:47 -04:00
0fc113e6dd
actnum is now a 2 character long string
...
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
14caf66567
MFE_JUSTBOUNCEDWALL
...
Hopefully, this should prevent instances where shells/Oni get caught on walls.
2018-06-04 23:23:52 -04:00
d5a2fb9317
Disable weather in netgames
...
Some people like to lag up the whole server by enabling precip, so y'know what, just turn it off in netgames. Weather can just stay a Record Attack/splitscreen only feature now I guess
2018-06-04 22:56:58 -04:00
b4757779cd
We did it, we finally fixed... The Shell Boost Bug
...
Instead of adding to your speed, it relatively multiplies it if you're above your top speed. This is applied to ALL of Kart projectiles as well, not just shells. May we never run into our own shell that we threw on a boost pad ever again.
2018-06-04 22:53:45 -04:00
dd05edfcc0
Merge remote-tracking branch 'srb2public/next'
2018-06-04 16:58:35 -04:00
79b2ae8e7c
Merge branch 'master' into sal-misc
2018-06-04 16:37:13 -04:00
35774d4f13
Revert "Merge branch 'master' into sonicitems"
...
This reverts commit 4c0f64ff4feaaf708381
2018-06-04 16:30:16 -04:00
ae66a8f769
Minimap offset support
2018-06-04 16:19:36 -04:00
09311bf061
WHOOPS
2018-06-04 00:29:31 -04:00
518676c2a4
P, not K
2018-06-03 21:07:36 -04:00
fa125bc18d
Leave the camera behind while exiting, for dramatic effect!
2018-06-03 21:01:59 -04:00
6d57d39e12
SUPER CHARGED KARMA ITEMS
...
They give equal chance on a lot of good shit, instead of the normal boring pool of items, mwahaha
(also calls P_CheckRacers when someone spectates)
2018-06-03 20:58:52 -04:00
e3008407d1
Adjustin' to Oni's requests
...
Only 1st place finish sound is global, use signpost instead of starpost
2018-06-03 20:19:03 -04:00
8408b1fef4
Some Battle fixes and additions
...
- mapgotboxes is synched
- Karma bombs/items flash while spinning out
- Karma bombs have a sound + explosion when hitting someone
- Karma bombs can no longer attempt to attack a player that is flashing and have to WAIT... again
- Fixed MT_GREENITEM's bounce sound, after breaking from last commit (WHY ARE YOU ABUSING MARIO MODE SOUNDS, STOP, AGHH)
2018-06-03 20:11:08 -04:00
0906978a2a
Remove collide debug stuff
2018-06-03 18:58:50 -04:00
b0099bd1cc
Less timer reduce on gold shroom
2018-06-03 18:25:28 -04:00
a223218155
Exit siren, disable constant forcing of Mario Mode sounds
2018-06-03 18:20:21 -04:00
483ac75238
Support ALL of the classic games' sounds
...
Sonic 1, 2, 3D Blast, & CD, on top of the existing S3K and Chaotix.
2018-06-03 16:13:26 -04:00
bf042ed86c
Merge branch 'master' into next
2018-06-03 20:17:51 +01:00
650e0eafce
Merge branch 'fixedmul-c-fix' into 'master'
...
Correct C FixedMul() off-by-one errors
See merge request STJr/SRB2!245
2018-06-03 15:14:06 -04:00
602d5e0aa0
Merge branch 'f12-fix' into 'master'
...
F12 fix
See merge request STJr/SRB2!250
2018-06-03 15:11:20 -04:00
37b8be2103
Merge branch 'demototalplaytime' into 'next'
...
Don't increment totalplaytime if a demo is playing.
See merge request STJr/SRB2!241
2018-06-03 15:10:42 -04:00
ef174f7b43
Merge branch 'opengl-mappalette-fix' into 'master'
...
OpenGL: Map Specific Palette Fix
See merge request STJr/SRB2!247
2018-06-03 15:09:23 -04:00
Sryder