thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6331 commits 1 branch 12 tags 205 MiB
Commit graph

6331 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
James R
3f4121085b Check that lumps are okay 2019-05-08 20:30:19 -04:00
Monster Iestyn
5756583612 Merge branch 'master' into next 2019-05-08 16:31:05 +01:00
Monster Iestyn
2b636ae614 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
93c706bfb8 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05: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
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
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
3e93180d3d Don't cover chat with pause effect 2019-05-06 22:39:20 -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
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
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
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
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
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