| .. |
|
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
|
Make it past p_mobj
|
2020-08-14 20:48:06 -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 branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
sdl12
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
win32
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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
|
|
|
|
byteptr.h
|
Fuck you macro
|
2020-07-04 12:52:01 -07:00 |
|
CMakeLists.txt
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
command.c
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
command.h
|
Compiling reaches g_demo.c again after the merge
|
2020-08-12 22:40:15 -04:00 |
|
comptime.c
|
|
|
|
config.h.in
|
Merge config.h.in
|
2020-08-10 15:11:21 -04:00 |
|
console.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
console.h
|
Merge remote-tracking branch 'public/master'
|
2020-08-12 18:55:43 -04:00 |
|
d_clisrv.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
d_clisrv.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
d_event.h
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
d_main.c
|
Compiling reaches g_demo.c again after the merge
|
2020-08-12 22:40:15 -04:00 |
|
d_main.h
|
|
|
|
d_net.c
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
d_net.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
d_netcmd.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
d_netcmd.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
d_netfil.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
d_netfil.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
d_player.h
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
d_think.h
|
|
|
|
d_ticcmd.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
dehacked.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
dehacked.h
|
Merge dehacked.c/h
|
2020-08-02 16:59:24 -04:00 |
|
doomdata.h
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
doomdef.h
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
doomstat.h
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
doomtype.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
endian.h
|
|
|
|
f_finale.c
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
f_finale.h
|
f_finale now compiles
|
2020-08-11 23:13:25 -04:00 |
|
f_wipe.c
|
Merge remote-tracking branch 'public/master'
|
2020-08-12 18:55:43 -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 |
|
font.c
|
|
|
|
font.h
|
|
|
|
g_demo.c
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
g_demo.h
|
g_demo compiles
|
2020-08-12 23:08:31 -04:00 |
|
g_game.c
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
g_game.h
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
g_input.c
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
g_input.h
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -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
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -04:00 |
|
hu_stuff.h
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -04:00 |
|
i_addrinfo.c
|
|
|
|
i_addrinfo.h
|
|
|
|
i_joy.h
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -04:00 |
|
i_net.h
|
|
|
|
i_sound.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
i_system.h
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
i_tcp.c
|
|
|
|
i_tcp.h
|
|
|
|
i_threads.h
|
|
|
|
i_video.h
|
|
|
|
info.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
info.h
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
k_battle.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
k_battle.h
|
|
|
|
k_bheap.c
|
Fix the cause of the waypoint debug message spam in Canyon Rush.
|
2020-07-08 21:36:28 +01:00 |
|
k_bheap.h
|
|
|
|
k_bot.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
k_bot.h
|
Add comments for functions
|
2020-06-04 17:14:14 -04:00 |
|
k_botitem.c
|
Add comments for functions
|
2020-06-04 17:14:14 -04:00 |
|
k_botsearch.c
|
Add comments for functions
|
2020-06-04 17:14:14 -04:00 |
|
k_collide.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
k_collide.h
|
|
|
|
k_color.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
k_color.h
|
Remove functions no longer needed with skincolors[]
|
2020-08-12 20:59:30 -04:00 |
|
k_grandprix.c
|
Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player
|
2020-06-06 19:45:13 -04:00 |
|
k_grandprix.h
|
Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player
|
2020-06-06 19:45:13 -04:00 |
|
k_hud.c
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -04:00 |
|
k_hud.h
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -04:00 |
|
k_kart.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
k_kart.h
|
Merge remote-tracking branch 'public/next'
|
2020-08-12 18:50:41 -04:00 |
|
k_pathfind.c
|
Fix shadowed declaration in pathfind code
|
2020-07-10 01:32:46 +01:00 |
|
k_pathfind.h
|
|
|
|
k_pwrlv.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
k_pwrlv.h
|
|
|
|
k_respawn.c
|
Merge branch 'antigrav-respawn' into 'master'
|
2020-07-31 21:55:38 -04:00 |
|
k_respawn.h
|
Outdated comment
|
2020-06-02 13:30:36 -04:00 |
|
k_waypoint.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
k_waypoint.h
|
|
|
|
keys.h
|
|
|
|
lua_baselib.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
lua_blockmaplib.c
|
|
|
|
lua_consolelib.c
|
Lots of splitscreen fixes
|
2020-08-10 23:38:32 -04:00 |
|
lua_hook.h
|
g_demo compiles
|
2020-08-12 23:08:31 -04:00 |
|
lua_hooklib.c
|
g_demo compiles
|
2020-08-12 23:08:31 -04:00 |
|
lua_hud.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
lua_hudlib.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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
|
Many removals
|
2020-08-10 21:45:51 -04:00 |
|
lua_mathlib.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
lua_mobjlib.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
lua_playerlib.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
lua_script.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
lua_script.h
|
Merge lua_script.h
|
2020-08-10 12:34:38 -04:00 |
|
lua_skinlib.c
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
lua_thinkerlib.c
|
|
|
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
|
|
|
m_aatree.h
|
|
|
|
m_anigif.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -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
|
|
|
|
m_argv.h
|
|
|
|
m_bbox.c
|
|
|
|
m_bbox.h
|
|
|
|
m_cheat.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
m_cheat.h
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
m_cond.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
m_cond.h
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
m_dllist.h
|
|
|
|
m_fixed.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
m_fixed.h
|
Deprecate FixedRem.
|
2020-05-18 11:29:56 -05:00 |
|
m_menu.c
|
m_menu compiles
|
2020-08-14 06:28:35 -04:00 |
|
m_menu.h
|
m_menu compiles
|
2020-08-14 06:28:35 -04:00 |
|
m_misc.c
|
m_misc compiles
|
2020-08-14 06:32:03 -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 branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
Makefile.cfg
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_floor.c
|
Merge p_floor.c
|
2020-08-06 11:07:33 -04:00 |
|
p_inter.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_lights.c
|
|
|
|
p_local.h
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_map.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_maputl.c
|
f_finale now compiles
|
2020-08-11 23:13:25 -04:00 |
|
p_maputl.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
p_mobj.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_mobj.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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 branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
p_saveg.h
|
Special saves!
|
2020-06-22 19:00:47 +01:00 |
|
p_setup.c
|
g_game and g_input now compile
|
2020-08-13 00:05:44 -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
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
p_slopes.h
|
Merge branch 'next' into udmf-next
|
2020-06-09 09:38:01 +02:00 |
|
p_spec.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_spec.h
|
Merge p_spec.c/h
|
2020-08-09 15:31:23 -04:00 |
|
p_telept.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
p_tick.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -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
|
Use kart's f_wipe
|
2020-08-12 18:15:28 -04:00 |
|
r_data.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
r_defs.h
|
More fixing up
|
2020-08-11 18:46:00 -04:00 |
|
r_draw.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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 branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
r_main.h
|
m_menu compiles
|
2020-08-14 06:28:35 -04:00 |
|
r_patch.c
|
Remove GrTexInfo
|
2020-07-06 00:35:48 -03:00 |
|
r_patch.h
|
|
|
|
r_plane.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
r_segs.h
|
|
|
|
r_skins.c
|
More fixing up
|
2020-08-11 18:46:00 -04:00 |
|
r_skins.h
|
Compiling reaches g_demo.c again after the merge
|
2020-08-12 22:40:15 -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
|
Use kart's f_wipe
|
2020-08-12 18:15:28 -04:00 |
|
r_things.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
r_things.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
s_sound.c
|
Make it past p_mobj
|
2020-08-14 20:48:06 -04:00 |
|
s_sound.h
|
Fix musicdefs
|
2020-08-10 16:48:40 -04:00 |
|
screen.c
|
Another round of fixing up
|
2020-08-11 16:13:17 -04:00 |
|
screen.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
sounds.c
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
sounds.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
st_stuff.c
|
m_anigif, m_cheat, m_cond, m_fixed
|
2020-08-14 01:31:37 -04:00 |
|
st_stuff.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59: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
|
m_menu compiles
|
2020-08-14 06:28:35 -04:00 |
|
v_video.h
|
Merge branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -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 branch 'master' into the-scary-22-merge
|
2020-08-12 20:59:09 -04:00 |
|
w_wad.h
|
YAY, round 2
|
2020-08-09 21:02:56 -04:00 |
|
y_inter.c
|
hu_stuff & y_inter
|
2020-08-14 01:06:55 -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
|
|
|
