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
TehRealSalt
5bacbe6222
Fix Sneakers in Battle
2019-05-10 16:33:38 -04: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
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
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
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
Sal
c62bdb2be8
Merge branch 'cherry-pick-dfc4b22c' into 'v1'
...
Merge branch 'version-prep' into 'master'
See merge request KartKrew/Kart!150
2019-05-06 22:06:31 -04:00
Sal
1c1435aea7
Merge branch 'version-prep' into 'master'
...
Version prep
See merge request KartKrew/Kart!148
(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)
2e221946 Final v1 colors
359d06f1 Modify the first shade of Byzantium
3a707c09 Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
889ead78 Fix wheel animations
2d9ae1ab Dumbass typo
e954f0b4 Missed a spot
5316e63a Merge branch 'next-colors' into 'v1'
55db2268 Merge branch 'anim-fix' into 'v1'
26159aae Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
2019-05-06 22:05:56 -04:00
Sal
75b62eb13b
Merge branch 'no-limits' into 'v1'
...
Remove add-on limit
See merge request KartKrew/Kart!149
2019-05-06 22:04:36 -04:00
TehRealSalt
d82fa7eb60
Merge branch 'v1' into no-limits
2019-05-06 21:55:33 -04:00
Sal
385c3da5be
Merge branch 'version-prep' into 'master'
...
Version prep
See merge request KartKrew/Kart!148
2019-05-06 21:51:35 -04:00
TehRealSalt
8065df62be
Update patch.kart hash
2019-05-06 21:51:01 -04:00
Sal
c5b1a9b3c4
Merge branch 'INTERNAL_netreplays' into 'v1'
...
Netreplays
See merge request KartKrew/Kart!146
2019-05-06 21:46:18 -04:00
Sal
8185077e50
Merge branch 'slight-grow-improvements' into 'v1'
...
Slight grow improvements (v1.1)
See merge request KartKrew/Kart!142
2019-05-06 21:29:17 -04:00
TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
0958617ecb
Fix skybox bug
2019-05-06 21:17:32 -04:00
Sal
80226b3c39
Merge branch 'skins-fix' into 'v1'
...
Remove skin shit
See merge request KartKrew/Kart!145
2019-05-06 21:07:24 -04:00
TehRealSalt
b5ba4f959d
More drafting tweaks
...
- Drafting dust now only shows up when you reach maximum draft power. This should illustrate how the mechanic works more clearly.
- Drafting power increase per tic has been rebalanced. Tails now takes around 2 seconds to reach maximum power (nerfed from 0.5 seconds), and Metal now takes around 6 seconds to reach maximum power (buffed from 12 seconds)
- Drafting leniency period is now dependent on weight -- characters who can't control their line as much have a bit more leniency to get back into the drafting area.
- Drafting dust now shows up during drifts.
- Added a sound cue when reaching maximum draft power.
- Removed the draft ambient sound.
2019-05-06 20:50:52 -04:00
TehRealSalt
c6e622af79
I_Error in all builds
...
Sick of this shit
2019-05-06 17:38:16 -04:00
Sryder
4fb4490541
Add missing variable to dehacked
2019-05-06 22:00:23 +01:00
Monster Iestyn
693b4e3dcf
Merge branch 'public_flatsprite' into 'public_flatsprite'
...
Merge in next and don't billboard papersprites in GL
See merge request STJr/SRB2!488
2019-05-06 15:34:35 -04:00
wolfy852
f808072937
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/hardware/hw_main.c
# src/hardware/hw_main.h
# src/m_menu.c
# src/r_main.c
# src/v_video.c
2019-05-06 14:26:09 -05:00
Sryder
70ff9be419
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00