stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 04:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity
6447 commits 60 branches 11 tags 94 MiB
Commit graph

6447 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Arias
38f33027a0 fix the array-bounds warning by setting a upper limit 2019-05-09 23:10:23 -04:00
Alam Arias
571e9be7d8 fix up misleading indentation of a if statement 2019-05-09 23:03:32 -04:00
Sal
a9baf71a65 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
James R
7ac0a8b4d2 Check that lumps are okay 2019-05-08 20:30:19 -04:00
Monster Iestyn
f0e16cad32 Merge branch 'master' into next 2019-05-08 16:31:05 +01:00
Monster Iestyn
8ea9d0e95c Merge branch 'alias_recursion_hotfix_2' into 'master' 
Alias recursion hotfix 2

See merge request STJr/SRB2!482
 2019-05-08 11:25:15 -04:00
wolfy852
8f05d75926 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
wolfy852
9df84082e9 Default billboarding to "On" 2019-05-08 00:17:21 -05:00
wolfy852
a357a38ae1 Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge 2019-05-07 21:43:12 -05:00
wolfs
e394f41c52 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
wolfy852
777f1675fc Correct a merge mistake 2019-05-07 02:06:59 -05:00
wolfy852
b98f8f7504 Battle, not Match 2019-05-07 01:34:49 -05:00
wolfy852
2c363c4e1e 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
167f0bfe8b Forgot to update date 2019-05-06 22:54:47 -04:00
TehRealSalt
4308d3b681 Don't cover chat with pause effect 2019-05-06 22:39:20 -04:00
Sal
c5577526c5 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
5022cde443 Merge branch 'version-prep' into 'master' 
Version prep

See merge request KartKrew/Kart!148

(cherry picked from commit dfc4b22c911340e330a0f71fabb4a1461b5747ed)

183e75ff Final v1 colors
9629fb32 Modify the first shade of Byzantium
39bea80b Add options for adjusting deadzone, increase default deadzone from 0.25 to 0.5
f99a5a6a Fix wheel animations
fd148ec2 Dumbass typo
e772a750 Missed a spot
3d71a0aa Merge branch 'next-colors' into 'v1'
071b335d Merge branch 'anim-fix' into 'v1'
0cd815cb Merge branch 'deadzone-bullshit' into 'v1'
30c19caa Update version number
8f07ed77 Update patch.kart hash
 2019-05-06 22:05:56 -04:00
Sal
1b6b09b915 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
47484c5b6b Merge branch 'v1' into no-limits 2019-05-06 21:55:33 -04:00
Sal
f3f74388e6 Merge branch 'INTERNAL_netreplays' into 'v1' 
Netreplays

See merge request KartKrew/Kart!146
 2019-05-06 21:46:18 -04:00
Sal
43b55d4f7c 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
f720dd3ddb Merge v1 2019-05-06 21:23:29 -04:00
TehRealSalt
a7df73a35f Fix skybox bug 2019-05-06 21:17:32 -04:00
Sal
2dc91d1723 Merge branch 'skins-fix' into 'v1' 
Remove skin shit

See merge request KartKrew/Kart!145
 2019-05-06 21:07:24 -04:00
Monster Iestyn
360a6ff89a 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
97493fdfd7 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
b304b268c8 No sprite billboarding on papersprites 2019-05-06 20:24:26 +01:00
Sryder
1f1d67cd7e 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
535b386f8e Merge remote-tracking branch 'remotes/pub/master' into next 2019-05-06 14:17:02 -05:00
wolfs
58c5979a1e Merge branch 'newping' into 'master' 
New ping command

See merge request KartKrew/Kart-Public!123
 2019-05-06 15:12:56 -04:00
wolfs
62140e1481 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
b2a8e555bb 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
406c3619d7 Merge branch 'master' into next 2019-05-06 19:38:53 +01:00
Nev3r
aab2f55aec Merge branch 'banip-command' into 'next' 
Ban IP command

See merge request STJr/SRB2!460
 2019-05-06 13:09:14 -04:00
Nev3r
ae25e8ea07 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
8b8e165d19 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
8273534967 Add a cvar for sprite billboarding, off by default. 2019-05-06 16:57:32 +01:00
Monster Iestyn
454306cf86 Merge branch 'master' into next 2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff 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
d4ab2837bb Merge branch 'master' into next 2019-05-03 16:00:45 +01:00
wolfs
1f2d720363 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
mazmazz
904b00e921 Remove song_length tag search 
Because songs without this tag will skiplag when loading.
 2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531 Remove MP3 widechar tag searching 
1. It's slow, 2. It's incorrect
 2019-05-02 19:13:56 -04:00
TehRealSalt
98dbdd7db5 Don't allow custom gamedata to overwrite kart gamedata or replay folders 2019-05-02 12:58:02 -04:00
TehRealSalt
489032f734 Hide this debug message 2019-05-02 12:50:05 -04:00
TehRealSalt
25f277e185 ENSURE viewcount slider is present for multiplayer demos 2019-05-02 12:42:29 -04:00
TehRealSalt
3f730e03ec Disable rewind between demos, too. 2019-05-02 12:36:11 -04:00
TehRealSalt
34eb4bd14d Don't keep fast-forward enabled between demos 2019-05-02 12:31:50 -04:00
TehRealSalt
86dfd70c6f Add message boxes for file add errors 2019-05-02 12:03:50 -04:00
TehRealSalt
73e152a01c HORRID HACK around holding enter in the playback menu having awful, crash-causing side-effects 2019-05-02 12:00:51 -04:00