William Moberg 562afac9d1 Merge branch 'master' into Importer ...

# Conflicts:
#	src/Engine/Collision/Collision.cpp
#	src/Engine/Collision/CollisionSystem.cpp
#	src/Engine/Rendering/DrawFinalPass.cpp
#	src/Game/Systems/SpawnerSystem.cpp

2016-03-14 00:42:07 +01:00

..

GeneratedFiles

Reworked the Exporter.

2016-01-13 14:03:58 +01:00

Export.cpp

Export Collision mesh

2016-02-25 13:19:35 +01:00

Export.h

Export Collision mesh

2016-02-25 13:19:35 +01:00

leeeeel.qrc

Maya Exporter WIP

2015-12-07 14:44:34 +01:00

Main.cpp

Maya Exporter WIP

2015-12-07 14:44:34 +01:00

Material.cpp

Fixed Splatmap Export

2016-03-13 12:20:25 +01:00

Material.h

Splatmapping now working.

2016-02-07 13:39:13 +01:00

MayaExporter.ui

Maya Exporter WIP

2015-12-07 14:44:34 +01:00

MayaExporter.vcxproj

WIP, commit to be able to pull stuff down

2016-02-04 14:58:46 +01:00

MayaExporter.vcxproj.filters

Reworked the Exporter.

2016-01-13 14:03:58 +01:00

MayaExporter.vcxproj.user

Maya Exporter WIP

2015-12-07 14:44:34 +01:00

MayaIncludes.h

Animations PROBABLY works fine if all joints got keyframes.

2016-01-23 18:02:42 +01:00

Menu.cpp

Export Collision mesh

2016-02-25 13:19:35 +01:00

Menu.h

Export Collision mesh

2016-02-25 13:19:35 +01:00

Mesh.cpp

Export Collision mesh

2016-02-25 13:19:35 +01:00

Mesh.h

Export Collision mesh

2016-02-25 13:19:35 +01:00

OutputData.h

Spitting out files WIP

2015-12-18 16:21:07 +01:00

Skeleton.cpp

Splatmapping now working.

2016-02-07 13:39:13 +01:00

Skeleton.h

Changed the structure of the Animation Data in both Exporter & Importer.

2016-02-04 11:25:31 +01:00

WriteToFile.cpp

Custom Animations should now work. We also save color values if there's no texture.

2016-01-24 13:28:40 +01:00

WriteToFile.h

Custom Animations should now work. We also save color values if there's no texture.

2016-01-24 13:28:40 +01:00