curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-14 04:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'newworldgen'

Browse Source 
# Conflicts:
#	.idea/workspace.xml
#	src/net/torvald/terrarum/gameactors/Actor.kt


Former-commit-id: 533aeed3cd26565478a3b8c602c9e9aa7e15b43f
Former-commit-id: e7e851ed9734b47cc05144df1c6187ea50f7ecab
This commit is contained in:
Song Minjae
2017-01-31 01:05:38 +09:00
parent 361f322d78 abad2eb1a6
commit 2f7eaea6b8
15 changed files with 512 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/net/torvald/terrarum/Terrarum.kt
View File

@@ -133,6 +133,7 @@ constructor(gamename: String) : StateBasedGame(gamename) {
//addState(StateNoiseTexGen())
//addState(StateBlurTest())
//addState(StateShaderTest())
//addState(StateNoiseTester())
ingame = StateInGame()
addState(ingame)