Merge branch 'next' into udmf-fofs-mkii
# Conflicts: # src/hardware/hw_main.c # src/lua_maplib.c # src/p_spec.c # src/p_user.c
Showing
- extras/conf/SRB2-22.cfg 256 additions, 22 deletionsextras/conf/SRB2-22.cfg
- extras/conf/udb/Includes/SRB222_common.cfg 2 additions, 2 deletionsextras/conf/udb/Includes/SRB222_common.cfg
- extras/conf/udb/Includes/SRB222_linedefs.cfg 155 additions, 0 deletionsextras/conf/udb/Includes/SRB222_linedefs.cfg
- extras/conf/udb/Includes/SRB222_misc.cfg 6 additions, 2 deletionsextras/conf/udb/Includes/SRB222_misc.cfg
- src/b_bot.c 7 additions, 2 deletionssrc/b_bot.c
- src/d_netcmd.c 1 addition, 1 deletionsrc/d_netcmd.c
- src/deh_lua.c 5 additions, 0 deletionssrc/deh_lua.c
- src/deh_tables.c 23 additions, 6 deletionssrc/deh_tables.c
- src/g_game.c 27 additions, 24 deletionssrc/g_game.c
- src/g_input.c 33 additions, 27 deletionssrc/g_input.c
- src/hardware/hw_draw.c 22 additions, 38 deletionssrc/hardware/hw_draw.c
- src/hardware/hw_main.c 70 additions, 31 deletionssrc/hardware/hw_main.c
- src/hu_stuff.c 22 additions, 18 deletionssrc/hu_stuff.c
- src/info.c 5 additions, 5 deletionssrc/info.c
- src/lua_hooklib.c 1 addition, 1 deletionsrc/lua_hooklib.c
- src/lua_maplib.c 8 additions, 0 deletionssrc/lua_maplib.c
- src/lua_mathlib.c 7 additions, 0 deletionssrc/lua_mathlib.c
- src/m_menu.c 21 additions, 22 deletionssrc/m_menu.c
- src/p_floor.c 2 additions, 2 deletionssrc/p_floor.c
- src/p_local.h 1 addition, 0 deletionssrc/p_local.h
Loading
Please register or sign in to comment