Skip to content
Snippets Groups Projects
Commit 0b2d0541 authored by Amorilia's avatar Amorilia
Browse files

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
parents 4db87909 9f74feb7
No related branches found
No related tags found
No related merge requests found
Showing
with 1479 additions and 122 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment