-
- Downloads
Merge branch 'master' into boost-tickrate
# Conflicts: # src/p_mobj.c
Showing
- .travis.yml 0 additions, 43 deletions.travis.yml
- bin/Mingw/Release/.gitignore 1 addition, 0 deletionsbin/Mingw/Release/.gitignore
- src/Makefile 17 additions, 8 deletionssrc/Makefile
- src/android/i_cdmus.c 1 addition, 1 deletionsrc/android/i_cdmus.c
- src/android/i_sound.c 43 additions, 45 deletionssrc/android/i_sound.c
- src/b_bot.c 1 addition, 2 deletionssrc/b_bot.c
- src/config.h.in 2 additions, 2 deletionssrc/config.h.in
- src/console.c 1 addition, 1 deletionsrc/console.c
- src/d_clisrv.c 14 additions, 13 deletionssrc/d_clisrv.c
- src/d_clisrv.h 2 additions, 1 deletionsrc/d_clisrv.h
- src/d_main.c 14 additions, 26 deletionssrc/d_main.c
- src/d_netcmd.c 28 additions, 30 deletionssrc/d_netcmd.c
- src/d_player.h 17 additions, 3 deletionssrc/d_player.h
- src/dehacked.c 833 additions, 342 deletionssrc/dehacked.c
- src/djgppdos/i_cdmus.c 1 addition, 1 deletionsrc/djgppdos/i_cdmus.c
- src/djgppdos/i_sound.c 106 additions, 110 deletionssrc/djgppdos/i_sound.c
- src/doomdata.h 3 additions, 0 deletionssrc/doomdata.h
- src/doomdef.h 1 addition, 1 deletionsrc/doomdef.h
- src/doomstat.h 5 additions, 8 deletionssrc/doomstat.h
- src/dummy/i_sound.c 40 additions, 42 deletionssrc/dummy/i_sound.c
Loading
Please register or sign in to comment