Browse code Merge remote-tracking branch 'origin/master' # Conflicts: # src/com/persesgames/shooter/Shooter.kt master
commit 851a9f9ad828ca8a4d1c10f57a731477b8559538 2 parents 99f664e + 895d3f3 rnentjes authored on 22 Jul 2016

Showing 12 changed files

• lib/kotludens/com/persesgames/game/Game.kt
• lib/kotludens/com/persesgames/game/Screen.kt
• lib/kotludens/com/persesgames/game/View.kt
• lib/kotludens/com/persesgames/sound/Music.kt
• lib/kotludens/com/persesgames/text/Texts.kt
• lib/kotludens/com/persesgames/texture/Textures.kt
• src/com/persesgames/shooter/Shooter.kt
• web/images/data-0.json
• web/images/data-0.png
• web/images/data-1.json
• web/images/data-1.png
• web/index.html

Ignore Space Show notes View lib/kotludens/com/persesgames/game/Game.kt

Ignore Space Show notes View lib/kotludens/com/persesgames/game/Screen.kt

Ignore Space Show notes View lib/kotludens/com/persesgames/game/View.kt 0 → 100644

Ignore Space Show notes View lib/kotludens/com/persesgames/sound/Music.kt

Ignore Space Show notes View lib/kotludens/com/persesgames/text/Texts.kt

Ignore Space Show notes View lib/kotludens/com/persesgames/texture/Textures.kt

Ignore Space Show notes View src/com/persesgames/shooter/Shooter.kt

Ignore Space Show notes View web/images/data-0.json 0 → 100644

Ignore Space Show notes View web/images/data-0.png 0 → 100644

Ignore Space Show notes View web/images/data-1.json 0 → 100644

Ignore Space Show notes View web/images/data-1.png 0 → 100644

Ignore Space Show notes View web/index.html

Show line notes below