JoshEngebretson 10 years ago
parent
commit
13df046e18
57 changed files with 68 additions and 64 deletions
  1. 1 1
      MultiScript/Resources/Components.asset
  2. 1 1
      MultiScript/Resources/Components/CoffeeSpinner.coffee
  3. 1 1
      MultiScript/Resources/Components/InstantiatedSpinner.js.asset
  4. 1 1
      MultiScript/Resources/Components/ProtoSpinner.js.asset
  5. 1 1
      MultiScript/Resources/Components/Spinner.js.asset
  6. 1 1
      MultiScript/Resources/Models.asset
  7. 1 1
      MultiScript/Resources/Models/Chest.fbx.asset
  8. 1 1
      MultiScript/Resources/Models/Materials.asset
  9. 1 1
      MultiScript/Resources/Models/Materials/DefaultMaterial.material.asset
  10. 1 1
      MultiScript/Resources/Scenes.asset
  11. 1 1
      MultiScript/Resources/Scenes/TheScene.scene.asset
  12. 1 1
      MultiScript/Resources/Scripts.asset
  13. 1 1
      MultiScript/Resources/Scripts/main.js.asset
  14. 1 1
      MultiScript/Resources/Textures.asset
  15. 1 1
      MultiScript/Resources/Textures/chest.png.asset
  16. 1 1
      MultiScript/Resources/TypeScript.asset
  17. 1 1
      Roboman3DNew/Resources/Components.asset
  18. 1 1
      Roboman3DNew/Resources/Components/AvatarController.js
  19. 2 2
      Roboman3DNew/Resources/Components/AvatarController.js.asset
  20. 1 1
      Roboman3DNew/Resources/Components/RoboMan.js
  21. 2 2
      Roboman3DNew/Resources/Components/RoboMan.js.asset
  22. 1 1
      Roboman3DNew/Resources/Components/Water.js
  23. 2 2
      Roboman3DNew/Resources/Components/Water.js.asset
  24. 1 1
      Roboman3DNew/Resources/Models.asset
  25. 1 1
      Roboman3DNew/Resources/Models/Crate.fbx.asset
  26. 1 1
      Roboman3DNew/Resources/Models/Ground.fbx.asset
  27. 1 1
      Roboman3DNew/Resources/Models/Materials.asset
  28. 1 1
      Roboman3DNew/Resources/Models/Materials/Crate.Basic.material.asset
  29. 1 1
      Roboman3DNew/Resources/Models/Materials/DefaultMaterial.material.asset
  30. 1 1
      Roboman3DNew/Resources/Models/Materials/Pallet.material.asset
  31. 1 1
      Roboman3DNew/Resources/Models/Materials/Robot_01_mat.material.asset
  32. 1 1
      Roboman3DNew/Resources/Models/Pallet.fbx.asset
  33. 1 1
      Roboman3DNew/Resources/Models/Plane.blend.asset
  34. 1 1
      Roboman3DNew/Resources/Models/Robo_01.fbx.asset
  35. 1 1
      Roboman3DNew/Resources/Modules.asset
  36. 5 3
      Roboman3DNew/Resources/Modules/gl-matrix.js.asset
  37. 1 1
      Roboman3DNew/Resources/Prefabs.asset
  38. 1 1
      Roboman3DNew/Resources/Prefabs/Crate.prefab.asset
  39. 1 1
      Roboman3DNew/Resources/Prefabs/Pallet.prefab.asset
  40. 1 1
      Roboman3DNew/Resources/Prefabs/Robo_01.prefab.asset
  41. 1 1
      Roboman3DNew/Resources/Prefabs/Water.prefab.asset
  42. 1 1
      Roboman3DNew/Resources/Scenes.asset
  43. 1 1
      Roboman3DNew/Resources/Scenes/EmptyScene.scene.asset
  44. 1 1
      Roboman3DNew/Resources/Scenes/Test.scene.asset
  45. 1 1
      Roboman3DNew/Resources/Scripts.asset
  46. 5 3
      Roboman3DNew/Resources/Scripts/main.js.asset
  47. 1 1
      Roboman3DNew/Resources/Textures.asset
  48. 1 1
      Roboman3DNew/Resources/Textures/BlueGrid.png.asset
  49. 1 1
      Roboman3DNew/Resources/Textures/Crate-Bump.jpg.asset
  50. 1 1
      Roboman3DNew/Resources/Textures/Crate-Diffuse.jpg.asset
  51. 1 1
      Roboman3DNew/Resources/Textures/Crate-Normal.jpg.asset
  52. 1 1
      Roboman3DNew/Resources/Textures/Crate-Specular.jpg.asset
  53. 1 1
      Roboman3DNew/Resources/Textures/Pallet-Bump.jpg.asset
  54. 1 1
      Roboman3DNew/Resources/Textures/Pallet-Difuse.jpg.asset
  55. 1 1
      Roboman3DNew/Resources/Textures/Pallet-Normal.jpg.asset
  56. 1 1
      Roboman3DNew/Resources/Textures/Pallet-Specular.jpg.asset
  57. 1 1
      Roboman3DNew/Resources/Textures/Robot_01_Diffuse.png.asset

