Merge branch 'feature_assets' into develop

2013-12-08 22:19:58 +01:00
parent b0dbd4f4af 2fe27fd0da
commit 8db2e5db81
12 changed files with 447 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -384,6 +384,14 @@ logic/NagUtils.cpp
 logic/SkinUtils.h
 logic/SkinUtils.cpp

+# Assets
+logic/assets/AssetsIndex.h
+logic/assets/AssetsIndex.cpp
+logic/assets/AssetsUtils.h
+logic/assets/AssetsUtils.cpp
+logic/assets/Assets.h
+logic/assets/Assets.cpp
+
 )