Latapostrophe
5ef97a6ec8
remove gL check
2018-10-30 22:29:28 +01: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
Latapostrophe
6ca6c094db
Small hud library additions
2018-10-30 19:40:59 +01:00
Latapostrophe
295bf081a7
A few additions to the hud library
2018-10-30 18:24:03 +01:00
Monster Iestyn
18871da721
now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore
2018-10-30 14:22:21 +00:00
Monster Iestyn
a56074b238
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00: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
Monster Iestyn
ffe3b57f29
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
Monster Iestyn
80573f266f
HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields
2018-10-29 13:29:16 +00:00
Monster Iestyn
2b16b8241f
Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own
2018-10-29 12:36:09 +00:00
Monster Iestyn
81fb42a2b4
V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP
2018-10-29 12:06:22 +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
TehRealSalt
6c5e7678d1
Use V_ORANGEMAP for blinking WANTED text in Battle splitscreen
2018-10-28 01:50:27 -04:00
TehRealSalt
ab518c611c
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
a8e549e0c5
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
2f9fa0250d
This didn't commit with for some reason...
2018-10-28 01:02:49 -04:00
TehRealSalt
88831ae79f
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
c5cfc84a8c
Fix up respawning so that it takes respawning with Shrink into account
2018-10-28 00:58:49 -04:00
TehRealSalt
0f69bb3865
No more rescaling gfx for countdown/finish
2018-10-27 23:14:11 -04:00
TehRealSalt
c0098eecbe
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
8d7d84e72a
This bothers me, so I might as well do it while I'm in here.
2018-10-27 21:48:50 -04:00
TehRealSalt
7e15e8b55d
"if !splitscreen" instances that SHOULD be "if netgame"
2018-10-27 21:45:04 -04:00
TehRealSalt
89cd20bd70
Higher default scale, WANTED indicator scales properly
2018-10-27 20:56:11 -04:00
TehRealSalt
02c425696f
Reduce camspeed in splitscreen
2018-10-27 20:44:05 -04:00
toaster
3516b11b33
toaster: not good at stuff (signpost z offset fix)
2018-10-27 22:23:44 +01:00