cc5d248c90
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
20d86f01c7
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
db731209e5
Fix ENTER GAME option not working
2018-10-31 03:06:36 -04:00
69354856b7
"Joined with" kicks display in the chat instead of console
2018-10-31 02:46:16 -04:00
932f1f929a
SOC_CHAO hardcode
...
TODO: fix comment alignment
2018-10-30 20:35:33 -05:00
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
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
fe177975ca
Fix ping alignment.
2018-10-30 22:44:05 +00:00
f1ea725319
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
ad78c75430
Make the horizontal line at the bottom of the tab rankings use the duptweaks.
2018-10-30 22:09:04 +00:00
f36d58dd09
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup
2018-10-30 22:08:17 +00:00
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
f9d559b03c
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
7fbfed535b
Add hnext/hprev to consistancy, add marescore to resynchend
2018-10-30 16:24:27 -04:00
3378888cff
Merge branch 'toast_pokes' into 'master'
...
toast-pokes
See merge request KartKrew/Kart!65
2018-10-30 15:01:04 -04:00
98f9d73ca8
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
48a400c347
Clean up resync pak
2018-10-30 01:23:21 -04:00
7f24836d00
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:47:34 +00:00
08144b96f1
Fix SMK RR thwomps casuing bounce-up
2018-10-29 17:45:59 -04:00
52523fc4b4
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:37:06 +00:00
f1a6e1e6cd
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
318d692c3c
Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!)
2018-10-29 14:43:21 +00:00
1e4207c1de
Merge branch 'master' into 'toast_pokes'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 07:04:35 -04:00
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
adcf5a9a4e
Merge branch 'master' into 'chars_cleanup'
...
# Conflicts:
# src/hu_stuff.c
2018-10-29 06:48:18 -04:00
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
292a18804a
Merge branch 'splitscreen-tuneup' into 'master'
...
Splitscreen tuneup
See merge request KartKrew/Kart!67
2018-10-29 05:30:49 -04:00
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
f8d87c8f08
Preface with splitscreen checks
2018-10-29 05:26:17 -04:00
666f57d11b
Merge branch 'spinout-speedup' into 'master'
...
Spinout speedup
See merge request KartKrew/Kart!63
2018-10-29 05:24:50 -04:00
14fcda0eca
Make shadows more consistent on slopes for non-players
2018-10-29 05:21:47 -04:00
9f18164ad4
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
9630e01616
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
b83286b532
Use k_itemtype as the additional check instead of pw_shield
2018-10-28 14:45:01 -04:00
9d6563fcf7
Fix kartspeed/kartweight writes
2018-10-28 14:43:58 -04:00
75efd3e2c5
Ping offset fixed even more
2018-10-28 18:06:21 +00:00
a23c62e60e
Move lap animation up slightly
...
(I'm not gonna remember to do this later either)
2018-10-28 13:52:25 -04:00
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
fe00f34562
unused variable [screams]
2018-10-28 16:29:56 +00:00
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
a885f340ae
Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen
2018-10-28 01:50:27 -04:00
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
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
b6d8c3ea7d
This didn't commit with for some reason...
2018-10-28 01:02:49 -04:00
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
5a719afbc1
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 00:58:49 -04:00
8d78ee7458
No more rescaling gfx for countdown/finish
2018-10-27 23:14:11 -04:00
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
d0a50ae247
This bothers me, so I might as well do it while I'm in here.
2018-10-27 21:48:50 -04:00
dc5a738f7f
"if !splitscreen" instances that SHOULD be "if netgame"
2018-10-27 21:45:04 -04:00
TehRealSalt