RMIT
/
Major_Project_B
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge

Josh_Dev_branch
JoshuaReason 5 years ago
parent
e8706ef10f
commit
2dbe16bb4d
5 changed files with 23 additions and 93 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -25
      Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta
  2. +6
    -25
      Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta
  3. +5
    -21
      Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta
  4. +5
    -21
      Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta
  5. +1
    -1
      Assets/Scripts/Logic/Blocks/Move.cs

+ 6
- 25
Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta View File

@ -1,11 +1,7 @@
fileFormatVersion: 2
guid: 8f059788f09129548819124918076d2e
ModelImporter:
<<<<<<< HEAD
serializedVersion: 23
=======
serializedVersion: 22
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@ -13,6 +9,7 @@ ModelImporter:
2300000: //RootNode
3300000: //RootNode
4300000: ForestCubeLight
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
@ -44,16 +41,10 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
<<<<<<< HEAD
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
=======
globalScale: 1
meshCompression: 0
addColliders: 0
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
useSRGBMaterialColor: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@ -71,22 +62,16 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
previousCalculatedGlobalScale: 0.01
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@ -101,15 +86,11 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
<<<<<<< HEAD
=======
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:

+ 6
- 25
Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta View File

@ -1,11 +1,7 @@
fileFormatVersion: 2
guid: 481b9e0107aab3041b49f72c38151e69
ModelImporter:
<<<<<<< HEAD
serializedVersion: 23
=======
serializedVersion: 22
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@ -13,6 +9,7 @@ ModelImporter:
2300000: //RootNode
3300000: //RootNode
4300000: ForestCubeDark
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
@ -44,16 +41,10 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
<<<<<<< HEAD
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
=======
globalScale: 1
meshCompression: 0
addColliders: 0
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
useSRGBMaterialColor: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@ -71,22 +62,16 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
previousCalculatedGlobalScale: 0.01
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@ -101,15 +86,11 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
<<<<<<< HEAD
=======
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:

+ 5
- 21
Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta View File

@ -1,11 +1,7 @@
fileFormatVersion: 2
guid: f9fc7ec022f09a6418b1b6f97f0c887b
ModelImporter:
<<<<<<< HEAD
serializedVersion: 23
=======
serializedVersion: 22
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@ -13,6 +9,7 @@ ModelImporter:
2300000: //RootNode
3300000: //RootNode
4300000: ForestGround01
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
@ -47,10 +44,7 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@ -68,22 +62,16 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
previousCalculatedGlobalScale: 0.01
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@ -98,15 +86,11 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
<<<<<<< HEAD
=======
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:

+ 5
- 21
Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta View File

@ -1,11 +1,7 @@
fileFormatVersion: 2
guid: caca2dfcd7da619408439605ff0667a4
ModelImporter:
<<<<<<< HEAD
serializedVersion: 23
=======
serializedVersion: 22
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@ -13,6 +9,7 @@ ModelImporter:
2300000: //RootNode
3300000: //RootNode
4300000: ForestGround02
9500000: //RootNode
externalObjects: {}
materials:
importMaterials: 1
@ -47,10 +44,7 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
<<<<<<< HEAD
useSRGBMaterialColor: 1
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@ -68,22 +62,16 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
previousCalculatedGlobalScale: 0.01
hasPreviousCalculatedGlobalScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
=======
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@ -98,15 +86,11 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
<<<<<<< HEAD
=======
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
animationType: 2
humanoidOversampling: 1
additionalBone: 0
userData:

+ 1
- 1
Assets/Scripts/Logic/Blocks/Move.cs View File

@ -20,7 +20,7 @@ public class Move : LogicBlock
/// <param name="player">Player to move</param>
protected override void BlockLogic(Character player, float animationTime)
{
player.Move(direction);
player.Move(direction, animationTime);
}
#endregion Class Functions

Write Preview
Loading…
Cancel
Save