Merge branch 'master' into change-colormap-ldef
Showing
- .travis.yml 0 additions, 43 deletions.travis.yml
- src/android/i_cdmus.c 1 addition, 1 deletionsrc/android/i_cdmus.c
- src/d_netcmd.c 14 additions, 2 deletionssrc/d_netcmd.c
- src/d_player.h 13 additions, 1 deletionsrc/d_player.h
- src/dehacked.c 67 additions, 1 deletionsrc/dehacked.c
- src/djgppdos/i_cdmus.c 1 addition, 1 deletionsrc/djgppdos/i_cdmus.c
- src/doomstat.h 2 additions, 0 deletionssrc/doomstat.h
- src/g_game.c 24 additions, 15 deletionssrc/g_game.c
- src/hu_stuff.c 10 additions, 2 deletionssrc/hu_stuff.c
- src/hu_stuff.h 1 addition, 0 deletionssrc/hu_stuff.h
- src/info.c 570 additions, 18 deletionssrc/info.c
- src/info.h 58 additions, 0 deletionssrc/info.h
- src/lua_maplib.c 17 additions, 2 deletionssrc/lua_maplib.c
- src/lua_playerlib.c 36 additions, 0 deletionssrc/lua_playerlib.c
- src/m_cheat.c 58 additions, 31 deletionssrc/m_cheat.c
- src/m_cheat.h 1 addition, 2 deletionssrc/m_cheat.h
- src/m_menu.c 3 additions, 3 deletionssrc/m_menu.c
- src/p_enemy.c 183 additions, 7 deletionssrc/p_enemy.c
- src/p_inter.c 15 additions, 13 deletionssrc/p_inter.c
- src/p_local.h 2 additions, 0 deletionssrc/p_local.h
Loading
Please register or sign in to comment