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

14502 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
536054b3f0 Merge assets/CMakeLists.txt 2020-08-06 10:23:12 -04:00
SteelT
e62eb255f0 Merge config.h.in 2020-08-06 01:17:22 -04:00
SteelT
a470716f48 Merge src/win32/Srb2win-vc10.vcxproj 2020-08-06 01:12:19 -04:00
SteelT
17bccc671d Merge CMakeLists.txt and src/CMakeLists.txt 2020-08-06 01:08:42 -04:00
SteelT
23736017ec Merge screen.h 2020-08-05 15:11:15 -04:00
Sally Coolatta
d27f16c4d5 A bunch of easy files (1-5 conflicts) 
g_state.h, hu_stuff.h, lua_hud.h, m_misc.h, p_polyobj.c, p_telept.c, r_draw.c, r_draw8.c, r_sky.c
 2020-08-05 14:34:17 -04:00
Sally Coolatta
54f442d2fd Merge lua_skinlib.c 2020-08-05 14:16:17 -04:00
Sally Coolatta
7f94fe0d93 Merge lua_playerlib.c 2020-08-05 14:15:21 -04:00
Sally Coolatta
40558a6824 Merge lua_hudlib.c 2020-08-05 14:07:26 -04:00
Sally Coolatta
bb2fe60e0e Merge lua_mathlib.c 2020-08-05 14:04:34 -04:00
Sally Coolatta
3ad209a366 Merge lua_maplib.c 2020-08-05 14:04:13 -04:00
Sally Coolatta
cc1afaa838 Merge lua_script.h 2020-08-05 14:03:53 -04:00
Sally Coolatta
9a9f7b8b1f Merge lua_hooklib.c 2020-08-05 14:03:24 -04:00
Sally Coolatta
9b778d6ce6 Merge lua_baselib.c 2020-08-05 14:00:35 -04:00
Sally Coolatta
c7d4be30f0 Merge m_cond.c/h 2020-08-05 10:15:04 -04:00
Sally Coolatta
7e9efd4e29 Merge lua_consolelib.c 
Properly supports 3P/4P commands while we're at it too
 2020-08-05 09:58:12 -04:00
Sally Coolatta
b546f7d188 Merge g_input.c/h 2020-08-04 01:41:00 -04:00
SteelT
6d850b51d9 Handle doomdef.h a bit 2020-08-04 01:06:15 -04:00
SteelT
11671aa6d8 Merge doomdata.h 2020-08-04 01:05:57 -04:00
SteelT
c5f9a586a0 Merge lua_hook.h 2020-08-04 00:58:37 -04:00
SteelT
1b6dbc5ee8 Merge lua_mobjlib.c 2020-08-04 00:53:06 -04:00
SteelT
a7f2ab7dea Merge lua_script.c 2020-08-04 00:45:49 -04:00
Sally Coolatta
5788c98f3c Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-03 10:13:52 -04:00
SteelT
23f6dc63d6 Merge screen.c 2020-08-02 18:58:11 -04:00
SteelT
7d5b0adc87 Merge p_saveg.c 2020-08-02 18:37:58 -04:00
SteelT
fa4fc40dd6 Merge filesrch.c 2020-08-02 18:03:59 -04:00
Sally Coolatta
4208d22129 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-02 17:30:19 -04:00
Sally Coolatta
94e85a7bb6 Merge f_wipe.c 2020-08-02 17:24:44 -04:00
SteelT
7417e95dcb Merge m_cheat.c 2020-08-02 17:06:27 -04:00
Sally Coolatta
cfb9c92ec9 Merge dehacked.c/h 2020-08-02 16:59:24 -04:00
Sally Coolatta
70692f4c3f Merge d_netfil.c 2020-08-02 16:40:22 -04:00
Sally Coolatta
b156899390 More d_netcmd.h 2020-08-02 16:36:40 -04:00
Sally Coolatta
178087289e Merge d_netcmd.c/h 2020-08-02 15:38:53 -04:00
Sally Coolatta
c1b1641f35 Merge d_main.c 2020-08-02 14:45:23 -04:00
Sally Coolatta
6ddae4728f Merge d_net.c 2020-08-02 14:15:29 -04:00
Sally Coolatta
a6396d5734 Utilize SendKick more 2020-08-02 14:07:02 -04:00
Sally Coolatta
6b1e9e4937 Merge d_clisrv.c/h 2020-08-02 13:56:43 -04:00
SteelT
ecf0b38bbb Resolve m_misc.c and z_zone.c 2020-06-03 20:16:48 -04:00
Sryder
3c538de360 Merge branch 'the-scary-22-merge' of git@git.magicalgirl.moe:KartKrew/Kart.git into the-scary-22-merge 2020-06-01 23:28:31 +01:00
Sryder
5b6ed47113 hw_main 
I wouldn't be surprised if some vanilla changes haven't made it in here
I also wouldn't be too surprised if this broke a lot.
My recommendation for when Hannu finishes implementing his changes for vanilla is to take the files as-is from there and re-implement our changes.
 2020-06-01 23:28:15 +01:00
SteelT
751c89d45b Resolve m_anigif.c conflicts. 2020-05-31 19:39:42 -04:00
toaster
83f1abecb3 Merge conflict resolution for console.c/h 2020-06-01 00:10:44 +01:00
toaster
555d7f960b Merge conflict resolution for command.c 2020-05-31 23:42:59 +01:00
Sally Coolatta
0e79ec29be p_map & p_maputl merge conflicts 2020-05-30 13:53:30 -04:00
SteelT
417859020d Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-05-29 16:19:48 -04:00
SteelT
9ff6af856e Resolve conflicts on the SDL interface files. 2020-05-29 16:17:26 -04:00
Sryder
5cccff08aa Basic merge some of the easier HW files. 
hw_main and hw_md2 still need merge.
hw_cache needs evaluating for encore mode.
 2020-05-29 20:43:34 +01:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sal
dcd2f790ba Merge branch 'pet-robo' into 'master' 
This is my PET ROBO!

See merge request KartKrew/Kart!257
 2020-05-29 13:27:28 -04:00
LJ Sonic
4bed63b888 Merge branch 'luacolors-gcc10-fix' into 'next' 
Fix the "Custom skincolors" branch not compiling with GCC 10.

See merge request STJr/SRB2!966
 2020-05-29 11:23:54 -04:00