Monster Iestyn
61c1b12960
Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master'
...
Multi-patch texture support for transparency AND translucency
See merge request STJr/SRB2!293
2018-10-31 16:48:38 -04:00
Monster Iestyn
e9ea1b47d5
Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens
2018-10-31 19:26:29 +00:00
TehRealSalt
2999c45d05
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
007ef084c6
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-31 16:19:50 +00:00
toaster
668acad8a7
Order of state enums was different to that of info table, so corrected.
2018-10-31 16:18:44 +00:00
Latapostrophe
1928dd86f1
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
toaster
8370064706
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
7a04fd1097
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
TehRealSalt
80b8aefdb2
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
e76da7d5ca
No item usage while squished or respawning
2018-10-31 05:32:59 -04:00
TehRealSalt
54f71d3dbf
Use frameangle for rocket sneakers so they rotate around you when you spinout
2018-10-31 05:28:39 -04:00
TehRealSalt
6da700629f
Fix incorrect scale of player arrows in non-splitscreen
...
whoops
2018-10-31 04:55:00 -04:00
TehRealSalt
66a7adfc34
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
cc5d248c90
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
TehRealSalt
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
TehRealSalt
db731209e5
Fix ENTER GAME option not working
2018-10-31 03:06:36 -04:00
TehRealSalt
69354856b7
"Joined with" kicks display in the chat instead of console
2018-10-31 02:46:16 -04:00
wolfy852
932f1f929a
SOC_CHAO hardcode
...
TODO: fix comment alignment
2018-10-30 20:35:33 -05: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
TehRealSalt
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
Latapostrophe
f2eea0b31a
I'm a genius and forgot to rename the stuff correctly
2018-10-30 23:10:56 +01: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
Latapostrophe
b6b19c8250
Removed some useless stuff
2018-10-30 23:08:58 +01: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
Latapostrophe
6841458546
got rid of the settop as well
2018-10-30 22:51:05 +01:00
Latapostrophe
799d8d2749
remove gL check
2018-10-30 22:29:28 +01:00
TehRealSalt
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
TehRealSalt
7fbfed535b
Add hnext/hprev to consistancy, add marescore to resynchend
2018-10-30 16:24:27 -04: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
Latapostrophe
a0495142df
Small hud library additions
2018-10-30 19:40:59 +01:00
Latapostrophe
232a19edf4
A few additions to the hud library
2018-10-30 18:24:03 +01:00
Monster Iestyn
22e8dd1f9d
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
2fa0896fd0
Fix an error I made in HWR_DrawFixedPatch
2018-10-30 13:44:01 +00:00
toaster
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
TehRealSalt
48a400c347
Clean up resync pak
2018-10-30 01:23:21 -04:00
toaster
7f24836d00
Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:47:34 +00:00
TehRealSalt
08144b96f1
Fix SMK RR thwomps casuing bounce-up
2018-10-29 17:45:59 -04:00
toaster
52523fc4b4
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-29 21:37:06 +00:00
toaster
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
LJSonik
b52158eb48
Merge branch 'master' into analog-flipcam-synch-fix
2018-10-29 19:52:08 +01: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
Monster Iestyn
b022ff02a5
add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well
2018-10-29 13:34:54 +00:00
Monster Iestyn
f8fd8f8ec5
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
df9c3ef3cd
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
834a5e6b35
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
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