+ 1 - 1
MultiScript/Resources/Components.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "7f36439132474379a380efcdaa72fce1",
-	"timestamp": 1436820600,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Components/CoffeeSpinner.coffee

@@ -6,7 +6,7 @@ inspectorFields = {
 }
 
 class CoffeeSpinner extends Atomic.JSComponent
-  
+
   update:(timeStep) ->
     this.node.yaw(timeStep * 75 * this.speed)
 

+ 1 - 1
MultiScript/Resources/Components/InstantiatedSpinner.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "321f35ca69ac311f4b42aaa41a9e6438",
-	"timestamp": 1436821573,
+	"timestamp": 1436890665,
 	"JavascriptImporter": {
 		"IsComponentFile": false
 	}

+ 1 - 1
MultiScript/Resources/Components/ProtoSpinner.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "02fc18c12d8dac7f57d2ad559731d610",
-	"timestamp": 1436737402,
+	"timestamp": 1436890665,
 	"JavascriptImporter": {
 		"IsComponentFile": false
 	}

+ 1 - 1
MultiScript/Resources/Components/Spinner.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "06495d0f70cbdebc91113550acbfda49",
-	"timestamp": 1436737451,
+	"timestamp": 1436890665,
 	"JavascriptImporter": {
 		"IsComponentFile": false
 	}

+ 1 - 1
MultiScript/Resources/Models.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "2455f05ca34213df84302fd34086600a",
-	"timestamp": 1436725636,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Models/Chest.fbx.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "8646c0f492bf9bd8b34d8c27e67b7d3c",
-	"timestamp": 1350729011,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 0.01,
 		"importAnimations": false,

+ 1 - 1
MultiScript/Resources/Models/Materials.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "69f33ac142a5ef7d284c274274536526",
-	"timestamp": 1436725636,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Models/Materials/DefaultMaterial.material.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "4bbe945750a46d19c97246dbe0a9f68b",
-	"timestamp": 1436725628,
+	"timestamp": 1436890665,
 	"MaterialImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Scenes.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "7adf19467409e3c2c70da12ef96c9199",
-	"timestamp": 1436725695,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Scenes/TheScene.scene.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "c5c4f189efd61b5a9fae1d9a15775ea6",
-	"timestamp": 1436820651,
+	"timestamp": 1436890665,
 	"SceneImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Scripts.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "2c62ec70d098ab568c5817cc2f6cef24",
-	"timestamp": 1436725403,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Scripts/main.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "c8ef552a2cb24304739e8c048fdaa986",
-	"timestamp": 1436820690,
+	"timestamp": 1436890665,
 	"JavascriptImporter": {
 		"IsComponentFile": false
 	}

+ 1 - 1
MultiScript/Resources/Textures.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "f07fe552ccd956393028c378dff3e49e",
-	"timestamp": 1436725403,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
MultiScript/Resources/Textures/chest.png.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "57f1f04e5fb407a5293d2c0587d7d3fc",
-	"timestamp": 1423243327,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
MultiScript/Resources/TypeScript.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "56d0da4db9c66a839746e0e2300cbdd5",
-	"timestamp": 1436730044,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Components.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "cfa4a6ce6d3f1dc2b188471e5c110c30",
-	"timestamp": 1436647858,
+	"timestamp": 1436891165,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Components/AvatarController.js

@@ -5,7 +5,7 @@ var glmatrix = require("gl-matrix");
 var quat = glmatrix.quat;
 var vec3 = glmatrix.vec3;
 
