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
fileFormatVersion: 2
guid: 0eebffc0dc32f4f3f95ac6c0a517e93d
guid: 87c7101504d524951ab5d91535a916bc
AudioImporter:
externalObjects: {}
serializedVersion: 6
......
Tarantella 8.0
left 1.5
right 2.35
down 2.5
up 2.7
up 5
down 5.45
up 5.8
left 6.1
right 6.6
down 7.45
up 8.7
up 9.9
down 10.35
left 10.58
right 10.84
up 11.05
down 11.38
up 11.7
left 12.3
right 12.6
down 13.5
up 14.58
left 15.0
right 15.25
up 15.4
left 15.6
up 15.8
down 16
\ No newline at end of file
left 1
left 1.5
left 2
left 2.5
left 3
left 3.5
\ No newline at end of file
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