Commit graph

4203 commits

Author SHA1 Message Date
TehRealSalt
53e017f649 wrong var fix 2018-11-02 14:01:29 -04:00
Monster Iestyn
b4ef5c4060 Merge branch 'master' into next 2018-11-02 11:02:35 +00:00
Monster Iestyn
529f38d1e9 Merge branch 'patch-offsets-fix' into 'master'
Patch offsets fix

See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
TehRealSalt
62152af724 Merge branch 'master' into all_hardcode 2018-11-02 02:30:36 -04:00
TehRealSalt
0148c1209c quick merge fix 2018-11-02 02:28:34 -04:00
TehRealSalt
ab02ea1e1a Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
Sal
a7ad98c64c Merge branch 'chars_cleanup' into 'master'
Chars cleanup

See merge request KartKrew/Kart!64
2018-11-02 01:32:52 -04:00
TehRealSalt
f7ca5685e2 Use chars.kart 2018-11-02 01:22:52 -04:00
TehRealSalt
3af5af996d Fix ghost rankings issue 2018-11-02 01:19:25 -04:00
TehRealSalt
ed7e5cae14 Merge branch 'master' into chars_cleanup 2018-11-01 23:48:22 -04:00
Sal
b86c04125d Merge branch 'resync' into 'master'
Resync fixes

See merge request KartKrew/Kart!69
2018-11-01 23:38:17 -04:00
TehRealSalt
75af6af57c Actually lets just do this now, like how its done below 2018-11-01 21:05:52 -04:00
TehRealSalt
71db7214e4 0xFFFF to 0xFFFFFFFF
I'll implement proper bit-setting later, just gotta see if it works first
2018-11-01 20:50:19 -04:00
TehRealSalt
fbc4c3464d Change out the hex used for hnext/hprev consistancy 2018-11-01 20:46:20 -04:00
TehRealSalt
5360bff294 Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
Sal
ee23d2e1bc Merge branch 'more-fixes' into 'master'
More fixes

See merge request KartKrew/Kart!76
2018-11-01 19:53:08 -04:00
TehRealSalt
28e40b7e97 Fix random crash on squishing
Why does this cause a crash? I dunno, beats me, but this seemed to fix it.
2018-11-01 19:50:31 -04:00
TehRealSalt
053579371a Merge branch 'master' into more-fixes 2018-11-01 18:10:53 -04:00
Sal
36b52ec936 Merge branch 'brake-drift' into 'master'
Brake drift effect

See merge request KartKrew/Kart!74
2018-11-01 18:02:06 -04:00
TehRealSalt
3c050b44f3 Change default brake color from Yellow to White 2018-11-01 17:37:59 -04:00
TehRealSalt
9223b06ff4 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt
11fa783ace Merge branch 'master' into brake-drift 2018-11-01 17:35:45 -04:00
Sal
5228bfe7de Merge branch 'battle-visuals' into 'master'
Battle visuals

See merge request KartKrew/Kart!77
2018-11-01 17:35:11 -04:00
TehRealSalt
5b23270433 Merge branch 'master' into battle-visuals 2018-11-01 17:35:01 -04:00
Sal
c7329dae3f Merge branch 'lap-anim-update' into 'master'
Lap start animation update

See merge request KartKrew/Kart!75
2018-11-01 17:32:20 -04:00
TehRealSalt
b26ef23b52 Double length of msg 2018-11-01 17:08:30 -04:00
TehRealSalt
5cebc06db6 Properly center this 2018-11-01 17:06:10 -04:00
TehRealSalt
0c0a53b2d6 Lap hands touch-up 2018-11-01 16:15:25 -04:00
Steel Titanium
d7a0a3c94b Update copyright info on some files 2018-11-01 14:47:19 -04:00
TehRealSalt
a4ad09c470 First frame lasts longer 2018-11-01 13:44:09 -04:00
TehRealSalt
e59102365f Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
ee033c1ac4 YOU GOT EM
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-10-31 23:34:13 -04:00
TehRealSalt
04dc2978ab Added judging hands (if'd out) 2018-10-31 23:10:38 -04:00
TehRealSalt
94429a1cb6 Fix offsets, add colormapping 2018-10-31 22:38:43 -04:00
TehRealSalt
dd28bda75f Brake drfit effect 2018-10-31 21:35:17 -04:00
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
Monster Iestyn
aa35e4206a Merge branch 'master' into next 2018-10-31 23:10:57 +00:00
Monster Iestyn
c941971a0a Merge branch 'mi-minor-refactoring-backport' into 'master'
MI minor refactoring

See merge request STJr/SRB2!294
2018-10-31 16:49:30 -04:00
Monster Iestyn
22734fa585 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
7cef400f0e 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
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
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