-exports.component = function(self) {
+module.exports = function(self) {
 
   var game = Atomic.game;
   var node = self.node;

+ 2 - 2
Roboman3DNew/Resources/Components/AvatarController.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
-	"guid": "a9006ddacce13be89cb26c963f87e54b",
-	"timestamp": 1436646582,
+	"guid": "2e6873b92066707b72678a95c1e3d516",
+	"timestamp": 1436891398,
 	"JavascriptImporter": {
 		"IsComponentFile": true
 	}

+ 1 - 1
Roboman3DNew/Resources/Components/RoboMan.js

@@ -1,7 +1,7 @@
 // designate component
 "atomic component";
 
-exports.component = function(self) {
+module.exports = function(self) {
 
   var game = Atomic.game;
   var node = self.node;

+ 2 - 2
Roboman3DNew/Resources/Components/RoboMan.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
-	"guid": "4f710b9ab96b8d949bd051a8545c825a",
-	"timestamp": 1436646640,
+	"guid": "440791dfcea47d853282a4d18c03d7e2",
+	"timestamp": 1436891404,
 	"JavascriptImporter": {
 		"IsComponentFile": true
 	}

+ 1 - 1
Roboman3DNew/Resources/Components/Water.js

@@ -9,7 +9,7 @@ exports.fields = {
   myVector3Field: [ Atomic.VAR_VECTOR3, [1,2,3] ]
 }
 
-exports.component = function(self) {
+module.exports = function(self) {
 
   var game = Atomic.game;
   var node = self.node;

+ 2 - 2
Roboman3DNew/Resources/Components/Water.js.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
-	"guid": "d4da3db4accae76aac9c01e7e6174af6",
-	"timestamp": 1436666256,
+	"guid": "ade2d2eee893df6b25df33f9961145d3",
+	"timestamp": 1436891411,
 	"JavascriptImporter": {
 		"IsComponentFile": true
 	}

+ 1 - 1
Roboman3DNew/Resources/Models.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "348ac79570d9570be777b71a3b1b35a4",
-	"timestamp": 1436585400,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Crate.fbx.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "36ba46e851eaa3896f434f50d34cbda6",
-	"timestamp": 1435188439,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 1,
 		"importAnimations": false,

+ 1 - 1
Roboman3DNew/Resources/Models/Ground.fbx.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "15934bd919b214d7f7810775e5d852d3",
-	"timestamp": 1435266763,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 1,
 		"importAnimations": false,

+ 1 - 1
Roboman3DNew/Resources/Models/Materials.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "6624ccbe132ffe065388f0f017b88628",
-	"timestamp": 1436391181,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Materials/Crate.Basic.material.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "153f6788464b746c4e34407a27fc2696",
-	"timestamp": 1436391124,
+	"timestamp": 1436890665,
 	"MaterialImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Materials/DefaultMaterial.material.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "b5d7107a4d4aa450e70ca23d82c47141",
-	"timestamp": 1436586493,
+	"timestamp": 1436890665,
 	"MaterialImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Materials/Pallet.material.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "05ba50117cf320362b848bd9c648e2be",
-	"timestamp": 1436376127,
+	"timestamp": 1436890665,
 	"MaterialImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Materials/Robot_01_mat.material.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "75252c6d50e5b9694e30345c8aae1952",
-	"timestamp": 1436395079,
+	"timestamp": 1436890665,
 	"MaterialImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Models/Pallet.fbx.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "57fddae4d4352ac0b9c3036f28f9e62b",
-	"timestamp": 1435187661,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 4,
 		"importAnimations": false,

+ 1 - 1
Roboman3DNew/Resources/Models/Plane.blend.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "895f519a3a33e921a43471088cba958b",
-	"timestamp": 1436585400,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 1,
 		"importAnimations": false,

+ 1 - 1
Roboman3DNew/Resources/Models/Robo_01.fbx.asset

@@ -1,7 +1,7 @@
 {
 	"version": 1,
 	"guid": "e30fa79a0b75b75cbe5b03a73baa28a5",
-	"timestamp": 1421011930,
+	"timestamp": 1436890665,
 	"ModelImporter": {
 		"scale": 0.5,
 		"importAnimations": true,

+ 1 - 1
Roboman3DNew/Resources/Modules.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "2d68f589bf60bf7dd429f660f25ca57d",
-	"timestamp": 1436376093,
+	"timestamp": 1436891165,
 	"FolderImporter": {}
 }

+ 5 - 3
Roboman3DNew/Resources/Modules/gl-matrix.js.asset

@@ -1,6 +1,8 @@
 {
 	"version": 1,
-	"guid": "94c30c2d41da7ffd51dec8ba99455756",
-	"timestamp": 1423523004,
-	"JavascriptImporter": {}
+	"guid": "d7c4262c01593eea435bdf0cdecb5cbe",
+	"timestamp": 1436890665,
+	"JavascriptImporter": {
+		"IsComponentFile": false
+	}
 }

+ 1 - 1
Roboman3DNew/Resources/Prefabs.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "1795b1cc596f4b279f781c9461680c45",
-	"timestamp": 1436585839,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Prefabs/Crate.prefab.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "072bfd07fa9aa112119abb43bb133c47",
-	"timestamp": 1436570738,
+	"timestamp": 1436890665,
 	"PrefabImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Prefabs/Pallet.prefab.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "9e1083378dc59da1d98981cf2acf9f7c",
-	"timestamp": 1436496579,
+	"timestamp": 1436890665,
 	"PrefabImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Prefabs/Robo_01.prefab.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "fd7bc91efd0b91d949c35435539dcbc8",
-	"timestamp": 1436645979,
+	"timestamp": 1436890665,
 	"PrefabImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Prefabs/Water.prefab.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "59441bd8e6b45f7db38165c3cfca4255",
-	"timestamp": 1436586220,
+	"timestamp": 1436890665,
 	"PrefabImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Scenes.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "39542c62040785a46f37e07e6b6f99ce",
-	"timestamp": 1436647878,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Scenes/EmptyScene.scene.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "937d43f30dd15e2581bac7095b19f77d",
-	"timestamp": 1435078907,
+	"timestamp": 1436890665,
 	"SceneImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Scenes/Test.scene.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "627532ce83065783581852967b660c15",
-	"timestamp": 1436667161,
+	"timestamp": 1436890665,
 	"SceneImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Scripts.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "4d56b7fa12e72b41428c6e3f38124ea9",
-	"timestamp": 1436376093,
+	"timestamp": 1436891165,
 	"FolderImporter": {}
 }

+ 5 - 3
Roboman3DNew/Resources/Scripts/main.js.asset

@@ -1,6 +1,8 @@
 {
 	"version": 1,
-	"guid": "821cb3947ce7958118cd54636d4db154",
-	"timestamp": 1435275429,
-	"JavascriptImporter": {}
+	"guid": "32a79f4468a7351975f6a1fad7e85306",
+	"timestamp": 1436890665,
+	"JavascriptImporter": {
+		"IsComponentFile": false
+	}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "dcf414f72523abe9a89f2dd9685a42bd",
-	"timestamp": 1436376093,
+	"timestamp": 1436890665,
 	"FolderImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/BlueGrid.png.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "f23157495cd9f8b0a41bdbf4b780b353",
-	"timestamp": 1423242905,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Crate-Bump.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "31b7f68671b5580c0951abb15af193a9",
-	"timestamp": 1435276848,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Crate-Diffuse.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "e6126ed129fabe92c167289aba92c051",
-	"timestamp": 1435276843,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Crate-Normal.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "142e85dfba0ab7d971371dd25795627a",
-	"timestamp": 1435276838,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Crate-Specular.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "e4a719a307e46a878668edd4447e1e3c",
-	"timestamp": 1435276834,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Pallet-Bump.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "04d8b8652f43376a52054bc8b687b8c0",
-	"timestamp": 1435276829,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Pallet-Difuse.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "b9a3026da1599521f2dc742d9512fe99",
-	"timestamp": 1435276823,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Pallet-Normal.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "4c0c21f8c0a547acdf1c7d5abf222965",
-	"timestamp": 1435276818,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Pallet-Specular.jpg.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "f008b9a2156cf7c89dc0a8b804b1bd89",
-	"timestamp": 1435276811,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }

+ 1 - 1
Roboman3DNew/Resources/Textures/Robot_01_Diffuse.png.asset

@@ -1,6 +1,6 @@
 {
 	"version": 1,
 	"guid": "63abd2ae74f973dbccbe1da6fce2ad44",
-	"timestamp": 1435276805,
+	"timestamp": 1436890665,
 	"TextureImporter": {}
 }