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
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
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
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
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
Sryder
dabfea434c
Accidentally made HitEm sounds always play, even when hitting your own items
2018-06-09 16:42:03 +01:00
Sryder
5a3f27b0fe
Merge branch 'master' into dust-kart
2018-06-09 01:00:03 +01:00
Sryder
6b5df29681
Merge branch 'master' into voice-loss-jpg
...
# Conflicts:
# src/k_kart.c
2018-06-09 00:56:39 +01:00
Sryder
4f19960324
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
0b3d031a55
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
2329fddb25
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
c653ad0050
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
5d8fbba2a1
Fixes
2018-06-08 00:02:28 -04:00
TehRealSalt
b53a6c4d07
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
3d9f1a90e1
Merge branch 'master' into sonicitems
2018-06-07 19:39:45 -04:00
Sryder
c94ab8d295
Whoops, accidental rename
2018-06-07 20:03:47 +01:00
Sryder
2a04059ace
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
4ab28e017e
Restore the removed voices
2018-06-07 19:34:13 +01:00
TehRealSalt
8ba0fd4ea1
P_RestoreMusic fix
2018-06-07 02:51:18 -04:00
TehRealSalt
c57d25b213
1v1 battle no items fix
2018-06-06 20:52:13 -04:00
TehRealSalt
795ed07a30
No bumping when respawning
2018-06-06 20:41:23 -04:00
TehRealSalt
d24f0597b0
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
118f8f8b2d
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
14dcbe1a21
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
441f0f8abf
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
09fa365bb1
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
b871a4d8e1
Dang it, I always forget these...
2018-06-05 18:47:15 -04:00
TehRealSalt
4fd88293ff
Use strlen for all of the valid zone title/act num checks
2018-06-05 17:28:46 -04:00
TehRealSalt
23d83423cc
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
d00e29c7df
P_RestoreMusic restores level exit music as well
...
Splitscreen fix
2018-06-05 02:41:55 -04:00
TehRealSalt
99b55ea3a1
Multiplayer cursors in voting
2018-06-05 02:11:47 -04:00
TehRealSalt
a1fad489c6
actnum is now a 2 character long string
...
For Cloud Cradle Zone, Act K
2018-06-05 01:34:05 -04:00
TehRealSalt
3289f4aab5
MFE_JUSTBOUNCEDWALL
...
Hopefully, this should prevent instances where shells/Oni get caught on walls.
2018-06-04 23:23:52 -04:00
TehRealSalt
d9998d94fb
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
TehRealSalt
64c8423897
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
TehRealSalt
ec23771ef7
Merge remote-tracking branch 'srb2public/next'
2018-06-04 16:58:35 -04:00
TehRealSalt
a1c6b6ad9f
Merge branch 'master' into sal-misc
2018-06-04 16:37:13 -04:00
Louis-Antoine
65e9bed30f
xd
2018-06-04 22:30:27 +02:00
TehRealSalt
3ff296787a
Revert "Merge branch 'master' into sonicitems"
...
This reverts commit ec65ad380e , reversing
changes made to 70baa4fcd8 .
2018-06-04 16:30:16 -04:00
TehRealSalt
5a8eab9513
Minimap offset support
2018-06-04 16:19:36 -04:00
Louis-Antoine
8aa92d5894
Disable admin password by default
2018-06-04 22:14:01 +02:00
TehRealSalt
01d67c18b3
WHOOPS
2018-06-04 00:29:31 -04:00
TehRealSalt
8a82c5eb66
P, not K
2018-06-03 21:07:36 -04:00