| .. |
|
android
|
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
|
2018-10-19 22:04:26 -04:00 |
|
blua
|
|
|
|
djgppdos
|
Merge branch 'public_next'
|
2018-10-20 15:31:48 +01:00 |
|
dummy
|
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
|
2018-10-19 22:04:26 -04:00 |
|
hardware
|
Whoops, mucked up this part of the conflict resolving
|
2018-11-10 15:55:09 +00:00 |
|
locale
|
|
|
|
sdl
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
win32
|
Merge branch 'public_next'
|
2018-10-20 15:31:48 +01:00 |
|
.gitignore
|
|
|
|
am_map.c
|
|
|
|
am_map.h
|
|
|
|
Android.mk
|
|
|
|
asm_defs.inc
|
|
|
|
b_bot.c
|
|
|
|
b_bot.h
|
|
|
|
byteptr.h
|
|
|
|
CMakeLists.txt
|
|
|
|
command.c
|
|
|
|
command.h
|
|
|
|
comptime.c
|
|
|
|
config.h.in
|
|
|
|
console.c
|
|
|
|
console.h
|
|
|
|
d_clisrv.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
d_clisrv.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
d_event.h
|
|
|
|
d_main.c
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
d_main.h
|
Removed unused function prototypes in d_main.h
|
2018-10-11 19:59:47 +01:00 |
|
d_net.c
|
debugfile is only used by DEBUGFILE code, no need to declare/define it for anything else
|
2018-10-11 19:59:09 +01:00 |
|
d_net.h
|
-Added a timeout for game state downloading to prevent definitive join freezes in some cases. The timeout has a minimum value of "jointimeout" and gets higher as the game state grows in size
|
2017-01-13 20:53:52 +01:00 |
|
d_netcmd.c
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
d_netcmd.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
d_netfil.c
|
|
|
|
d_netfil.h
|
|
|
|
d_player.h
|
|
|
|
d_think.h
|
|
|
|
d_ticcmd.h
|
|
|
|
dehacked.c
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-10 17:30:33 -05:00 |
|
dehacked.h
|
|
|
|
doomdata.h
|
|
|
|
doomdef.h
|
* Patch.pk3 as requested by literally everyone else on the team.
|
2018-06-06 14:42:50 +01:00 |
|
doomstat.h
|
New gclists and const modifier; added tutorialmode declarations to this branch
|
2018-11-11 08:44:08 -05:00 |
|
doomtype.h
|
Obliterated OS/2
|
2017-10-07 18:11:14 +01:00 |
|
endian.h
|
|
|
|
f_finale.c
|
Merge branch 'endgame-code-refactor-backport' into 'next'
|
2018-10-19 17:31:19 -04:00 |
|
f_finale.h
|
|
|
|
f_wipe.c
|
|
|
|
fastcmp.h
|
|
|
|
filesrch.c
|
|
|
|
filesrch.h
|
|
|
|
g_game.c
|
New gclists and const modifier; added tutorialmode declarations to this branch
|
2018-11-11 08:44:08 -05:00 |
|
g_game.h
|
Merge branch 'master' into next
|
2018-10-31 23:10:57 +00:00 |
|
g_input.c
|
gclist_tutorial include lookup/lookdown for conflict reasons
|
2018-11-11 08:56:40 -05:00 |
|
g_input.h
|
gclist adjustments
|
2018-11-11 08:52:21 -05:00 |
|
g_state.h
|
|
|
|
hu_stuff.c
|
Add INFLIVES macro, to make it easier to find infinite lives-related code
|
2018-08-23 20:09:39 +01:00 |
|
hu_stuff.h
|
Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now
|
2018-10-11 20:00:45 +01:00 |
|
i_addrinfo.c
|
|
|
|
i_addrinfo.h
|
PS3 was deposed
|
2017-09-29 20:12:57 +01:00 |
|
i_joy.h
|
|
|
|
i_net.h
|
|
|
|
i_sound.h
|
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
|
2018-10-19 22:04:26 -04:00 |
|
i_system.h
|
|
|
|
i_tcp.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
i_tcp.h
|
|
|
|
i_video.h
|
|
|
|
info.c
|
Fix slipup from when the smashing spikeballs from HHZ were hardcoded
|
2018-10-20 12:54:40 +01:00 |
|
info.h
|
Merge branch 'master' into flicky-things
|
2018-09-06 08:09:02 -04:00 |
|
keys.h
|
|
|
|
lua_baselib.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_blockmaplib.c
|
|
|
|
lua_consolelib.c
|
Merge branch 'public_next'
|
2018-07-31 19:41:54 +01:00 |
|
lua_hook.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_hooklib.c
|
....ow this slipup hurt me badly
|
2018-11-10 16:00:33 +00:00 |
|
lua_hud.h
|
|
|
|
lua_hudlib.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_infolib.c
|
|
|
|
lua_libs.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_maplib.c
|
adding lua_maplib.c comments for new slope-related userdata types
|
2018-11-10 15:47:04 +00:00 |
|
lua_mathlib.c
|
|
|
|
lua_mobjlib.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_playerlib.c
|
|
|
|
lua_script.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
lua_script.h
|
|
|
|
lua_skinlib.c
|
Smiles follow-mobj initial support! Still using a Lua hook to follow closely behind, but now it doesn't need to be a generic thinkframe. Woo!
|
2017-10-02 14:08:58 +01:00 |
|
lua_thinkerlib.c
|
|
|
|
lzf.c
|
|
|
|
lzf.h
|
|
|
|
m_aatree.c
|
|
|
|
m_aatree.h
|
|
|
|
m_anigif.c
|
Merge branch 'public_next'
|
2018-10-19 22:46:19 +01:00 |
|
m_anigif.h
|
|
|
|
m_argv.c
|
|
|
|
m_argv.h
|
|
|
|
m_bbox.c
|
|
|
|
m_bbox.h
|
|
|
|
m_cheat.c
|
|
|
|
m_cheat.h
|
|
|
|
m_cond.c
|
|
|
|
m_cond.h
|
Fix inconsistencies in spacing in m_cond.h
|
2017-05-09 16:28:20 +01:00 |
|
m_dllist.h
|
|
|
|
m_fixed.c
|
|
|
|
m_fixed.h
|
|
|
|
m_menu.c
|
Merge branch 'control-selector' into tutorial-time
|
2018-11-11 08:46:06 -05:00 |
|
m_menu.h
|
Tutorial mode support for control switching
|
2018-11-11 08:20:08 -05:00 |
|
m_misc.c
|
G_CopyControls and G_GetControlScheme adjustment (take input list of gc's to check)
|
2018-11-11 08:21:11 -05:00 |
|
m_misc.h
|
Moved screenshot/movie consvar externs to m_misc.h
|
2018-10-11 19:38:11 +01:00 |
|
m_queue.c
|
|
|
|
m_queue.h
|
|
|
|
m_random.c
|
|
|
|
m_random.h
|
|
|
|
m_swap.h
|
|
|
|
Makefile
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
Makefile.cfg
|
|
|
|
md5.c
|
|
|
|
md5.h
|
|
|
|
mserv.c
|
Merge branch 'public_next'
|
2018-01-02 17:32:24 +00:00 |
|
mserv.h
|
copyright dates/statements updated and such
|
2016-05-17 17:42:11 -07:00 |
|
p5prof.h
|
|
|
|
p_ceilng.c
|
|
|
|
p_enemy.c
|
Flicky colors indexing fix
|
2018-09-06 13:20:55 -04:00 |
|
p_floor.c
|
Merge branch 'public_next'
|
2018-09-14 19:51:20 +01:00 |
|
p_inter.c
|
|
|
|
p_lights.c
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
p_local.h
|
Remove unused "runcount" variable from p_local.h
|
2018-10-11 20:00:23 +01:00 |
|
p_map.c
|
Set mobj->floorrover and ceilingrover in appropriate places
|
2018-09-10 00:38:07 -04:00 |
|
p_maputl.c
|
|
|
|
p_maputl.h
|
|
|
|
p_mobj.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
p_mobj.h
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
p_polyobj.c
|
Merge branch 'fof-fixes-movingplatexists' into 'master'
|
2018-09-18 11:29:11 -04:00 |
|
p_polyobj.h
|
492: Merge speed and duration logic for fade polyobject
|
2018-09-15 20:00:37 -04:00 |
|
p_pspr.h
|
* SPR2_DRL0-C are gone. They're now (FF_SPR2SUPER|SPR2_NGT0-C). This frees up a bunch of badly-used freeslots, considering that you can't be super AND NiGHTS at the same time.
|
2017-03-11 17:14:39 +00:00 |
|
p_saveg.c
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
p_saveg.h
|
|
|
|
p_setup.c
|
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
|
2018-10-27 19:29:31 +01:00 |
|
p_setup.h
|
MONSTER COMMIT.
|
2018-06-03 22:41:54 +01:00 |
|
p_sight.c
|
|
|
|
p_slopes.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
p_slopes.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
p_spec.c
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
p_spec.h
|
Merge branch 'master' into le-fadefof
|
2018-09-18 17:11:33 -04:00 |
|
p_telept.c
|
|
|
|
p_tick.c
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
p_tick.h
|
|
|
|
p_user.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
r_bsp.c
|
Make lightlists react to control sector colormap changes (double pointer)
|
2018-09-12 16:06:56 -04:00 |
|
r_bsp.h
|
|
|
|
r_data.c
|
Be gone ye old texture hack
|
2018-10-11 21:08:25 +01:00 |
|
r_data.h
|
Make extracolormap_t->fog UINT8; it's not boolean, but categorical
|
2018-09-13 12:08:46 -04:00 |
|
r_defs.h
|
Make new pv1/pv2 seg pointers, so AdjustSeg doesn't modify the v1/v2 pointers directly anymore
|
2018-10-27 19:29:31 +01:00 |
|
r_draw.c
|
|
|
|
r_draw.h
|
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
|
2018-10-11 17:05:13 +01:00 |
|
r_draw8.c
|
Change when and specifically what colormap[] is applied to in R_Draw2sMultiPatchTranslucentColumn_8
|
2018-10-11 17:05:23 +01:00 |
|
r_draw16.c
|
|
|
|
r_local.h
|
|
|
|
r_main.c
|
"t" is not needed to take out fencepost cases from viewangletox
|
2018-10-11 20:00:05 +01:00 |
|
r_main.h
|
|
|
|
r_plane.c
|
|
|
|
r_plane.h
|
|
|
|
r_segs.c
|
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
|
2018-10-11 17:05:13 +01:00 |
|
r_segs.h
|
|
|
|
r_sky.c
|
titlemap - skipintro bugfix
|
2017-04-24 12:52:51 -04:00 |
|
r_sky.h
|
|
|
|
r_splats.c
|
|
|
|
r_splats.h
|
FUNCMATH fun
|
2016-06-12 16:08:48 -04:00 |
|
r_state.h
|
Remove unused sscount variable
|
2018-10-11 19:59:26 +01:00 |
|
r_things.c
|
Merge branch 'public_next'
|
2018-10-10 14:51:34 +01:00 |
|
r_things.h
|
|
|
|
s_sound.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
s_sound.h
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
screen.c
|
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
|
2018-10-11 17:05:13 +01:00 |
|
screen.h
|
Add R_Draw2sMultiPatchTranslucentColumn_8, for columns of multi-patch textures used as midtextures on two-sided linedefs with both transparency AND translucency
|
2018-10-11 17:05:13 +01:00 |
|
sounds.c
|
|
|
|
sounds.h
|
|
|
|
st_stuff.c
|
Removed TextPrompt-specific code for text-prompt branch
|
2018-11-03 10:57:43 -04:00 |
|
st_stuff.h
|
|
|
|
string.c
|
|
|
|
t_facon.c
|
|
|
|
t_fsin.c
|
|
|
|
t_ftan.c
|
remove blank lines at EOF of new files
|
2016-05-13 00:12:51 -04:00 |
|
t_tan2a.c
|
|
|
|
tables.c
|
|
|
|
tables.h
|
|
|
|
tmap.nas
|
|
|
|
tmap.s
|
|
|
|
tmap_asm.s
|
|
|
|
tmap_mmx.nas
|
|
|
|
tmap_vc.nas
|
|
|
|
v_video.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
v_video.h
|
Removed TextPrompt-specific code for text-prompt branch
|
2018-11-03 10:57:43 -04:00 |
|
vid_copy.s
|
|
|
|
w_wad.c
|
Merge branch 'public_next'
|
2018-11-10 15:41:57 +00:00 |
|
w_wad.h
|
|
|
|
y_inter.c
|
Removed all code in Y_FollowIntermission that's already handled in G_AfterIntermission
|
2018-10-11 21:25:15 +01:00 |
|
y_inter.h
|
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
|
2018-10-11 21:24:53 +01:00 |
|
z_zone.c
|
|
|
|
z_zone.h
|
|
|
