| .. |
|
android
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
blua
|
Merge branch 'dofile' into 'next'
|
2020-06-12 02:32:16 -04:00 |
|
dummy
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
hardware
|
Merge hw_main.h
|
2020-08-10 17:25:44 -04:00 |
|
locale
|
Cheese mode activate!
|
2020-07-01 16:37:36 -07:00 |
|
nds
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
sdl
|
Merge sdl/hwsym_sdl.c
|
2020-08-10 15:28:15 -04:00 |
|
sdl12
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
win32
|
Merge win32/win_dll.c
|
2020-08-10 15:41:49 -04:00 |
|
win32ce
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
.gitignore
|
|
|
|
am_map.c
|
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
|
2020-05-18 15:23:56 +02:00 |
|
am_map.h
|
|
|
|
Android.mk
|
|
|
|
apng.c
|
|
|
|
apng.h
|
|
|
|
asm_defs.inc
|
|
|
|
b_bot.c
|
Remove instances of HAVE_BLUA that actually disable Lua now
|
2020-05-10 19:59:56 -07:00 |
|
b_bot.h
|
Start on bots, doesn't work
|
2020-03-27 23:51:49 -04:00 |
|
byteptr.h
|
Fuck you macro
|
2020-07-04 12:52:01 -07:00 |
|
CMakeLists.txt
|
src/CMakeLists.txt (don't forget to fix vanilla :P)
|
2020-08-10 11:21:24 +08:00 |
|
command.c
|
Merge g_demo.c, remove OLD22DEMOCOMPAT
|
2020-08-10 12:14:23 -04:00 |
|
command.h
|
Merge g_demo.c, remove OLD22DEMOCOMPAT
|
2020-08-10 12:14:23 -04:00 |
|
comptime.c
|
|
|
|
config.h.in
|
Merge config.h.in
|
2020-08-10 15:11:21 -04:00 |
|
console.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
console.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
d_clisrv.c
|
Merge d_clisrv.c/h
|
2020-08-10 11:58:11 -04:00 |
|
d_clisrv.h
|
Why aren't my files committing fully...
|
2020-08-10 12:01:51 -04:00 |
|
d_event.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
d_main.c
|
Bruh
|
2020-08-10 12:01:11 -04:00 |
|
d_main.h
|
|
|
|
d_net.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
d_net.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
d_netcmd.c
|
Merge d_netcmd.c
|
2020-08-10 12:04:24 -04:00 |
|
d_netcmd.h
|
More d_netcmd.h
|
2020-08-02 16:36:40 -04:00 |
|
d_netfil.c
|
Merge d_netfil.c
|
2020-08-10 12:05:23 -04:00 |
|
d_netfil.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
d_player.h
|
d_player.h
|
2020-08-10 11:52:47 +08:00 |
|
d_think.h
|
|
|
|
d_ticcmd.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
dehacked.c
|
Fix extra V_MAGENTAMAP definition
|
2020-08-10 17:07:47 -04:00 |
|
dehacked.h
|
Merge dehacked.c/h
|
2020-08-02 16:59:24 -04:00 |
|
doomdata.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
doomdef.h
|
Merge g_demo.c, remove OLD22DEMOCOMPAT
|
2020-08-10 12:14:23 -04:00 |
|
doomstat.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
doomtype.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
endian.h
|
|
|
|
f_finale.c
|
Merge f_finale.c
|
2020-08-10 12:08:55 +08:00 |
|
f_finale.h
|
Merge f_finale.c/h
|
2020-08-06 15:35:07 -04:00 |
|
f_wipe.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
fastcmp.h
|
|
|
|
filesrch.c
|
Merge filesrch.c
|
2020-08-02 18:03:59 -04:00 |
|
filesrch.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
g_demo.c
|
Fully remove OLD22DEMOCOMPAT
|
2020-08-10 12:17:25 -04:00 |
|
g_demo.h
|
Finish removals properly
|
2020-08-09 14:46:03 -04:00 |
|
g_game.c
|
Move axis_input_e to g_game.h
|
2020-08-10 17:04:02 -04:00 |
|
g_game.h
|
Move axis_input_e to g_game.h
|
2020-08-10 17:04:02 -04:00 |
|
g_input.c
|
Merge g_input.c/h
|
2020-08-04 01:41:00 -04:00 |
|
g_input.h
|
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
|
2020-08-10 17:00:45 -04:00 |
|
g_splitscreen.c
|
|
|
|
g_state.h
|
A bunch of easy files (1-5 conflicts)
|
2020-08-05 14:34:17 -04:00 |
|
http-mserv.c
|
Use SRB2VERSION here...
|
2020-07-13 08:59:41 -07:00 |
|
hu_stuff.c
|
Fix extra V_MAGENTAMAP definition
|
2020-08-10 17:07:47 -04:00 |
|
hu_stuff.h
|
Merge hu_stuff.c/h
|
2020-08-06 10:52:00 -04:00 |
|
i_addrinfo.c
|
Tested to be compile with Mingw64 9.1.0
|
2020-05-11 18:43:24 -07:00 |
|
i_addrinfo.h
|
|
|
|
i_joy.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
i_net.h
|
|
|
|
i_sound.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
i_system.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
i_tcp.c
|
Rename some file transfer functions
|
2020-05-12 19:06:40 +02:00 |
|
i_tcp.h
|
|
|
|
i_threads.h
|
Create cond if it doesn't exist when signaling
|
2020-05-13 17:25:52 -07:00 |
|
i_video.h
|
Merge branch 'sdlglcontext' into 'master'
|
2020-04-09 19:51:20 -04:00 |
|
info.c
|
Merge info.c
|
2020-08-10 12:18:22 -04:00 |
|
info.h
|
Fix conflicting info definitions
|
2020-08-10 16:49:54 -04:00 |
|
k_battle.c
|
toaster suggestions
|
2020-03-22 20:29:58 -04:00 |
|
k_battle.h
|
Move item box counter stuff into k_battle
|
2020-03-22 16:23:56 -04:00 |
|
k_bheap.c
|
|
|
|
k_bheap.h
|
|
|
|
k_bot.c
|
Minimum prediction distance
|
2020-05-28 18:46:33 -04:00 |
|
k_bot.h
|
Make K_BotTopSpeedRubberband a function
|
2020-05-28 16:46:21 -04:00 |
|
k_botitem.c
|
Split bot code into multiple files & clean up
|
2020-05-24 15:08:10 -04:00 |
|
k_botsearch.c
|
Rewrite K_BotHatesThisSector slightly
|
2020-05-28 17:58:35 -04:00 |
|
k_collide.c
|
Fix items vs springs crash
|
2020-05-03 20:12:01 -04:00 |
|
k_collide.h
|
|
|
|
k_color.c
|
Merge info.c/h
|
2020-08-06 17:38:29 -04:00 |
|
k_color.h
|
Skincolor code cleanup
|
2020-05-11 02:28:25 -04:00 |
|
k_kart.c
|
Make K_BotTopSpeedRubberband a function
|
2020-05-28 16:46:21 -04:00 |
|
k_kart.h
|
Merge branch 'master' into pet-robo
|
2020-05-18 15:18:37 -04:00 |
|
k_pathfind.c
|
|
|
|
k_pathfind.h
|
|
|
|
k_pwrlv.c
|
No modify power level for beating/losing to players with no power level set
|
2020-05-28 13:42:11 -04:00 |
|
k_pwrlv.h
|
|
|
|
k_waypoint.c
|
Merge branch 'master' into pet-robo
|
2020-05-18 15:18:37 -04:00 |
|
k_waypoint.h
|
Multiply the default radius of 384 by mobjscale, but not user set radiuses
|
2020-05-04 17:54:43 -07:00 |
|
keys.h
|
|
|
|
lua_baselib.c
|
OK the compiler still didn't like it, so just properly remove it entirely.
|
2020-08-10 17:22:55 -04:00 |
|
lua_blockmaplib.c
|
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
|
2020-05-02 12:08:31 +02:00 |
|
lua_consolelib.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_hook.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_hooklib.c
|
Merge lua_hooklib.c
|
2020-08-10 12:34:38 -04:00 |
|
lua_hud.h
|
A bunch of easy files (1-5 conflicts)
|
2020-08-05 14:34:17 -04:00 |
|
lua_hudlib.c
|
Merge lua_hudlib.c
|
2020-08-05 14:07:26 -04:00 |
|
lua_infolib.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_libs.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_maplib.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_mathlib.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_mobjlib.c
|
Merge lua_mobjlib.c
|
2020-08-10 12:34:39 -04:00 |
|
lua_playerlib.c
|
Merge lua_playerlib.c
|
2020-08-05 14:15:21 -04:00 |
|
lua_script.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
lua_script.h
|
Merge lua_script.h
|
2020-08-10 12:34:38 -04:00 |
|
lua_skinlib.c
|
Merge lua_skinlib.c
|
2020-08-05 14:16:17 -04:00 |
|
lua_thinkerlib.c
|
|
|
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
|
|
|
m_aatree.h
|
|
|
|
m_anigif.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
m_anigif.h
|
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
|
2020-06-27 10:56:15 -05:00 |
|
m_argv.c
|
Forgot includes
|
2020-03-24 15:48:42 -07:00 |
|
m_argv.h
|
|
|
|
m_bbox.c
|
|
|
|
m_bbox.h
|
|
|
|
m_cheat.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
m_cheat.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
m_cond.c
|
Merge m_cond.c/h
|
2020-08-05 10:15:04 -04:00 |
|
m_cond.h
|
Duplicate defs
|
2020-08-10 17:23:20 -04:00 |
|
m_dllist.h
|
|
|
|
m_fixed.c
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
m_fixed.h
|
Deprecate FixedRem.
|
2020-05-18 11:29:56 -05:00 |
|
m_menu.c
|
master m_menu again
|
2020-08-10 15:19:03 -04:00 |
|
m_menu.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
m_misc.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
m_misc.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
m_queue.c
|
|
|
|
m_queue.h
|
|
|
|
m_random.c
|
|
|
|
m_random.h
|
|
|
|
m_swap.h
|
|
|
|
Makefile
|
Merge Makefile
|
2020-08-10 15:18:09 -04:00 |
|
Makefile.cfg
|
Merge branch 'kill-cd-support' into 'next'
|
2020-08-09 20:48:25 -04:00 |
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
Merge mserv.c
|
2020-08-10 11:46:31 -04:00 |
|
mserv.h
|
masterserver_token is back
|
2020-07-11 17:41:09 -07:00 |
|
p5prof.h
|
|
|
|
p_ceilng.c
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
p_enemy.c
|
OK the compiler still didn't like it, so just properly remove it entirely.
|
2020-08-10 17:22:55 -04:00 |
|
p_floor.c
|
Merge p_floor.c
|
2020-08-06 11:07:33 -04:00 |
|
p_inter.c
|
Merge p_inter.c
|
2020-08-10 14:27:26 -04:00 |
|
p_lights.c
|
|
|
|
p_local.h
|
OK the compiler still didn't like it, so just properly remove it entirely.
|
2020-08-10 17:22:55 -04:00 |
|
p_map.c
|
Merge p_map.c
|
2020-08-10 14:34:29 -04:00 |
|
p_maputl.c
|
p_map & p_maputl merge conflicts
|
2020-05-30 13:53:30 -04:00 |
|
p_maputl.h
|
|
|
|
p_mobj.c
|
OK the compiler still didn't like it, so just properly remove it entirely.
|
2020-08-10 17:22:55 -04:00 |
|
p_mobj.h
|
Merge p_mobj.h
|
2020-08-10 14:37:56 -04:00 |
|
p_polyobj.c
|
Merge p_polyobj.c
|
2020-08-10 14:39:11 -04:00 |
|
p_polyobj.h
|
Adapt POF_SPLAT to UDMF setup
|
2020-06-09 09:44:49 +02:00 |
|
p_pspr.h
|
Merge p_pspr.h
|
2020-08-10 12:38:20 +08:00 |
|
p_saveg.c
|
Merge p_saveg.c
|
2020-08-10 14:42:17 -04:00 |
|
p_saveg.h
|
Special saves!
|
2020-06-22 19:00:47 +01:00 |
|
p_setup.c
|
Merge p_setup.c
|
2020-08-10 14:43:24 -04:00 |
|
p_setup.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
p_sight.c
|
Merge p_sight.c
|
2020-08-06 11:12:19 -04:00 |
|
p_slopes.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
p_slopes.h
|
Merge branch 'next' into udmf-next
|
2020-06-09 09:38:01 +02:00 |
|
p_spec.c
|
Merge p_spec.c
|
2020-08-10 14:48:49 -04:00 |
|
p_spec.h
|
Merge p_spec.c/h
|
2020-08-09 15:31:23 -04:00 |
|
p_telept.c
|
Merge p_telept.c
|
2020-08-10 14:50:35 -04:00 |
|
p_tick.c
|
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
|
2020-08-10 17:00:45 -04:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
OK the compiler still didn't like it, so just properly remove it entirely.
|
2020-08-10 17:22:55 -04:00 |
|
r_bsp.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_bsp.h
|
Merge r_bsp.c/h
|
2020-08-06 19:33:01 -04:00 |
|
r_data.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_data.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_defs.h
|
Fix random #endif in seg_t
|
2020-08-10 17:05:29 -04:00 |
|
r_draw.c
|
Merge r_draw.c
|
2020-08-10 15:01:57 -04:00 |
|
r_draw.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_draw8.c
|
A bunch of easy files (1-5 conflicts)
|
2020-08-05 14:34:17 -04:00 |
|
r_draw8_npo2.c
|
|
|
|
r_draw16.c
|
|
|
|
r_local.h
|
|
|
|
r_main.c
|
Merge r_main.c
|
2020-08-10 15:02:32 -04:00 |
|
r_main.h
|
Fix extra AIMINGTODY
|
2020-08-10 17:06:12 -04:00 |
|
r_patch.c
|
Remove GrTexInfo
|
2020-07-06 00:35:48 -03:00 |
|
r_patch.h
|
|
|
|
r_plane.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_plane.h
|
Merge r_plane.c
|
2020-08-08 17:04:26 -04:00 |
|
r_portal.c
|
|
|
|
r_portal.h
|
|
|
|
r_segs.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_segs.h
|
|
|
|
r_skins.c
|
Merge r_skins.c
|
2020-08-10 15:03:09 -04:00 |
|
r_skins.h
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
r_sky.c
|
A bunch of easy files (1-5 conflicts)
|
2020-08-05 14:34:17 -04:00 |
|
r_sky.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
r_splats.c
|
|
|
|
r_splats.h
|
|
|
|
r_state.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
r_things.c
|
Merge r_things.c
|
2020-08-10 12:45:31 +08:00 |
|
r_things.h
|
Merge r_things.c/h
|
2020-08-08 19:08:19 -04:00 |
|
s_sound.c
|
Merge s_sound.c/h
|
2020-08-10 15:09:24 -04:00 |
|
s_sound.h
|
Fix musicdefs
|
2020-08-10 16:48:40 -04:00 |
|
screen.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
screen.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
sounds.c
|
Merge sounds.c
|
2020-08-10 12:47:58 +08:00 |
|
sounds.h
|
Fix conflicting info definitions
|
2020-08-10 16:49:54 -04:00 |
|
st_stuff.c
|
Merge st_stuff.c
|
2020-08-10 15:09:58 -04:00 |
|
st_stuff.h
|
Merge st_stuff.c/h
|
2020-08-09 20:23:09 -04:00 |
|
strcasestr.c
|
|
|
|
string.c
|
|
|
|
t_facon.c
|
|
|
|
t_fsin.c
|
|
|
|
t_ftan.c
|
|
|
|
t_tan2a.c
|
|
|
|
tables.c
|
Deprecate FixedRem.
|
2020-05-18 11:29:56 -05:00 |
|
tables.h
|
The start of the scary 2.2 merge
|
2020-05-29 13:43:38 -04:00 |
|
tmap.nas
|
|
|
|
tmap.s
|
|
|
|
tmap_asm.s
|
|
|
|
tmap_mmx.nas
|
|
|
|
tmap_vc.nas
|
|
|
|
v_video.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
v_video.h
|
Fix extra V_MAGENTAMAP definition
|
2020-08-10 17:07:47 -04:00 |
|
version.h
|
Automate VERSION/SUBVERSION; move version related definitions to version.h
|
2020-07-10 22:20:33 -07:00 |
|
vid_copy.s
|
|
|
|
w_wad.c
|
Merge w_wad.c
|
2020-08-10 12:57:47 -04:00 |
|
w_wad.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
y_inter.c
|
InputDown -> PlayerInputDown, JoyAxis -> PlayerJoyAxis
|
2020-08-10 17:00:45 -04:00 |
|
y_inter.h
|
Merge y_inter.c/h
|
2020-08-10 15:14:03 -04:00 |
|
z_zone.c
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
z_zone.h
|
|
|
