-
- Downloads
Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal
# Conflicts: # src/hardware/hw_md2.c # src/p_mobj.c # src/p_mobj.h
Showing
- src/dehacked.c 48 additions, 578 deletionssrc/dehacked.c
- src/f_finale.h 2 additions, 1 deletionsrc/f_finale.h
- src/f_wipe.c 1 addition, 0 deletionssrc/f_wipe.c
- src/hardware/hw_md2.c 26 additions, 5 deletionssrc/hardware/hw_md2.c
- src/info.c 141 additions, 675 deletionssrc/info.c
- src/info.h 37 additions, 576 deletionssrc/info.h
- src/lua_maplib.c 5 additions, 1 deletionsrc/lua_maplib.c
- src/lua_mobjlib.c 8 additions, 0 deletionssrc/lua_mobjlib.c
- src/p_local.h 1 addition, 0 deletionssrc/p_local.h
- src/p_mobj.c 84 additions, 39 deletionssrc/p_mobj.c
- src/p_mobj.h 3 additions, 1 deletionsrc/p_mobj.h
- src/p_pspr.h 4 additions, 2 deletionssrc/p_pspr.h
- src/p_saveg.c 11 additions, 0 deletionssrc/p_saveg.c
- src/p_setup.c 38 additions, 13 deletionssrc/p_setup.c
- src/p_spec.c 7 additions, 0 deletionssrc/p_spec.c
- src/p_tick.c 2 additions, 0 deletionssrc/p_tick.c
Loading
Please register or sign in to comment