Commit graph

6162 commits

Author SHA1 Message Date
TehRealSalt
1fc9009bd3 Put these special cases behind RaceGametype 2019-05-21 01:10:54 -04:00
TehRealSalt
99ed66ac46 Bubble Shield, Flame Shield changes 2019-05-21 01:01:29 -04:00
TehRealSalt
52bd194c69 Flame Shield updatin's 2019-05-20 15:39:33 -04:00
TehRealSalt
1e7b79144d Nice things
- Fix off-by-one error in shieldout code
- Added KartItemCVars array for anything to use
- More I_Asserts in item logic
2019-05-20 14:17:16 -04:00
TehRealSalt
480d56838f Add cvars to prevent issues 2019-05-20 00:50:44 -04:00
Sryder
7756620028 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange
# Conflicts:
#	src/k_kart.c
2019-05-17 22:39:01 +01:00
wolfy852
519a289373 Fix the permanent instashield bug 2019-05-17 08:06:18 -05:00
wolfy852
1c52319d08 More credits updates 2019-05-17 03:55:51 -05:00
Latapostrophe
cd4b9abb78 SPB intangibility 2019-05-17 03:55:23 -05:00
TehRealSalt
4e5fdc1fa2 Merge branch 'rings' into new-items 2019-05-14 23:12:49 -04:00
TehRealSalt
1e2c7e3461 Update combi-band colors 2019-05-14 23:00:15 -04:00
TehRealSalt
bb6fe9fc54 Merge branch 'master' into rings 2019-05-14 22:26:22 -04:00
TehRealSalt
ce39456a24 Merge branch 'v1' into new-palette 2019-05-14 21:01:32 -04:00
TehRealSalt
407344299c Rename colors
My attempt at compromise didn't work, so I'll just have it my way
2019-05-14 21:00:40 -04:00
TehRealSalt
ddaf5658d5 Finish skincolors
The only thing remaining is super colors, but I'm not too fussed about that for a merge request because
2019-05-13 23:21:07 -04:00
Latapostrophe
c54cc42e74 Add command to disable followers clientside 2019-05-13 19:53:17 +02:00
wolfy852
f3b6b732f8 Update bonuschars credits 2019-05-13 12:49:44 -05:00
TehRealSalt
62aeeea9cb Fix a couple of things not using pure white 2019-05-13 12:50:36 -04:00
TehRealSalt
e1c8ac77c1 Remove R_InitSkins
(Sonic's S_SKIN is now in chars.pk3)
2019-05-13 11:46:47 -04:00
TehRealSalt
6ee5b2d887 Change some of the text colors 2019-05-12 21:49:11 -04:00
TehRealSalt
cff9ba5090 Do not ignore colorization for index 120 anymore 2019-05-12 21:14:20 -04:00
TehRealSalt
da7e79ac83 Adjust file loading
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -04:00
wolfy852
4f3fbb8da5 Fix viewpoint being reset on boost when spectating 2019-05-12 16:38:50 -05:00
TehRealSalt
dc41fe3d8d Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff 2019-05-12 17:19:49 -04:00
wolfy852
ed55a63b58 Fix rewind previews not showing for player 1 2019-05-12 14:42:39 -05:00
TehRealSalt
5c3cac52e6 Merge branch 'master' into rings 2019-05-12 15:28:15 -04:00
TehRealSalt
db5f8e8c6b Merge branch 'v1' 2019-05-12 15:26:03 -04:00
TehRealSalt
50c86f110e Add splitscreen SPB lock animation 2019-05-12 15:23:17 -04:00
TehRealSalt
791103d34e Ring is 1 pixel off for P2/P4 2019-05-12 14:34:52 -04:00
TehRealSalt
933ca5c3a4 Add an array for unsynced, HUD animation variables
Reduces the size of kartstuff_t, and makes it easy to add even more HUD animations. Fixes viewpoints being wonky for rings.
2019-05-12 14:33:18 -04:00
Latapostrophe
a0e27c22e7 make followers work with replays 2019-05-12 13:41:46 +02:00
wolfy852
08bf9ee1f5 whoops
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05:00
Latapostrophe
c83127293b resolve conflict in m_menu 2019-05-12 10:48:54 +02:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
2019-05-12 03:40:02 -05:00
Latapostrophe
1a7af92d9f fix being unable to remove follower outside of netgames 2019-05-12 10:34:10 +02:00
wolfy852
5613446b6f Have Look Back reset your color to prefcolor 2019-05-12 03:21:46 -05:00
wolfy852
54d61b188c Have "None" work as an alias for -1 2019-05-12 03:07:17 -05:00
TehRealSalt
7884f63849 Updated 4P HUD 2019-05-11 23:37:10 -04:00
TehRealSalt
c2a07b486b Add Flame Shield 2019-05-11 15:20:06 -04:00
wolfy852
7dff052a64 Expose followerready, match d_player.h organization 2019-05-11 02:13:31 -05:00
wolfy852
e4af44956b Merge remote-tracking branch 'remotes/pub/next' into followme
# Conflicts:
#	src/r_things.h
2019-05-11 02:05:58 -05:00
TehRealSalt
ecaf14a76b Grow no longer has a speed boost, but no longer holds the item box hostage
It can now be moved over to "mid-tier" instead of the end. Flame Shield will be taking its place as the "situational but powerful speed-up/offense combo item"
2019-05-10 17:04:30 -04:00
Sryder
d8c7641724 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-05-10 21:39:39 +01:00
TehRealSalt
5bacbe6222 Fix Sneakers in Battle 2019-05-10 16:33:38 -04:00
Sryder
c0d2689ae4 Allow slope physics to apply on all but slight gradients. 2019-05-10 21:32:54 +01:00
Sryder
7635743486 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-05-10 20:32:14 +01:00
TehRealSalt
4801b57fa4 Make base value higher 2019-05-10 15:30:59 -04:00
TehRealSalt
41a66ac50a Use IsDisplayPlayer for more things
Makes viewpoints in spectating/demos do client-side effects a little better
2019-05-10 15:28:39 -04:00
Sryder
00ec2b5f16 Re-enable the speed cap
Only in midair to prevent pogo jump acceleration to infinity.
2019-05-10 20:21:21 +01:00
Alam Arias
d44a5d1013 fix the array-bounds warning by setting a upper limit 2019-05-09 23:10:23 -04:00