Skip to content
Snippets Groups Projects
  1. Sep 23, 2012
  2. Sep 22, 2012
  3. Sep 21, 2012
  4. Sep 15, 2012
  5. Sep 12, 2012
  6. Sep 10, 2012
  7. Sep 09, 2012
  8. Sep 08, 2012
    • Amorilia's avatar
      Merge remote-tracking branch 'ethatron/bleeding-edge' into feature/sync-with-ethatron · 0b2d0541
      Amorilia authored
      Note:
      Manually resolved one conflict in NiGeometryData Get/SetTspaceFlags.
      All other conflicts resolved via gen_niflib.py.
      
      Conflicts:
      	include/gen/enums.h
      	include/gen/enums_intl.h
      	include/obj/BSBehaviorGraphExtraData.h
      	include/obj/BSEffectShaderProperty.h
      	include/obj/BSLagBoneController.h
      	include/obj/BSLightingShaderProperty.h
      	include/obj/BSLightingShaderPropertyFloatController.h
      	include/obj/BSMultiBoundAABB.h
      	include/obj/BSSegmentedTriShape.h
      	include/obj/BSXFlags.h
      	include/obj/NiObjectNET.h
      	src/gen/Header.cpp
      	src/gen/enums.cpp
      	src/obj/BSEffectShaderProperty.cpp
      	src/obj/BSLagBoneController.cpp
      	src/obj/BSLightingShaderProperty.cpp
      	src/obj/BSMultiBoundAABB.cpp
      	src/obj/NiGeometryData.cpp
      	src/obj/NiObjectNET.cpp
      	src/obj/NiPSysData.cpp
      	src/obj/NiParticlesData.cpp
      0b2d0541
Loading