8d5fb13111
wrong var fix
2018-11-02 14:01:29 -04:00
f37a573834
Merge branch 'master' into next
2018-11-02 11:02:35 +00:00
ba5f5be3bb
Merge branch 'patch-offsets-fix' into 'master'
...
Patch offsets fix
See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
37893cc523
Merge branch 'master' into all_hardcode
2018-11-02 02:30:36 -04:00
1bdaad3f06
quick merge fix
2018-11-02 02:28:34 -04:00
5c1cc6e1df
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
0154ef1d01
Merge branch 'chars_cleanup' into 'master'
...
Chars cleanup
See merge request KartKrew/Kart!64
2018-11-02 01:32:52 -04:00
667e636631
Use chars.kart
2018-11-02 01:22:52 -04:00
6fd0f3f0ba
Fix ghost rankings issue
2018-11-02 01:19:25 -04:00
89276b739f
Merge branch 'master' into chars_cleanup
2018-11-01 23:48:22 -04:00
cdabbdddd3
Merge branch 'resync' into 'master'
...
Resync fixes
See merge request KartKrew/Kart!69
2018-11-01 23:38:17 -04:00
950bca1217
Actually lets just do this now, like how its done below
2018-11-01 21:05:52 -04:00
78299c5fee
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
67dd962fb9
Change out the hex used for hnext/hprev consistancy
2018-11-01 20:46:20 -04:00
e758e0f8fd
Merge branch 'master' into resync
2018-11-01 20:39:50 -04:00
d66225bad1
Merge branch 'more-fixes' into 'master'
...
More fixes
See merge request KartKrew/Kart!76
2018-11-01 19:53:08 -04:00
5c7de75592
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
0c2a5cf9d3
Merge branch 'master' into more-fixes
2018-11-01 18:10:53 -04:00
9abe3e24a4
Merge branch 'brake-drift' into 'master'
...
Brake drift effect
See merge request KartKrew/Kart!74
2018-11-01 18:02:06 -04:00
7e103be393
Change default brake color from Yellow to White
2018-11-01 17:37:59 -04:00
6a31959381
Merge branch 'master' into brake-drift
2018-11-01 17:37:10 -04:00
03d64cbced
Merge branch 'master' into brake-drift
2018-11-01 17:35:45 -04:00
cea1b1c26f
Merge branch 'battle-visuals' into 'master'
...
Battle visuals
See merge request KartKrew/Kart!77
2018-11-01 17:35:11 -04:00
deb51d1eb4
Merge branch 'master' into battle-visuals
2018-11-01 17:35:01 -04:00
840d964800
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
a2da81243e
Double length of msg
2018-11-01 17:08:30 -04:00
43d72d72f9
Properly center this
2018-11-01 17:06:10 -04:00
7e9300c420
Lap hands touch-up
2018-11-01 16:15:25 -04:00
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
4cf9476510
First frame lasts longer
2018-11-01 13:44:09 -04:00
7891a11fba
Battle points are visible
2018-11-01 00:57:38 -04:00
a193a4adf2
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
6c557407d5
Added judging hands (if'd out)
2018-10-31 23:10:38 -04:00
4369917912
Fix offsets, add colormapping
2018-10-31 22:38:43 -04:00
ea4ca2eb1f
Brake drfit effect
2018-10-31 21:35:17 -04:00
659e6fa617
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
4dd5abf534
Merge branch 'master' into next
2018-10-31 23:10:57 +00:00
c450a1aee2
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
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
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
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
007ef084c6
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode
2018-10-31 16:19:50 +00:00
668acad8a7
Order of state enums was different to that of info table, so corrected.
2018-10-31 16:18:44 +00:00
1928dd86f1
I forgot a }, you may slap me.
2018-10-31 17:14:32 +01:00
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
7a04fd1097
Resolved merge conflict and renamed gamerankings to minirankings
2018-10-31 15:18:05 +01:00
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
e76da7d5ca
No item usage while squished or respawning
2018-10-31 05:32:59 -04:00
54f71d3dbf
Use frameangle for rocket sneakers so they rotate around you when you spinout
2018-10-31 05:28:39 -04:00
6da700629f
Fix incorrect scale of player arrows in non-splitscreen
...
whoops
2018-10-31 04:55:00 -04:00
TehRealSalt