Commit graph

6413 commits

Author SHA1 Message Date
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
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
wolfy852
08bf9ee1f5 whoops
Fixes stupid obvious mistakes and changes the prefcolor reset to item.
2019-05-12 04:22:34 -05: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
wolfy852
5613446b6f Have Look Back reset your color to prefcolor 2019-05-12 03:21:46 -05:00
TehRealSalt
7884f63849 Updated 4P HUD 2019-05-11 23:37:10 -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
b422ad46c9 Merge branch 'master' into next 2019-05-09 23:12:38 -04:00
Alam Arias
51312b628d fix the array-bounds warning by setting a upper limit 2019-05-09 23:11:26 -04:00
Alam Arias
d44a5d1013 fix the array-bounds warning by setting a upper limit 2019-05-09 23:10:23 -04:00
Alam Arias
9163a05192 fix up misleading indentation of a if statement 2019-05-09 23:03:32 -04:00
Sal
a54e2edbfa Merge branch 'upstream-merge' into 'next'
Upstream merge of next

See merge request KartKrew/Kart-Public!139
2019-05-09 19:13:58 -04:00
Sryder
682a8f6829 Disable the speedcap on players.
Don't calculate acceleration as ever being above top speed.
2019-05-08 20:49:47 +01:00
Sryder
4dca09f420 Merge branch 'rings' of git@git.magicalgirl.moe:KartKrew/Kart.git into rings_slopechange 2019-05-08 18:18:36 +01:00
wolfy852
ed64cd4dac Default billboarding to "On" 2019-05-08 00:17:21 -05:00
wolfy852
1136d88bd6 Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge 2019-05-07 21:43:12 -05:00
wolfs
10b47550a4 Merge branch 'public-musicplus-tagfix' into 'next'
Fix music load lag by reverting tag changes

See merge request STJr/SRB2!486
2019-05-07 22:42:13 -04:00
Sryder
927c5e0080 Use spin slope physics on all players
Disable increased slope strength with more speed
2019-05-07 23:35:19 +01:00
TehRealSalt
7913938427 replace a bunch of local stuff with display stuff
Means that changing viewpoints is more reliable
2019-05-07 12:48:16 -04:00
TehRealSalt
25fcad6e5f New leniency values 2019-05-07 12:33:33 -04:00
wolfy852
1b7d7cabdf Correct a merge mistake 2019-05-07 02:06:59 -05:00
wolfy852
26adea3234 Battle, not Match 2019-05-07 01:34:49 -05:00
TehRealSalt
97903b00c3 update leniency values 2019-05-07 00:30:45 -04:00
TehRealSalt
3d129ad4ca Merge branch 'v1' into rings 2019-05-06 23:54:20 -04:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
c8fdc95597 Forgot to update date 2019-05-06 22:54:47 -04:00
TehRealSalt
d4f1cc4cde Merge branch 'v1' 2019-05-06 22:45:45 -04:00
TehRealSalt
3e93180d3d Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
TehRealSalt
4006045f12 Merge branch 'v1' 2019-05-06 22:06:59 -04:00