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
10038 commits 1 branch 12 tags 205 MiB
Commit graph

10038 commits

This branch
This branch
All branches
Author SHA1 Message Date
James R
f8c9912d25 Merge remote-tracking branch 'origin/master' into next 2020-02-21 21:06:27 -08:00
James R
1a251ccee2 Fix NOMD5 compiling 2020-02-21 21:06:04 -08:00
James R
4d77611752 Register servername etc. under NOMD5 
This fixes crashes in the menus.
 2020-02-21 20:04:28 -08:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
SteelT
0d02983d97 Merge branch 'warp-gamedata-corruption-fix' into 'next' 
Warp gamedata corruption fix

See merge request STJr/SRB2!802
 2020-02-21 21:00:29 -05:00
SteelT
fcb0c62bf7 Merge branch 'update-copyright-year' into 'master' 
Update copyright year

See merge request STJr/SRB2!801
 2020-02-21 20:59:56 -05:00
Louis-Antoine
c785fc2132 Cleanup code a little 2020-02-22 02:21:27 +01:00
Louis-Antoine
59a53908e5 Improve join refusal handling 2020-02-22 02:17:21 +01:00
Louis-Antoine
6739fcff69 Replace MAX_WADPATH with plain numbers 
This is not ideal either, but I would rather
not use a constant for something unrelated.
 2020-02-21 17:31:32 +01:00
Louis-Antoine
325872de4e Fix weird comment style 2020-02-21 17:17:39 +01:00
James R
e6dafe3002 Merge remote-tracking branch 'origin/master' into next 2020-02-20 17:30:50 -08:00
James R
441be52fd8 Fix NOPNG compiling 2020-02-20 17:30:32 -08:00
James R
168a1325f7 Fix NO_LUA compiling 2020-02-20 17:20:50 -08:00
James R
26ff2e0355 Fix compiler warnings 2020-02-20 17:18:26 -08:00
James R
aa0d40212e Merge branch 'ogl-colorbug' into 'master' 
Fix OpenGL "color bug"

See merge request STJr/SRB2!795
 2020-02-20 19:32:34 -05:00
James R
4331b13952 Merge branch 'thin-fixed' into 'next' 
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
 2020-02-20 19:27:01 -05:00
Snu
36fc21790b Change SKINCOLOR_SUPERGOLD1-5 2020-02-20 21:53:21 +00:00
Sally Cochenour
18e3134efd Make hook_FollowMobj a mobj hook instead of a player hook 
Makes more logical sense, as if you have a custom follow item for a custom skin, you probably want your new thinker to only run for your new MT_ and not the vanilla ones.
 2020-02-20 16:40:39 -05:00
Monster Iestyn
8eb80cbf75 clarify the situation a bit more in the comments 2020-02-20 20:38:01 +00:00
Monster Iestyn
7ee6ff2b03 move -warp code to a later part of D_SRB2Main so G_LoadGameData isn't upset by G_SetGameModified 2020-02-20 20:31:11 +00:00
Louis-Antoine
36a7539f33 SpaceSpaceSpaceSpace 2020-02-20 01:15:54 +01:00
James R
185c8a073e :) 2020-02-19 14:44:22 -08:00
James R
ccfea66d68 Regex bruh moment 2020-02-19 14:37:42 -08:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Louis-Antoine
a09d46a092 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into lua-io 2020-02-19 22:40:54 +01:00
Louis-Antoine
d2e9f0465a Minor code cleanup 2020-02-19 22:37:30 +01:00
Louis-Antoine
cade1d3d38 Fix bad tabulation 2020-02-19 22:01:33 +01:00
Tatsuru
5b240e4119 Merge branch 'coloredtitlecard' into Tatsuru/SRB2-dye 2020-02-19 17:47:13 -03:00
Tatsuru
7f190f35f2 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
 2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20 Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye 2020-02-19 17:32:43 -03:00
Steel Titanium
42f141d32f Merge branch 'master' into next 2020-02-18 22:03:08 -05:00
James R
a1cf43605a Merge branch 'the-colors-feel-so-right' into 'next' 
New skin colors, add support for preferred opposite color to save cards, new lua features.

See merge request STJr/SRB2!787
 2020-02-18 22:02:01 -05:00
James R
ba9f866acf Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
James R
903e9ee17e Merge branch 'rscache' into 'master' 
Fix R_CacheRotSprite not working with PNG lumps

See merge request STJr/SRB2!800
 2020-02-18 21:54:45 -05:00
James R
7ff3fb6a36 Merge branch 'seenames-fix' into 'master' 
Fix seenames not working without a SeenPlayer hook

See merge request STJr/SRB2!799
 2020-02-18 21:53:28 -05:00
James R
f39785672d Merge branch 'setrenderneeded-fix' into 'master' 
Clear setrenderneeded after calling VID_CheckRenderer

See merge request STJr/SRB2!793
 2020-02-18 21:53:14 -05:00
James R
3070a09dde Merge branch 'pw-justlaunched' into 'next' 
Add pw_justlaunched to tell modders when a player launches from a slope

See merge request STJr/SRB2!792
 2020-02-18 21:53:05 -05:00
James R
b329536bd1 Merge branch 'titlecard-options' into 'next' 
Allow more options for when the titlecard shows up

See merge request STJr/SRB2!765
 2020-02-18 21:52:03 -05:00
James R
1bc6f2cd91 Merge branch 'startup-file-not-found' into 'master' 
Fix the issue !678 did, but just don't exit if the file was added twice

See merge request STJr/SRB2!753
 2020-02-18 21:50:11 -05:00
James R
c078af0022 Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER 2020-02-18 18:23:20 -08:00
Tatsuru
4f150cb811 Enough 2020-02-18 22:55:40 -03:00
Tatsuru
92060edf6d Standards 3 2020-02-18 22:54:11 -03:00
Tatsuru
522a51b3a1 Standards 2 2020-02-18 22:50:22 -03:00
Tatsuru
c562a4eea4 Standards 2020-02-18 22:46:16 -03:00
Steel Titanium
9efae0bda0 Merge branch 'master' into next 2020-02-18 17:41:13 -05:00
Jaime Passos
d32b88b18c Merge remote-tracking branch 'origin/master' into rscache 2020-02-18 19:38:19 -03:00
Jaime Passos
e98e0c785a Merge remote-tracking branch 'origin/master' into seenames-fix 2020-02-18 19:37:55 -03:00
SteelT
8d6d574fa5 Merge branch 'ftrim-tweak-2' into 'master' 
M_Ftrim

See merge request STJr/SRB2!798
 2020-02-18 17:24:05 -05:00
Steel Titanium
f1204a80aa Merge branch 'next' into the-colors-feel-so-right 2020-02-18 14:29:50 -05:00
Monster Iestyn
41bdc91bf0 Merge branch 'master' into next 2020-02-18 17:38:05 +00:00