Merge branch 'hardcoding-nights-spheredamage' into 'master'
NiGHTS: Handle sphere damage correctly upon timeout * Spill spheres/chips, implement MT_FLINGBLUESPHERE and MT_FLINGNIGHTSCHIP * Handle player->spheres and player->rings consistently See merge request STJr/SRB2Internal!157
Showing
- src/d_netcmd.c 1 addition, 0 deletionssrc/d_netcmd.c
- src/d_player.h 1 addition, 0 deletionssrc/d_player.h
- src/dehacked.c 2 additions, 0 deletionssrc/dehacked.c
- src/info.c 56 additions, 2 deletionssrc/info.c
- src/info.h 2 additions, 0 deletionssrc/info.h
- src/lua_playerlib.c 4 additions, 0 deletionssrc/lua_playerlib.c
- src/m_cheat.c 17 additions, 0 deletionssrc/m_cheat.c
- src/m_cheat.h 1 addition, 0 deletionssrc/m_cheat.h
- src/m_menu.c 10 additions, 2 deletionssrc/m_menu.c
- src/p_inter.c 45 additions, 10 deletionssrc/p_inter.c
- src/p_mobj.c 10 additions, 0 deletionssrc/p_mobj.c
- src/p_saveg.c 2 additions, 0 deletionssrc/p_saveg.c
- src/p_setup.c 9 additions, 7 deletionssrc/p_setup.c
- src/p_user.c 11 additions, 4 deletionssrc/p_user.c
Loading
Please register or sign in to comment