thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16762 commits 2 branches 14 tags 206 MiB
Commit graph

16762 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
9915d443dc Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-10 13:09:31 -04:00
Sally Coolatta
a771bb0047 Merge g_game.c/h 2020-08-10 13:09:26 -04:00
SteelT
9759c3666b Merge win32/Srb2win-vc10.vcxproj.filters 2020-08-10 13:06:14 -04:00
SteelT
fd000248b7 Merge sdl/i_video.c 2020-08-10 13:03:41 -04:00
SteelT
428ac51c68 Merge w_wad.c 2020-08-10 12:57:47 -04:00
Sryder
9a7c33e91f Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge 2020-08-10 17:40:12 +01:00
Sryder
67486dc0b6 Fix Simple opengl merge conflicts 
hw_cache.c, hw_data.h, hw_defs.h, hw_dll.h, hw_draw.c, hw_drv.h, hw_glob.h, hw_md2.c, hw_md2.h, r_opengl.c
 2020-08-10 17:39:34 +01:00
SteelT
676bdc8cba Merge lua_mobjlib.c 2020-08-10 12:34:39 -04:00
SteelT
d502ca31cb Merge lua_hooklib.c 2020-08-10 12:34:38 -04:00
SteelT
f2967d30d3 Merge lua_baselib.c 2020-08-10 12:34:38 -04:00
SteelT
2b2596b4b3 Merge lua_script.h 2020-08-10 12:34:38 -04:00
Sally Coolatta
f8ea416a97 Merge info.c 2020-08-10 12:18:22 -04:00
Sally Coolatta
4c99af8010 Fully remove OLD22DEMOCOMPAT 2020-08-10 12:17:25 -04:00
Sally Coolatta
e14f4a5842 Merge g_demo.c, remove OLD22DEMOCOMPAT 2020-08-10 12:14:23 -04:00
Sally Coolatta
9e99b3e9d2 Last bits of dehacked.c 2020-08-10 12:08:51 -04:00
Sally Coolatta
4cd47a92dc Merge d_netfil.c 2020-08-10 12:05:23 -04:00
Sally Coolatta
c3ca513445 Merge d_netcmd.c 2020-08-10 12:04:24 -04:00
Sally Coolatta
2581ab4bf1 Why aren't my files committing fully... 2020-08-10 12:01:51 -04:00
Sally Coolatta
3b34b3230c Bruh 2020-08-10 12:01:11 -04:00
Sally Coolatta
2710d50d99 Merge d_main.c 2020-08-10 12:00:37 -04:00
Sally Coolatta
be85cc7b8a Merge d_clisrv.c/h 2020-08-10 11:58:11 -04:00
Sally Coolatta
56235e2e1c Merge mserv.c 2020-08-10 11:46:31 -04:00
Sally Coolatta
6cf412e99a Merge command.h 2020-08-10 11:45:27 -04:00
Sally Coolatta
71375e412b Merge command.c 2020-08-10 11:42:12 -04:00
James R
b771ff2426 Add http-mserv to fuck 
(cherry picked from commit 8e493bddc3)
 2020-08-09 23:34:16 -07:00
James R
8e493bddc3 Add http-mserv to fuck 2020-08-09 23:32:43 -07:00
lachwright
bd54a2ddd9 Merge sounds.c 2020-08-10 12:47:58 +08:00
lachwright
db39196dab Merge r_things.c 2020-08-10 12:45:31 +08:00
lachwright
bcae108c6d Merge p_pspr.h 2020-08-10 12:38:20 +08:00
lachwright
51754b01ad Merge p_enemy.c 2020-08-10 12:25:12 +08:00
lachwright
58d51b2f75 Merge f_finale.c 2020-08-10 12:08:55 +08:00
lachwright
908bd42dc4 Merge doomdef.h 2020-08-10 12:06:20 +08:00
lachwright
bf884fc6c5 dehacked.c 2020-08-10 11:54:55 +08:00
lachwright
efc676726a d_player.h 2020-08-10 11:52:47 +08:00
Steel Titanium
79469d401c Fix cmake using wrong libs if internal libs is turned on 
Use '\0' instead, just in case

(cherry picked from commit 47d70e1ae6)
 2020-08-09 20:28:33 -07:00
lachwright
dad03e0994 src/CMakeLists.txt (don't forget to fix vanilla :P) 2020-08-10 11:21:24 +08:00
lachwright
4cc3816350 CmakeLists.txt (assumes we will add version.h) 2020-08-10 11:15:40 +08:00
Sal
15ff58280a Merge branch 'maxnetnodes-2-electric-boogaloo' into 'master' 
Bump MAXNETNODES to 127

See merge request KartKrew/Kart-Public!192
 2020-08-09 22:28:50 -04:00
Sally Coolatta
9afadccefa Fix duplicates being added to .travis.yml & debain-template/control 2020-08-09 21:32:55 -04:00
James R
1e1a57ba81 Bump MAXNETNODES to 127 
(cherry picked from commit 3cb1a53b3f)
 2020-08-09 18:32:05 -07:00
James R
3cb1a53b3f Bump MAXNETNODES to 127 2020-08-09 18:26:34 -07:00
James R
fa18f819b0 Merge branch 'clipboard-crash-fix-2' into 'next' 
Fix buffer overrun in I_ClipboardPaste (resolves #205)

Closes #205

See merge request STJr/SRB2!1105
 2020-08-09 21:06:18 -04:00
James R
0a85046b22 Merge branch 'bt_spin' into 'next' 
Replace all occurances of BT_USE with BT_SPIN (2.2!)

See merge request STJr/SRB2!982
 2020-08-09 21:03:17 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
0f630a3c93 Merge debain-template/control 2020-08-09 20:49:49 -04:00
James R
8bef076b83 Merge branch 'audio-cleanup' into 'next' 
Audio cleanup

See merge request STJr/SRB2!1101
 2020-08-09 20:49:28 -04:00
Sally Coolatta
2682c7438a Merge appveyor.yml 2020-08-09 20:49:04 -04:00
Sally Coolatta
7aa398aede Merge .travis.yml 2020-08-09 20:48:55 -04:00
James R
f9e74e8ba2 Merge branch 'kill-cd-support' into 'next' 
Kill CD support

See merge request STJr/SRB2!1102
 2020-08-09 20:48:25 -04:00
James R
6a49ffa217 Merge branch 'word-delet' into 'next' 
Word delete and backspace in console

See merge request STJr/SRB2!1092
 2020-08-09 20:46:37 -04:00