Merge branch 'master' into sonicitems
Showing
- src/d_player.h 2 additions, 1 deletionsrc/d_player.h
- src/dehacked.c 7 additions, 7 deletionssrc/dehacked.c
- src/hardware/hw_glob.h 1 addition, 1 deletionsrc/hardware/hw_glob.h
- src/hardware/hw_main.c 32 additions, 33 deletionssrc/hardware/hw_main.c
- src/info.c 10 additions, 11 deletionssrc/info.c
- src/info.h 6 additions, 7 deletionssrc/info.h
- src/k_kart.c 115 additions, 30 deletionssrc/k_kart.c
- src/k_kart.h 2 additions, 1 deletionsrc/k_kart.h
- src/lua_baselib.c 14 additions, 3 deletionssrc/lua_baselib.c
- src/p_mobj.c 7 additions, 0 deletionssrc/p_mobj.c
- src/p_user.c 9 additions, 7 deletionssrc/p_user.c
- src/sounds.c 1 addition, 0 deletionssrc/sounds.c
- src/sounds.h 1 addition, 0 deletionssrc/sounds.h
Loading
Please register or sign in to comment