Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into HEAD
# Conflicts: # src/lua_hook.h # src/lua_hooklib.c
No related branches found
No related tags found
Showing
- extras/conf/SRB2-22.cfg 1 addition, 0 deletionsextras/conf/SRB2-22.cfg
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/blua/Makefile.cfg 2 additions, 1 deletionsrc/blua/Makefile.cfg
- src/console.c 2 additions, 2 deletionssrc/console.c
- src/d_main.c 63 additions, 0 deletionssrc/d_main.c
- src/d_ticcmd.h 3 additions, 0 deletionssrc/d_ticcmd.h
- src/deh_tables.c 73 additions, 0 deletionssrc/deh_tables.c
- src/f_finale.c 1 addition, 1 deletionsrc/f_finale.c
- src/g_demo.c 12 additions, 0 deletionssrc/g_demo.c
- src/g_game.c 67 additions, 64 deletionssrc/g_game.c
- src/g_game.h 20 additions, 0 deletionssrc/g_game.h
- src/g_input.c 28 additions, 20 deletionssrc/g_input.c
- src/g_input.h 28 additions, 5 deletionssrc/g_input.h
- src/i_system.h 12 additions, 0 deletionssrc/i_system.h
- src/lua_baselib.c 3 additions, 1 deletionsrc/lua_baselib.c
- src/lua_hook.h 3 additions, 0 deletionssrc/lua_hook.h
- src/lua_hooklib.c 11 additions, 0 deletionssrc/lua_hooklib.c
- src/lua_inputlib.c 242 additions, 0 deletionssrc/lua_inputlib.c
- src/lua_libs.h 3 additions, 0 deletionssrc/lua_libs.h
- src/lua_playerlib.c 6 additions, 0 deletionssrc/lua_playerlib.c
Loading