vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3798 commits 50 branches 7 tags 75 MiB
Commit graph

3798 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster 659e6fa617 That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. 
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
 2018-11-01 00:10:34 +00:00
TehRealSalt aea453f6f2 Set stats to what we want them to be for R2 anyway 
(Eggman's will need updating in the wad)
 2018-10-30 20:11:15 -04:00
toaster 26241d32ce Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. 
Hopefully this solves our disconnect woes.
 2018-10-30 23:01:17 +00:00
toaster fe177975ca Fix ping alignment. 2018-10-30 22:44:05 +00:00
toaster ad78c75430 Make the horizontal line at the bottom of the tab rankings use the duptweaks. 2018-10-30 22:09:04 +00:00
toaster f36d58dd09 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster 6c020aab2e Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...) 2018-10-30 22:07:35 +00:00
Sal 3378888cff Merge branch 'toast_pokes' into 'master' 
toast-pokes

See merge request KartKrew/Kart!65
 2018-10-30 15:01:04 -04:00
toaster 318d692c3c Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!) 2018-10-29 14:43:21 +00:00
toaster 1e4207c1de Merge branch 'master' into 'toast_pokes' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 07:04:35 -04:00
toaster e2399c1638 Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.) 2018-10-29 06:57:45 -04:00
toaster adcf5a9a4e Merge branch 'master' into 'chars_cleanup' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 06:48:18 -04:00
Sal 07a31c20d6 Merge branch 'grow-shrink-fixes' into 'master' 
Invincibility item & Shrink fixes

See merge request KartKrew/Kart!68
 2018-10-29 05:32:20 -04:00
Sal 292a18804a Merge branch 'splitscreen-tuneup' into 'master' 
Splitscreen tuneup

See merge request KartKrew/Kart!67
 2018-10-29 05:30:49 -04:00
Sal 8dbb636b2f Merge branch 'div-sounds' into 'master' 
Divide sound with number of local players

See merge request KartKrew/Kart!66
 2018-10-29 05:26:51 -04:00
TehRealSalt f8d87c8f08 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
Sal 666f57d11b Merge branch 'spinout-speedup' into 'master' 
Spinout speedup

See merge request KartKrew/Kart!63
 2018-10-29 05:24:50 -04:00
