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

15899 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sally Coolatta
a73b9a9a0d Merge p_slopes.c 2020-08-06 17:58:30 -04:00
Sally Coolatta
337db54965 Missed this in p_setup.c 2020-08-06 17:55:36 -04:00
Sally Coolatta
438743ce97 Merge doomstat.h 2020-08-06 17:53:35 -04:00
Sally Coolatta
59eb714bef Merge doomdef.h 2020-08-06 17:42:29 -04:00
Sally Coolatta
95fc67e4a6 Merge branch 'the-scary-22-merge' of https://git.magicalgirl.moe/KartKrew/Kart into the-scary-22-merge 2020-08-06 17:38:33 -04:00
Sally Coolatta
cdb0310982 Merge info.c/h 2020-08-06 17:38:29 -04:00
SteelT
9a75d397d6 Merge src/s_sound.c/h 2020-08-06 16:56:41 -04:00
Sally Coolatta
43c627b02e Merge f_finale.c/h 2020-08-06 15:35:07 -04:00
Sal
954a21123a Merge branch 'indirectitemcooldown' into 'next' 
Fix Shrink, SPB and Hyudoro cooldowns never resetting?

See merge request KartKrew/Kart-Public!191
 2020-08-06 12:19:27 -04:00
Sally Coolatta
ddfd7a4772 Merge branch 'master' into next 2020-08-06 12:15:55 -04:00
AJ Martinez
e5463afb58 Fix Hyudoro cooldown never resetting 2020-08-06 10:51:53 -05:00
Sally Coolatta
b9886a166e Merge p_setup.c 2020-08-06 11:42:16 -04:00
AJ Martinez
2422d1c5b7 Fix indirect item cooldown never resetting 2020-08-06 10:34:16 -05:00
Sally Coolatta
f0484d87fa Merge p_sight.c 2020-08-06 11:12:19 -04:00
Sally Coolatta
372eb72d5b Merge p_floor.c 2020-08-06 11:07:33 -04:00
Sally Coolatta
c14e9a23f7 Merge p_enemy.c 2020-08-06 11:00:49 -04:00
Sally Coolatta
3ebc8517be Merge hu_stuff.c/h 2020-08-06 10:52:00 -04:00
Sally Coolatta
4ab8b07fbc Merge assets/README.txt 2020-08-06 10:23:22 -04:00
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
James R
8eaee1c462 Merge branch 'com-buf-insert-text-optional-player' into 'next' 
Make the player optional for COM_BufInsertText and COM_BufAddText.

See merge request STJr/SRB2!1093
 2020-08-05 19:53:28 -04:00
James R
36210abee8 Merge branch 'ogl-model-lighting-shader' into 'next' 
Add capability to use model lighting with shaders enabled

See merge request STJr/SRB2!1073
 2020-08-05 19:50:31 -04:00
James R
3767d67ed6 Merge branch 'hide-followmobj' into 'next' 
Hide Metal Sonic's jet fume in first person

Closes #204

See merge request STJr/SRB2!1099
 2020-08-05 19:47:13 -04:00
James R
3289cc84bc Merge branch 'udmf-fixmapthingheight' into 'next' 
UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special…

See merge request STJr/SRB2!1096
 2020-08-05 19:46:48 -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
Sal
a9861a6b63 Merge branch 'spinout-not-slow' into 'master' 
Don't slow down on sneaker panels during spinout

See merge request KartKrew/Kart!313
 2020-08-05 09:41:53 -04:00
Sal
8c6b8cd268 Merge branch 'master' into 'master' 
Clarify addon-related messages

See merge request KartKrew/Kart-Public!190
 2020-08-05 06:48:44 -04:00
AJ Martinez
4f1642bbce Clarify addon-related messages 2020-08-05 00:40:56 -05:00
James R
b0c6b626cf Don't slow down on sneaker panels during spinout 2020-08-04 02:11:52 -07: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
James R
8ff4410102 Merge branch 'ogl-sector-alignment-fix' into 'next' 
Fix sector flat alignment issues in OpenGL

See merge request STJr/SRB2!1094
 2020-08-03 12:47:29 -04:00
James R
6222c39d42 Merge branch 'ogl-big-room-fix' into 'next' 
Big room fix for OpenGL

See merge request STJr/SRB2!1089
 2020-08-03 12:44:09 -04:00