Commit graph

17141 commits

Author SHA1 Message Date
James R
97eac1c594 Lua 2020-08-05 16:28:47 -07:00
James R
66c7cd4844 k_spinouttype magic numbers begone
Fixes wipeout running out in the air. It was really
only intended for explosions.
2020-08-05 16:28:47 -07: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
James R
3332c22801 Fault again if you spectate then respawn during a fault 2020-08-05 05:07:42 -07: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
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
lachwright
b132a6d3ec Hide Metal Sonic's jet fume in first person 2020-08-03 20:09:35 +08: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
Sally Coolatta
31b99de407 Use K_MomentumAngle for all instances of needing momentum angle for an object
This means we will never ever have any "standing still defaults to angle 0" issues again :)
2020-08-02 11:40:21 -04:00
Sally Coolatta
3dc2f4804f Angle & scale now impact how long you're in hitlag 2020-08-02 10:26:29 -04:00
Sally Coolatta
a9a7f71b57 Merge branch 'master' into hitlag-retry 2020-08-01 10:05:52 -04:00
James R
ed2d40b98e Unused parameter :) 2020-07-31 22:17:22 -07:00
Sally Coolatta
88be417717 Merge branch 'master' into hitlag-retry 2020-08-01 01:14:33 -04:00
Sally Coolatta
a8908d22cf K_SetHitlagForObjects, sets hitlag based on speed 2020-08-01 01:14:18 -04:00
Sally Coolatta
0db881d058 Allow hitting players who are flashing, but are still in hitlag 2020-07-31 22:29:08 -04:00