Commit a4b45621 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster into mimemime

* 'mimemime' of https://altitude.otago.ac.nz/gstuitje/ringmaster:
  started work on the tarantella for mime mime.

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
#	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-shm
#	RingMaster/RingMaster/.vs/RingMaster/xs/sqlite3/storage.ide-wal
#	RingMaster/RingMaster/Assets/Sounds/Bushwick Tarantella (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/DarxieLand (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fig Leaf Times Two.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Fluffing a Duck.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Gaslamp Funworks (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Hyperfun (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Hyperfun.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Manic Polka (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Manic Polka.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Meatball Parade (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/No Spam Polka (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/Wagon Wheel (muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/daytime-background.mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/dvorak-polka-by-kevin-macleod(muffled).mp3.meta
#	RingMaster/RingMaster/Assets/Sounds/glee-club-polka-by-kevin-macleod (muffled).mp3.meta
parents c0a428eb 0ac5e321
<Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|"> <Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" /> <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/MimeScripts/SongSelect.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/MimeScripts/SpawnKeys.cs">
<Files> <Files>
<File FileName="Assets/Scripts/DaytimeScripts/DaytimeManager.cs" Line="1" Column="1" /> <File FileName="Assets/Scripts/DaytimeScripts/DaytimeManager.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/MimeScripts/SongSelect.cs" Line="10" Column="1" /> <File FileName="Assets/Scripts/MimeScripts/SpawnKeys.cs" Line="153" Column="18" />
</Files> </Files>
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: b4a392ef8715749d8b2969e99d69b947 guid: 9d2e27556df364a7da1e1c9fa7e00598
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
......
...@@ -7862,7 +7862,7 @@ Prefab: ...@@ -7862,7 +7862,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1602431506710890, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2} - target: {fileID: 1602431506710890, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2} m_SourcePrefab: {fileID: 100100000, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
......
...@@ -156,7 +156,7 @@ MonoBehaviour: ...@@ -156,7 +156,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
ComputerCheck: 0 ComputerCheck: 0
songFile: {fileID: 4900000, guid: 2009ec12e81114ee1acd4caadc2602c4, type: 3} songFile: {fileID: 4900000, guid: 2947ed3ae503f4710a5dfdd89633a90c, type: 3}
arrowPrefab: {fileID: 1765769401102260, guid: 72656df34da634e679741c24832b3f36, arrowPrefab: {fileID: 1765769401102260, guid: 72656df34da634e679741c24832b3f36,
type: 2} type: 2}
skip: 0 skip: 0
...@@ -318,7 +318,7 @@ Transform: ...@@ -318,7 +318,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &300922560 --- !u!1 &300922560
GameObject: GameObject:
...@@ -350,7 +350,7 @@ Transform: ...@@ -350,7 +350,7 @@ Transform:
- {fileID: 1026491903} - {fileID: 1026491903}
- {fileID: 1124755066} - {fileID: 1124755066}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &333498655 --- !u!1 &333498655
GameObject: GameObject:
...@@ -537,7 +537,7 @@ Transform: ...@@ -537,7 +537,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &427026051 --- !u!1 &427026051
GameObject: GameObject:
...@@ -887,7 +887,7 @@ Transform: ...@@ -887,7 +887,7 @@ Transform:
- {fileID: 1746446292} - {fileID: 1746446292}
- {fileID: 1795598301} - {fileID: 1795598301}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1025113158 --- !u!1 &1025113158
GameObject: GameObject:
...@@ -917,7 +917,7 @@ Transform: ...@@ -917,7 +917,7 @@ Transform:
- {fileID: 442090784} - {fileID: 442090784}
- {fileID: 1758523279} - {fileID: 1758523279}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 12 m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1026491902 --- !u!1 &1026491902
GameObject: GameObject:
...@@ -1217,7 +1217,7 @@ Transform: ...@@ -1217,7 +1217,7 @@ Transform:
m_LocalScale: {x: 2, y: 2, z: 1} m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10 m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1270994738 --- !u!1 &1270994738
GameObject: GameObject:
...@@ -1294,48 +1294,6 @@ CanvasRenderer: ...@@ -1294,48 +1294,6 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1270994738} m_GameObject: {fileID: 1270994738}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1001 &1337961999
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalPosition.y
value: -3.81
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4145066122545122, guid: 72656df34da634e679741c24832b3f36, type: 2}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72656df34da634e679741c24832b3f36, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1404625501 --- !u!1 &1404625501
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1484,7 +1442,7 @@ Transform: ...@@ -1484,7 +1442,7 @@ Transform:
m_LocalScale: {x: 3, y: 20, z: 1} m_LocalScale: {x: 3, y: 20, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9 m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1479546193 stripped --- !u!4 &1479546193 stripped
Transform: Transform:
...@@ -1578,7 +1536,7 @@ RectTransform: ...@@ -1578,7 +1536,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 333498656} - {fileID: 333498656}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
...@@ -1627,7 +1585,7 @@ Prefab: ...@@ -1627,7 +1585,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4682724213509072, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2} - target: {fileID: 4682724213509072, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 7
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2} m_SourcePrefab: {fileID: 100100000, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
...@@ -1909,7 +1867,7 @@ Transform: ...@@ -1909,7 +1867,7 @@ Transform:
- {fileID: 1479546193} - {fileID: 1479546193}
- {fileID: 858685293} - {fileID: 858685293}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 11 m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1828139994 --- !u!1 &1828139994
GameObject: GameObject:
......
...@@ -149,4 +149,12 @@ public class SpawnKeys : MonoBehaviour { ...@@ -149,4 +149,12 @@ public class SpawnKeys : MonoBehaviour {
} }
} }
} }
public void Bavaria(){
}
public void Tarantell(){
}
} }
fileFormatVersion: 2
guid: 2e11b3b925193474a9e7db18e26466fe
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2 fileFormatVersion: 2
guid: 949cab2b835c04abe91819c4edc81c96 guid: 0bb8a9baae64949078b0d70a928a5848
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: f2518afe8017047b895d461dd5be860e guid: 289d382b3061449ed9d1c4925bcd7231
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5472610f1c8ed4ee5a59c60d0dca0c49 guid: 90bbf4b31a8b542319052bd25ef43a18
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 411152068f0b04bf891a17c30855259a guid: 9f85b855fec294d9489c92132811566c
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6
......
fileFormatVersion: 2
guid: 9c2c823620ba54775b6beab28f5ff156
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment