Merge branch 'blentran-update' into udmf-full
# Conflicts: # src/lua_maplib.c # src/p_setup.c # src/p_spec.c
No related branches found
No related tags found
Showing
- extras/conf/SRB2-22.cfg 186 additions, 0 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/deh_tables.c 20 additions, 6 deletionssrc/deh_tables.c
- src/hardware/hw_draw.c 22 additions, 38 deletionssrc/hardware/hw_draw.c
- src/hardware/hw_main.c 74 additions, 32 deletionssrc/hardware/hw_main.c
- src/hu_stuff.c 13 additions, 9 deletionssrc/hu_stuff.c
- src/lua_maplib.c 8 additions, 0 deletionssrc/lua_maplib.c
- src/m_menu.c 5 additions, 5 deletionssrc/m_menu.c
- src/p_pspr.h 33 additions, 12 deletionssrc/p_pspr.h
- src/p_setup.c 45 additions, 2 deletionssrc/p_setup.c
- src/p_spec.c 6 additions, 0 deletionssrc/p_spec.c
- src/r_data.h 0 additions, 3 deletionssrc/r_data.h
- src/r_defs.h 16 additions, 9 deletionssrc/r_defs.h
- src/r_draw.c 3 additions, 0 deletionssrc/r_draw.c
- src/r_plane.c 10 additions, 22 deletionssrc/r_plane.c
- src/r_segs.c 24 additions, 29 deletionssrc/r_segs.c
- src/r_things.c 26 additions, 6 deletionssrc/r_things.c
- src/r_things.h 9 additions, 7 deletionssrc/r_things.h
Loading
Please register or sign in to comment