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
Latapostrophe
f0a4388998
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01: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
Latapostrophe
9fe01d90d8
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01: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
Steel Titanium
9847e6d181
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c
Fix up 64-bit gme
2018-10-30 20:50:36 -04: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
Latapostrophe
c7b8836f90
I'm a genius and forgot to rename the stuff correctly
2018-10-30 23:10:56 +01: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
Latapostrophe
7c5ccd7019
Removed some useless stuff
2018-10-30 23:08:58 +01: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
Latapostrophe
24580087d0
got rid of the settop as well
2018-10-30 22:51:05 +01:00
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
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
LJSonik
3a8ee79cb1
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01: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
