Merge branch 'udmf-executor-triggers' into udmf-thing-types
# Conflicts: # src/p_setup.c # src/p_spec.h
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 210 additions, 7 deletionsextras/conf/udb/Includes/SRB222_linedefs.cfg
- extras/conf/udb/Includes/SRB222_misc.cfg 7 additions, 3 deletionsextras/conf/udb/Includes/SRB222_misc.cfg
- src/deh_tables.c 21 additions, 6 deletionssrc/deh_tables.c
- src/g_game.c 24 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/lua_maplib.c 8 additions, 0 deletionssrc/lua_maplib.c
- src/m_menu.c 21 additions, 22 deletionssrc/m_menu.c
- src/p_local.h 1 addition, 0 deletionssrc/p_local.h
- src/p_mobj.c 3 additions, 2 deletionssrc/p_mobj.c
- src/p_pspr.h 33 additions, 12 deletionssrc/p_pspr.h
- src/p_setup.c 180 additions, 153 deletionssrc/p_setup.c
- src/p_spec.c 101 additions, 79 deletionssrc/p_spec.c
- src/p_spec.h 9 additions, 0 deletionssrc/p_spec.h
- src/p_user.c 17 additions, 27 deletionssrc/p_user.c
- src/r_data.h 0 additions, 3 deletionssrc/r_data.h
Loading
Please register or sign in to comment