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
  • Loading branch information
lan11001 committed Oct 9, 2013
2 parents 6fd4a83 + d093d85 commit 062d4e8
Show file tree
Hide file tree
Showing 185 changed files with 9,010 additions and 4,853 deletions.
Expand Up @@ -16,7 +16,7 @@ Material:
first:
name: _MainTex
second:
m_Texture: {fileID: 2800000, guid: 6e65e0c6ddfa9264aad17bb34c94d4e8, type: 3}
m_Texture: {fileID: 2800000, guid: b5832cfc1a28bad49a6a4c51b776563e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: {}
Expand Down
5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Music.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
12 changes: 12 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Game Over Music.ogg.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
12 changes: 12 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Main Menu.ogg.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Music.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Music/Music.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
12 changes: 12 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Music/Music/Victory.wav.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Music/OGG Music.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Guardian of Silverkeep/Assets/Music/Music/OGG Sound FX.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

0 comments on commit 062d4e8

Please sign in to comment.