Commit graph

3895 commits

Author SHA1 Message Date
toaster
9f1acf3528 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
aff865a3e7 Item distribution experiments based on my experience in netgames
Needs tested tonight.

- Grow & Rocket Sneakers are slightly more in the back
- Sneaker x3 gets handed out more in the back-middle
- Removed 5% from Ballhog towards the front
- Removed 5% from Shrink in the forward-most column it was in
2018-10-31 15:14:53 -04:00
toaster
edde8575c7 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-31 16:19:50 +00:00
toaster
741ba90b74 Order of state enums was different to that of info table, so corrected. 2018-10-31 16:18:44 +00:00
toaster
a90006ef4e Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-10-31 15:19:39 +00:00
TehRealSalt
fc011ce813 Nerfed squishing
After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V
2018-10-31 05:35:06 -04:00
TehRealSalt
971040fba9 No item usage while squished or respawning 2018-10-31 05:32:59 -04:00
TehRealSalt
e5e7bc4c11 Use frameangle for rocket sneakers so they rotate around you when you spinout 2018-10-31 05:28:39 -04:00
TehRealSalt
ef44df0081 Fix incorrect scale of player arrows in non-splitscreen
whoops
2018-10-31 04:55:00 -04:00
TehRealSalt
65f6747887 Push fakes away from other items
Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)
2018-10-31 04:46:24 -04:00
TehRealSalt
b08fb14d62 Time over cam & signposts support mobjscale 2018-10-31 03:13:56 -04:00
TehRealSalt
f5be6fb910 Cancel pogo spring when bumping a wall
Prevents instances where you can use it to stick in one spot in Battle
2018-10-31 03:07:33 -04:00
TehRealSalt
3761a51e6b Fix ENTER GAME option not working 2018-10-31 03:06:36 -04:00
TehRealSalt
63130de7f0 "Joined with" kicks display in the chat instead of console 2018-10-31 02:46:16 -04:00
wolfy852
40ad082bcf SOC_CHAO hardcode
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
TehRealSalt
5c5894202b 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
bac297b658 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
c71e71a4b4 Fix ping alignment. 2018-10-30 22:44:05 +00:00
TehRealSalt
adf988f2c9 Clean up for player->mo resyncing
Make most of the order match the struct, make sure proper type conversions are used when needed
2018-10-30 18:20:56 -04:00
toaster
76a5f98c62 Make the horizontal line at the bottom of the tab rankings use the duptweaks. 2018-10-30 22:09:04 +00:00
toaster
ee4cbe4b51 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster
ae47951a2e 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
TehRealSalt
53e22e5769 Fuck it, add back in the old vars
If we want a smaller resync packet, let's actually remove these FOR REAL
2018-10-30 17:03:11 -04:00
TehRealSalt
e3bf06432a Add hnext/hprev to consistancy, add marescore to resynchend 2018-10-30 16:24:27 -04:00
Sal
9db0c385f1 Merge branch 'toast_pokes' into 'master'
toast-pokes

See merge request KartKrew/Kart!65
2018-10-30 15:01:04 -04:00
toaster
6909bd25f9 No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic
(The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)
2018-10-30 11:08:53 +00:00
TehRealSalt
88227a1f83 Clean up resync pak 2018-10-30 01:23:21 -04:00
toaster
97274177d3 Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:47:34 +00:00
TehRealSalt
4bf4bcadda Fix SMK RR thwomps casuing bounce-up 2018-10-29 17:45:59 -04:00
toaster
8d575c9b56 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
toaster
381264580d Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
2018-10-29 21:36:39 +00:00
toaster
081c9c36e5 Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!) 2018-10-29 14:43:21 +00:00
toaster
4766d3fbea Merge branch 'master' into 'toast_pokes'
# Conflicts:
#   src/hu_stuff.c
2018-10-29 07:04:35 -04:00
toaster
d1ac57e4ec 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
1c01e1af14 Merge branch 'master' into 'chars_cleanup'
# Conflicts:
#   src/hu_stuff.c
2018-10-29 06:48:18 -04:00
Sal
76778baa90 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
916fb49be6 Merge branch 'splitscreen-tuneup' into 'master'
Splitscreen tuneup

See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
Sal
02e74a3010 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
fc156e6fb5 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
Sal
79dd2236aa Merge branch 'spinout-speedup' into 'master'
Spinout speedup

See merge request KartKrew/Kart!63
2018-10-29 05:24:50 -04:00
TehRealSalt
37f949bb38 Make shadows more consistent on slopes for non-players 2018-10-29 05:21:47 -04:00
TehRealSalt
193941945e The motherload: all of my Lua is hardcoded
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
TehRealSalt
f9d8ebd4e6 Camera crash fixes
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
2018-10-28 17:31:59 -04:00
TehRealSalt
d106cf701b Use k_itemtype as the additional check instead of pw_shield 2018-10-28 14:45:01 -04:00
TehRealSalt
5496803ced Fix kartspeed/kartweight writes 2018-10-28 14:43:58 -04:00
toaster
6ab0faae6f Ping offset fixed even more 2018-10-28 18:06:21 +00:00
TehRealSalt
c6d18edf7c Move lap animation up slightly
(I'm not gonna remember to do this later either)
2018-10-28 13:52:25 -04:00
toaster
62bd9fafbf 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
9195885ff5 unused variable [screams] 2018-10-28 16:29:56 +00:00
toaster
3c04b2103b 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