toaster 75efd3e2c5 Ping offset fixed even more 2018-10-28 18:06:21 +00:00
TehRealSalt a23c62e60e Move lap animation up slightly 
(I'm not gonna remember to do this later either)
 2018-10-28 13:52:25 -04:00
toaster 49e25abb60 fix ping drawing offset (this won't be in the exe I uploaded before I disappear for a bit) 2018-10-28 16:34:02 +00:00
toaster fe00f34562 unused variable [screams] 2018-10-28 16:29:56 +00:00
toaster a9b4a56d23 Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head. 
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
 2018-10-28 16:27:55 +00:00
TehRealSalt a885f340ae Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen 2018-10-28 01:50:27 -04:00
TehRealSalt 84c9dbfcce Even better: base it off how much timer is left 
So instead of prioritizing a specific track, the person who activated their powerup the latest gets their music. That should be a nicer solution for when multiple players are activating their powerups at the same time.
 2018-10-28 01:38:01 -04:00
TehRealSalt 67a8ee178d More smoothly decide which invincibility music to use 
Less P_RestoreMusic conflicts in splitscreen, just see the Toxic Palace video for an example :V
 2018-10-28 01:22:26 -04:00
TehRealSalt b6d8c3ea7d This didn't commit with for some reason... 2018-10-28 01:02:49 -04:00
TehRealSalt 93e989cf61 Fix invincibility item cap 
It was supposed to be capped at 2 invincibility items at a time, not 3. (may consider scaling with number of players, just not for R1)
 2018-10-28 01:02:30 -04:00
TehRealSalt 5a719afbc1 Fix up respawning so that it takes respawning with Shrink into account 2018-10-28 00:58:49 -04:00
TehRealSalt 8d78ee7458 No more rescaling gfx for countdown/finish 2018-10-27 23:14:11 -04:00
TehRealSalt e9515294e8 Show LOSE/COOL in splitscreen again 
Looked goofy offline, with 1 WIN and 3 LOSEs, but now that there's COOL and online splitscreen I thought it should come back
 2018-10-27 22:43:57 -04:00
TehRealSalt d0a50ae247 This bothers me, so I might as well do it while I'm in here. 2018-10-27 21:48:50 -04:00
TehRealSalt dc5a738f7f "if !splitscreen" instances that SHOULD be "if netgame" 2018-10-27 21:45:04 -04:00
TehRealSalt f1f8f91aea Higher default scale, WANTED indicator scales properly 2018-10-27 20:56:11 -04:00
TehRealSalt 339a857cba Reduce camspeed in splitscreen 2018-10-27 20:44:05 -04:00
toaster 4c7f083d13 toaster: not good at stuff (signpost z offset fix) 2018-10-27 22:23:44 +01:00
toaster e8410b2575 Fix and then subsequently disable the zoom tube angle setting stuff. 2018-10-27 22:05:15 +01:00
toaster 3d760271e3 Fix the issue with sliding I identified this morning. 
Also, apply it to being in a zoom tube, too! For extra forwards compatibility with all the terrible SRB2 Riders ports that are almost an inevitability.
 2018-10-27 21:41:45 +01:00
toaster 119c9f34ae Minor correction - Jeck initially got it wrong, but informed me after lots of testin's. 2018-10-27 21:30:41 +01:00
toaster 8b382d2e40 As requested by Jeck: 
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
 2018-10-27 21:16:19 +01:00
toaster 68da56671e Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect. 2018-10-27 20:44:18 +01:00
toaster 88b6e9e1bd Minor things that annoyed me to NO GOOD END. 
* Tweak the demo info layout (holding tab while demoplayback) to better match the Viewpoint text in MP.
* Make the tab rankings view support widescreen better, including the spectator ticker (but not the player name layout).
* Make the tab rankings view always have a darkened background, to get around the fact we can't darken it based on player state for battle.
* Remove FREE PLAY from tab rankings.
 2018-10-27 20:43:33 +01:00
toaster 564cfb33b4 Fade stuff! 
* Make the white intro fade always drawn, rather than potentially disable-able through tab or HUD disable.
* Slightly increase the darkness of the intermission fade, since its current value had a negative effect on SKINCOLOR_SAPPHIRE.
 2018-10-27 20:39:41 +01:00
toaster bd36816b39 dumbass who forgot to stage most of the actual changes because she actually deleted all the changes and then remade them by accident 2018-10-27 16:25:25 +01:00
toaster d78368d4d2 Felt like cleaning up the character frame list. Definitely won't merge conflict with anything else. 
Requires charscleanup.kart. Ezo, if you want me to, I can fix up bonuschars for this tweaked system.
 2018-10-27 15:43:33 +01:00
TehRealSalt a8dfd45d9c Merge branch 'master' into div-sounds 2018-10-26 01:15:10 -04:00
TehRealSalt 8058b77743 Combine spinout & wipeout timers 
Turns out they were only 1 tic apart originally, sooo
 2018-10-26 01:07:54 -04:00
TehRealSalt 6dd7718d6e More consistent face-forward 
Needs it to still land in a close ballpark, so the timer changes are still needed, but  this makes it less prone to error
 2018-10-26 01:07:14 -04:00
TehRealSalt 240d7a44c1 CRITICAL BUGFIX 
Make sure flashing tics don't go down WHILE you're in a hit animation (wipeout, squished)
 2018-10-26 00:56:02 -04:00
TehRealSalt 27f118a06c Adjust spinout times to face your forward about 90% of the time 2018-10-26 00:55:20 -04:00
TehRealSalt 555fbbe2f5 Speed up spinout based on timer left 2018-10-26 00:51:58 -04:00