Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of git@github.uconn.edu:GameDev/Silverkeep.git 
Conflicts:
	Guardian of Silverkeep/Assets/Prefab Flipped/water_baddie_front.prefab
	Guardian of Silverkeep/Assets/Scene/LVL1.unity
  • Loading branch information
@lan11001
lan11001 committed Oct 8, 2013
2 parents 396e76c + e2cefa8 commit 0e6375e
Show file tree
Hide file tree
Showing 49 changed files with 2,557 additions and 2,074 deletions.
Binary file modified Guardian of Silverkeep/Assets/New Terrain 1.asset
View file
Binary file not shown.
Binary file modified Guardian of Silverkeep/Assets/New Terrain.asset
View file
Binary file not shown.
42 changes: 0 additions & 42 deletions Guardian of Silverkeep/Assets/Prefab Flipped/baddie_back.prefab
View file
Expand Up @@ -9,7 +9,6 @@ GameObject:
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
m_Layer: 0
m_Name: hand
Expand Down Expand Up @@ -43,7 +42,6 @@ GameObject:
m_Component:
- 4: {fileID: 400004}
- 33: {fileID: 3300002}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
- 111: {fileID: 11100002}
m_Layer: 0
Expand All @@ -62,7 +60,6 @@ GameObject:
m_Component:
- 4: {fileID: 400006}
- 33: {fileID: 3300004}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: body
Expand Down Expand Up @@ -193,45 +190,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400000
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!111 &11100000
Animation:
m_ObjectHideFlags: 1
Expand Down
42 changes: 0 additions & 42 deletions Guardian of Silverkeep/Assets/Prefab Flipped/baddie_front.prefab
View file
Expand Up @@ -63,7 +63,6 @@ GameObject:
m_Component:
- 4: {fileID: 400012}
- 33: {fileID: 3300010}
- 64: {fileID: 6400010}
- 23: {fileID: 2300010}
m_Layer: 0
m_Name: hand
Expand All @@ -81,7 +80,6 @@ GameObject:
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300002}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
- 111: {fileID: 11100000}
m_Layer: 0
Expand All @@ -100,7 +98,6 @@ GameObject:
m_Component:
- 4: {fileID: 400010}
- 33: {fileID: 3300008}
- 64: {fileID: 6400008}
- 23: {fileID: 2300008}
m_Layer: 0
m_Name: body
Expand Down Expand Up @@ -371,19 +368,6 @@ MeshCollider:
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
Expand All @@ -410,32 +394,6 @@ MeshCollider:
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400008
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100010}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400010
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!111 &11100000
Animation:
m_ObjectHideFlags: 1
Expand Down
42 changes: 0 additions & 42 deletions Guardian of Silverkeep/Assets/Prefab Flipped/baddie_left.prefab
View file
Expand Up @@ -25,7 +25,6 @@ GameObject:
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300000}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
m_Layer: 0
m_Name: tail
Expand Down Expand Up @@ -61,7 +60,6 @@ GameObject:
m_Component:
- 4: {fileID: 400006}
- 33: {fileID: 3300004}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: hand
Expand All @@ -79,7 +77,6 @@ GameObject:
m_Component:
- 4: {fileID: 400008}
- 33: {fileID: 3300006}
- 64: {fileID: 6400006}
- 23: {fileID: 2300006}
m_Layer: 0
m_Name: body
Expand Down Expand Up @@ -247,19 +244,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400000
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
Expand All @@ -273,32 +257,6 @@ MeshCollider:
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400006
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100008}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!111 &11100000
Animation:
m_ObjectHideFlags: 1
Expand Down
42 changes: 0 additions & 42 deletions Guardian of Silverkeep/Assets/Prefab Flipped/baddie_right.prefab
View file
Expand Up @@ -9,7 +9,6 @@ GameObject:
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 64: {fileID: 6400000}
- 23: {fileID: 2300000}
m_Layer: 0
m_Name: body
Expand All @@ -27,7 +26,6 @@ GameObject:
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300002}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
m_Layer: 0
m_Name: hand
Expand All @@ -45,7 +43,6 @@ GameObject:
m_Component:
- 4: {fileID: 400004}
- 33: {fileID: 3300004}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: tail
Expand Down Expand Up @@ -247,45 +244,6 @@ MeshFilter:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400000
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400006
MeshCollider:
m_ObjectHideFlags: 1
Expand Down
42 changes: 0 additions & 42 deletions Guardian of Silverkeep/Assets/Prefab Flipped/flower_baddie_back - number 2.prefab
View file
Expand Up @@ -27,7 +27,6 @@ GameObject:
m_Component:
- 4: {fileID: 400002}
- 33: {fileID: 3300002}
- 64: {fileID: 6400002}
- 23: {fileID: 2300002}
m_Layer: 0
m_Name: stem
Expand All @@ -45,7 +44,6 @@ GameObject:
m_Component:
- 4: {fileID: 400004}
- 33: {fileID: 3300004}
- 64: {fileID: 6400004}
- 23: {fileID: 2300004}
m_Layer: 0
m_Name: head
Expand All @@ -63,7 +61,6 @@ GameObject:
m_Component:
- 4: {fileID: 400006}
- 33: {fileID: 3300006}
- 64: {fileID: 6400006}
- 23: {fileID: 2300006}
m_Layer: 0
m_Name: leaf
Expand Down Expand Up @@ -315,45 +312,6 @@ MeshCollider:
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400002
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100002}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400004
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100004}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400006
MeshCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100006}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_SmoothSphereCollisions: 0
m_Convex: 0
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!64 &6400008
MeshCollider:
m_ObjectHideFlags: 1
Expand Down

0 comments on commit 0e6375e

Please sign in to comment.