stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
2708 commits 60 branches 11 tags 94 MiB
Commit graph

2708 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
TehRealSalt
ce14c13699 Multiplayer cursors in voting 2018-06-05 02:11:47 -04:00
TehRealSalt
0fc113e6dd actnum is now a 2 character long string 
For Cloud Cradle Zone, Act K
 2018-06-05 01:34:05 -04:00
TehRealSalt
14caf66567 MFE_JUSTBOUNCEDWALL 
Hopefully, this should prevent instances where shells/Oni get caught on walls.
 2018-06-04 23:23:52 -04:00
TehRealSalt
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
TehRealSalt
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
TehRealSalt
dd05edfcc0 Merge remote-tracking branch 'srb2public/next' 2018-06-04 16:58:35 -04:00
TehRealSalt
79b2ae8e7c Merge branch 'master' into sal-misc 2018-06-04 16:37:13 -04:00
TehRealSalt
35774d4f13 Revert "Merge branch 'master' into sonicitems" 
This reverts commit 4c0f64ff4f, reversing
changes made to eaaf708381.
 2018-06-04 16:30:16 -04:00
TehRealSalt
ae66a8f769 Minimap offset support 2018-06-04 16:19:36 -04:00
TehRealSalt
09311bf061 WHOOPS 2018-06-04 00:29:31 -04:00
TehRealSalt
518676c2a4 P, not K 2018-06-03 21:07:36 -04:00
TehRealSalt
fa125bc18d Leave the camera behind while exiting, for dramatic effect! 2018-06-03 21:01:59 -04:00
TehRealSalt
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
TehRealSalt
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
TehRealSalt
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
TehRealSalt
0906978a2a Remove collide debug stuff 2018-06-03 18:58:50 -04:00
TehRealSalt
b0099bd1cc Less timer reduce on gold shroom 2018-06-03 18:25:28 -04:00
TehRealSalt
a223218155 Exit siren, disable constant forcing of Mario Mode sounds 2018-06-03 18:20:21 -04:00
TehRealSalt
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
Monster Iestyn
bf042ed86c Merge branch 'master' into next 2018-06-03 20:17:51 +01:00
Monster Iestyn
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
Monster Iestyn
602d5e0aa0 Merge branch 'f12-fix' into 'master' 
F12 fix

See merge request STJr/SRB2!250
 2018-06-03 15:11:20 -04:00
Monster Iestyn
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