Merge branch 'master' of https://github.com/wheerd/GGJ2018

wheerd · Jan 29, 2018 · 27dc667 · 27dc667
2 parents 92bdd15 + 13d68a5
commit 27dc667
Show file tree

Hide file tree

Showing 49 changed files with 8,462 additions and 2,259 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,3 +34,6 @@ sysinfo.txt
 # Builds
 *.apk
 *.unitypackage
+/blockchain_Data
+/blockchain.exe
+/UnityPlayer.dll
diff --git a/Assets/Game/Audio/Music/BeepBox-Song.wav b/Assets/Game/Audio/Music/BeepBox-Song.wav
diff --git a/Assets/Game/Audio/Music/BeepBox-Song.wav.meta b/Assets/Game/Audio/Music/BeepBox-Song.wav.meta
diff --git a/Assets/Game/Audio/Sounds/ButtonClick-backup1.wav b/Assets/Game/Audio/Sounds/ButtonClick-backup1.wav
diff --git a/Assets/Game/Audio/Sounds/ButtonClick-backup1.wav.meta b/Assets/Game/Audio/Sounds/ButtonClick-backup1.wav.meta
diff --git a/Assets/Game/Audio/Sounds/ButtonClick.wav b/Assets/Game/Audio/Sounds/ButtonClick.wav
diff --git a/Assets/Game/Graphics/logo.png b/Assets/Game/Graphics/logo.png
diff --git a/Assets/Game/Graphics/logo.png.meta b/Assets/Game/Graphics/logo.png.meta