Merge remote-tracking branch 'ethatron/bleeding-edge' into feature/sync-with-ethatron
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
No related branches found
No related tags found
Showing
- include/nif_math.h 83 additions, 0 deletionsinclude/nif_math.h
- include/obj/NiBoneLODController.h 19 additions, 0 deletionsinclude/obj/NiBoneLODController.h
- include/obj/NiDefaultAVObjectPalette.h 19 additions, 0 deletionsinclude/obj/NiDefaultAVObjectPalette.h
- include/obj/NiGeometry.h 6 additions, 0 deletionsinclude/obj/NiGeometry.h
- include/obj/NiMultiTargetTransformController.h 19 additions, 0 deletionsinclude/obj/NiMultiTargetTransformController.h
- include/obj/NiPSysMeshEmitter.h 20 additions, 0 deletionsinclude/obj/NiPSysMeshEmitter.h
- include/obj/NiSkinData.h 6 additions, 0 deletionsinclude/obj/NiSkinData.h
- include/obj/hkPackedNiTriStripsData.h 13 additions, 0 deletionsinclude/obj/hkPackedNiTriStripsData.h
- niflib_VC2008.vcproj 1068 additions, 116 deletionsniflib_VC2008.vcproj
- src/nif_math.cpp 28 additions, 0 deletionssrc/nif_math.cpp
- src/obj/NiBoneLODController.cpp 38 additions, 0 deletionssrc/obj/NiBoneLODController.cpp
- src/obj/NiDefaultAVObjectPalette.cpp 39 additions, 0 deletionssrc/obj/NiDefaultAVObjectPalette.cpp
- src/obj/NiGeometry.cpp 4 additions, 0 deletionssrc/obj/NiGeometry.cpp
- src/obj/NiMultiTargetTransformController.cpp 39 additions, 0 deletionssrc/obj/NiMultiTargetTransformController.cpp
- src/obj/NiPSysMeshEmitter.cpp 40 additions, 0 deletionssrc/obj/NiPSysMeshEmitter.cpp
- src/obj/NiSkinData.cpp 9 additions, 0 deletionssrc/obj/NiSkinData.cpp
- src/obj/bhkConvexVerticesShape.cpp 10 additions, 6 deletionssrc/obj/bhkConvexVerticesShape.cpp
- src/obj/hkPackedNiTriStripsData.cpp 19 additions, 0 deletionssrc/obj/hkPackedNiTriStripsData.cpp
Loading
Please register or sign in to comment