Merge branch 'next' into internal-master
Synchronize the following MRs to internal: * !6 * !8 * !9 * !10 Conflicts: src/doomdef.h src/p_map.c
Showing
- src/dehacked.c 1 addition, 1 deletionsrc/dehacked.c
- src/p_enemy.c 2 additions, 2 deletionssrc/p_enemy.c
- src/p_local.h 3 additions, 0 deletionssrc/p_local.h
- src/p_map.c 12 additions, 0 deletionssrc/p_map.c
- src/p_polyobj.c 31 additions, 15 deletionssrc/p_polyobj.c
- src/p_polyobj.h 2 additions, 0 deletionssrc/p_polyobj.h
- src/p_user.c 4 additions, 0 deletionssrc/p_user.c
- src/r_bsp.c 4 additions, 2 deletionssrc/r_bsp.c
- src/r_things.c 15 additions, 2 deletionssrc/r_things.c
Loading
Please register or sign in to comment