Merge commit 'd624ee25' into udmf-thing-types
# Conflicts: # src/p_mobj.c # src/p_spec.c
Showing
- extras/conf/SRB2-22.cfg 7 additions, 7 deletionsextras/conf/SRB2-22.cfg
- src/b_bot.c 40 additions, 20 deletionssrc/b_bot.c
- src/byteptr.h 75 additions, 23 deletionssrc/byteptr.h
- src/d_net.c 3 additions, 2 deletionssrc/d_net.c
- src/deh_tables.c 1 addition, 0 deletionssrc/deh_tables.c
- src/g_game.c 38 additions, 54 deletionssrc/g_game.c
- src/hardware/hw_draw.c 8 additions, 14 deletionssrc/hardware/hw_draw.c
- src/hu_stuff.c 137 additions, 276 deletionssrc/hu_stuff.c
- src/hu_stuff.h 1 addition, 1 deletionsrc/hu_stuff.h
- src/info.c 42 additions, 15 deletionssrc/info.c
- src/info.h 1 addition, 0 deletionssrc/info.h
- src/lua_baselib.c 6 additions, 6 deletionssrc/lua_baselib.c
- src/lua_hooklib.c 4 additions, 0 deletionssrc/lua_hooklib.c
- src/mserv.c 1 addition, 0 deletionssrc/mserv.c
- src/p_enemy.c 22 additions, 38 deletionssrc/p_enemy.c
- src/p_local.h 2 additions, 0 deletionssrc/p_local.h
- src/p_map.c 119 additions, 76 deletionssrc/p_map.c
- src/p_mobj.c 50 additions, 45 deletionssrc/p_mobj.c
- src/p_setup.c 5 additions, 2 deletionssrc/p_setup.c
- src/p_spec.c 7 additions, 13 deletionssrc/p_spec.c
Loading
Please register or sign in to comment