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
Sryder
7792b48ea3
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
wolfy852
4eb2a7d2eb
Merge remote-tracking branch 'remotes/pub/master' into next
2019-05-06 14:17:02 -05:00
wolfs
741f48132a
Merge branch 'newping' into 'master'
...
New ping command
See merge request KartKrew/Kart-Public!123
2019-05-06 15:12:56 -04:00
wolfs
17c96a9c3d
Merge branch 'autofocus' into 'master'
...
Grab mouse focus whenever the window is focused
See merge request KartKrew/Kart-Public!120
2019-05-06 15:12:48 -04:00
wolfs
2869ccf557
Merge branch 'ms-connectionfail-bandaid' into 'master'
...
Don't try operating on a closed socket
See merge request KartKrew/Kart-Public!133
2019-05-06 15:12:39 -04:00
Monster Iestyn
a0e135f1b8
Merge branch 'master' into next
2019-05-06 19:38:53 +01:00
Nev3r
7a66fabf4f
Merge branch 'banip-command' into 'next'
...
Ban IP command
See merge request STJr/SRB2!460
2019-05-06 13:09:14 -04:00
Nev3r
9a43511cf6
Merge branch 'console-wait-fix' into 'master'
...
Don't count down wait timer when executing a command line
See merge request STJr/SRB2!483
2019-05-06 12:56:07 -04:00
Nev3r
809975b1ff
Merge branch 'opengl-sprite-billboarding' into 'master'
...
OpenGL Sprite Billboarding
See merge request STJr/SRB2!485
2019-05-06 12:45:53 -04:00
Sryder
64fb7f90f0
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
TehRealSalt
ba01284aeb
Uncomment testing stuff
2019-05-05 01:46:05 -04:00
TehRealSalt
10b9cd9115
Add (unfinished) drafting effect
2019-05-05 01:24:05 -04:00
TehRealSalt
e087d18402
Cooler afterimages
...
Players afterimages have been colorized & flicker, ala Sonic Advance 2. The number of afterimages you get extends with how many boosts you have stacked.
Item afterimages have also been given a basic colorization.
2019-05-04 21:04:06 -04:00
Monster Iestyn
cbb20fc147
Merge branch 'master' into next
2019-05-03 16:40:13 +01:00
Monster Iestyn
5cd8ff01ba
add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason
...
not making a merge request because this is so laughably stupidly simple
2019-05-03 16:38:59 +01:00
Monster Iestyn
57edf46531
Merge branch 'master' into next
2019-05-03 16:00:45 +01:00
wolfs
3d24bf11af
Merge branch 'nonet-upnp' into 'master'
...
Don't enable UPnP support if NONET is defined.
See merge request STJr/SRB2!484
2019-05-03 06:40:22 -04:00
TehRealSalt
e3c96c28c6
check for player->mo before grabbing scale
2019-05-02 22:20:53 -04:00
mazmazz
d2236a32c3
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
7301140b10
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
TehRealSalt
8f4d93995b
Merge v1
2019-05-02 17:51:54 -04:00
TehRealSalt
20e5d59ae4
New air speed cap behavior
...
- Lowered from 75 units to 50 units
- Added easing to make the shift in speed feel natural
- (Also I'm now pretty sure it didn't actually work before...?!)
2019-05-02 17:36:48 -04:00
TehRealSalt
eb5dc6a040
Fix road becoming offroad in Hard
2019-05-02 15:13:58 -04:00
TehRealSalt
b22426bce9
Prevent unused var
2019-05-02 15:03:01 -04:00
TehRealSalt
eddce25c03
Wrong type
2019-05-02 15:00:37 -04:00
TehRealSalt
929d26806c
Offroad adjustments
...
- Restored old offroad leniency timer
- Allow minor boosts in offroad again (drift sparks, rings, drop dash)
- Scale offroad strength with game speed (Hard gets harsher offroad, Easy gets more lenient offroad)
2019-05-02 14:57:36 -04:00
TehRealSalt
ff66bd2afb
Lower ceiling & raise floor of drafting distances
2019-05-02 14:15:35 -04:00
TehRealSalt
5c55201b08
Scale draft distances based on game speed
2019-05-02 14:14:54 -04:00
TehRealSalt
ac1ae12746
Slight nerf to the ring power ceiling
...
Chao previously would get 15 tics of ring boost per ring, now Chao gets 11. Omega still gets 3 tics per ring.
2019-05-02 14:00:12 -04:00
TehRealSalt
d38004c310
Disable incomplete ring sparkle effect temporarily
2019-05-02 13:51:40 -04:00
TehRealSalt
9a1ae859bd
Don't allow custom gamedata to overwrite kart gamedata or replay folders
2019-05-02 12:58:02 -04:00
TehRealSalt
b679cfe5c5
Hide this debug message
2019-05-02 12:50:05 -04:00
TehRealSalt
2c49feeb9c
ENSURE viewcount slider is present for multiplayer demos
2019-05-02 12:42:29 -04:00