diff --git a/unity_Project/Assets/0bjects/Custom Meshes/README_Custom_Meshes.txt b/unity_Project/Assets/0bjects/Custom Meshes/README_Custom_Meshes.txt index 115f95a..fbdef50 100644 --- a/unity_Project/Assets/0bjects/Custom Meshes/README_Custom_Meshes.txt +++ b/unity_Project/Assets/0bjects/Custom Meshes/README_Custom_Meshes.txt @@ -1,7 +1,7 @@ ====================================== PROJECT JUNKER ====================================== -TEXT FILE LAST UPDATE: 31.8.2015 +TEXT FILE LAST UPDATE: 1.9.2015 ========================================================================== @@ -14,6 +14,15 @@ TEXT FILE LAST UPDATE: 31.8.2015 > ***ONLY use a custom mesh WHERE NECESSARY. If an object will be used simplistically, an appropriate mesh should be assigned in Unity (e.g. Box Collider) +> Due to Unity 5's changes, any mesh with vertices greater than 256 will not work. + YOU MUST either reduce the number of vertices in a mesh OR cut the mesh into + several parts then parent those parts to empty childs in Unity. + + Refer to this YouTube link for more details: + https://www.youtube.com/watch?v=YJD05OFhyh8 + + + > All customn meshes must be exported as a .FBX file. > All custom meshes must be placed in the "Custom Meshes" folder. diff --git a/unity_Project/Assets/0bjects/obj_plane.fbx b/unity_Project/Assets/0bjects/obj_plane.fbx new file mode 100644 index 0000000..2583add Binary files /dev/null and b/unity_Project/Assets/0bjects/obj_plane.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_safety_pole.fbx.meta b/unity_Project/Assets/0bjects/obj_plane.fbx.meta similarity index 95% rename from unity_Project/Assets/0bjects/obj_safety_pole.fbx.meta rename to unity_Project/Assets/0bjects/obj_plane.fbx.meta index 4da9803..d093d0a 100644 --- a/unity_Project/Assets/0bjects/obj_safety_pole.fbx.meta +++ b/unity_Project/Assets/0bjects/obj_plane.fbx.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 48a934d2c30e08144a174d4996456324 -timeCreated: 1441017122 +guid: 71bbfce6fc4f9b44c86be51b760f1c79 +timeCreated: 1441098821 licenseType: Free ModelImporter: serializedVersion: 18 @@ -9,7 +9,7 @@ ModelImporter: 400000: //RootNode 2300000: //RootNode 3300000: //RootNode - 4300000: safety_pole + 4300000: pPlane1 9500000: //RootNode materials: importMaterials: 1 diff --git a/unity_Project/Assets/0bjects/obj_safety_pole.fbx b/unity_Project/Assets/0bjects/obj_safety_pole.fbx deleted file mode 100644 index 85c1646..0000000 Binary files a/unity_Project/Assets/0bjects/obj_safety_pole.fbx and /dev/null differ diff --git a/unity_Project/Assets/Materials/Purple.mat b/unity_Project/Assets/Materials/Purple.mat index b906491..93571cf 100644 Binary files a/unity_Project/Assets/Materials/Purple.mat and b/unity_Project/Assets/Materials/Purple.mat differ diff --git a/unity_Project/Assets/New Terrain.asset b/unity_Project/Assets/New Terrain.asset index afdd46f..f2029bf 100644 Binary files a/unity_Project/Assets/New Terrain.asset and b/unity_Project/Assets/New Terrain.asset differ diff --git a/unity_Project/Assets/New Terrain.asset.meta b/unity_Project/Assets/New Terrain.asset.meta index 841cef5..920410e 100644 --- a/unity_Project/Assets/New Terrain.asset.meta +++ b/unity_Project/Assets/New Terrain.asset.meta @@ -1,4 +1,8 @@ fileFormatVersion: 2 -guid: c6bf657a72549514fab031161e1a9a79 +guid: 0e86491923d2ac94d844002afdffc9ef +timeCreated: 1441096244 +licenseType: Free NativeFormatImporter: userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index ecaa974..4c5a0d0 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/Assets/prefabs/Cargo Box Closed.prefab b/unity_Project/Assets/prefabs/Cargo Box Closed.prefab index fc146f6..c2d2aca 100644 Binary files a/unity_Project/Assets/prefabs/Cargo Box Closed.prefab and b/unity_Project/Assets/prefabs/Cargo Box Closed.prefab differ diff --git a/unity_Project/Assets/prefabs/pipe_large1.prefab b/unity_Project/Assets/prefabs/Metal Beam.prefab similarity index 70% rename from unity_Project/Assets/prefabs/pipe_large1.prefab rename to unity_Project/Assets/prefabs/Metal Beam.prefab index 1be4273..f0115b5 100644 Binary files a/unity_Project/Assets/prefabs/pipe_large1.prefab and b/unity_Project/Assets/prefabs/Metal Beam.prefab differ diff --git a/unity_Project/Assets/prefabs/pipe_large1.prefab.meta b/unity_Project/Assets/prefabs/Metal Beam.prefab.meta similarity index 65% rename from unity_Project/Assets/prefabs/pipe_large1.prefab.meta rename to unity_Project/Assets/prefabs/Metal Beam.prefab.meta index 609ff77..9a7d879 100644 --- a/unity_Project/Assets/prefabs/pipe_large1.prefab.meta +++ b/unity_Project/Assets/prefabs/Metal Beam.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: c30e3469a139fe646bc1651149e4c505 -timeCreated: 1440745563 +guid: 52cc833fd217ada42b704f8e33d854d2 +timeCreated: 1441112142 licenseType: Free NativeFormatImporter: userData: diff --git a/unity_Project/Assets/prefabs/Metal Frame.prefab b/unity_Project/Assets/prefabs/Metal Frame.prefab new file mode 100644 index 0000000..de6b468 Binary files /dev/null and b/unity_Project/Assets/prefabs/Metal Frame.prefab differ diff --git a/unity_Project/Assets/prefabs/Metal Frame.prefab.meta b/unity_Project/Assets/prefabs/Metal Frame.prefab.meta new file mode 100644 index 0000000..8d21f43 --- /dev/null +++ b/unity_Project/Assets/prefabs/Metal Frame.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50d9b89528e7b634c9b20c0e10d6e6ca +timeCreated: 1441113015 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/prefabs/Mine Cart.prefab b/unity_Project/Assets/prefabs/Mine Cart.prefab new file mode 100644 index 0000000..12d227c Binary files /dev/null and b/unity_Project/Assets/prefabs/Mine Cart.prefab differ diff --git a/unity_Project/Assets/prefabs/Mine Cart.prefab.meta b/unity_Project/Assets/prefabs/Mine Cart.prefab.meta new file mode 100644 index 0000000..060908c --- /dev/null +++ b/unity_Project/Assets/prefabs/Mine Cart.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92b356a9de8a8db48b50a26e75dc05e5 +timeCreated: 1441111291 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/prefabs/Pipe Small.prefab b/unity_Project/Assets/prefabs/Pipe Small.prefab new file mode 100644 index 0000000..fa7f7b3 Binary files /dev/null and b/unity_Project/Assets/prefabs/Pipe Small.prefab differ diff --git a/unity_Project/Assets/prefabs/Pipe Small.prefab.meta b/unity_Project/Assets/prefabs/Pipe Small.prefab.meta new file mode 100644 index 0000000..b7765d6 --- /dev/null +++ b/unity_Project/Assets/prefabs/Pipe Small.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 46050cab6b8604640b245b196cd8bd30 +timeCreated: 1441112405 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab b/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab new file mode 100644 index 0000000..c3a2d7d Binary files /dev/null and b/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab differ diff --git a/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab.meta b/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab.meta new file mode 100644 index 0000000..5918f18 --- /dev/null +++ b/unity_Project/Assets/prefabs/Resource Bay Moveable.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 201ce5fba885d7a4980e44e4d94517f2 +timeCreated: 1441098927 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/prefabs/Scaffold Stack.prefab b/unity_Project/Assets/prefabs/Scaffold Stack.prefab index 4444672..743c7d1 100644 Binary files a/unity_Project/Assets/prefabs/Scaffold Stack.prefab and b/unity_Project/Assets/prefabs/Scaffold Stack.prefab differ diff --git a/unity_Project/Assets/prefabs/Silo.prefab b/unity_Project/Assets/prefabs/Silo.prefab index 9ab92a1..75d5c23 100644 Binary files a/unity_Project/Assets/prefabs/Silo.prefab and b/unity_Project/Assets/prefabs/Silo.prefab differ diff --git a/unity_Project/Assets/prefabs/Small Crate.prefab b/unity_Project/Assets/prefabs/Small Crate.prefab new file mode 100644 index 0000000..3946f69 Binary files /dev/null and b/unity_Project/Assets/prefabs/Small Crate.prefab differ diff --git a/unity_Project/Assets/prefabs/Small Crate.prefab.meta b/unity_Project/Assets/prefabs/Small Crate.prefab.meta new file mode 100644 index 0000000..af8ec1a --- /dev/null +++ b/unity_Project/Assets/prefabs/Small Crate.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4b88fa9318b093e48a442984f3c8c635 +timeCreated: 1441103161 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/prefabs/scaffold.prefab b/unity_Project/Assets/prefabs/scaffold.prefab index e55bc46..0946005 100644 Binary files a/unity_Project/Assets/prefabs/scaffold.prefab and b/unity_Project/Assets/prefabs/scaffold.prefab differ