diff --git a/core/src/main/kotlin/io/github/chrislo27/rhre3/RHRE3.kt b/core/src/main/kotlin/io/github/chrislo27/rhre3/RHRE3.kt index 51d7843c7..8e3c6fd97 100644 --- a/core/src/main/kotlin/io/github/chrislo27/rhre3/RHRE3.kt +++ b/core/src/main/kotlin/io/github/chrislo27/rhre3/RHRE3.kt @@ -8,7 +8,7 @@ import io.github.chrislo27.toolboks.version.Version object RHRE3 { const val TITLE = "Rhythm Heaven Remix Editor 3" - val VERSION: Version = Version(3, 2, 0, "RC1_20170915") + val VERSION: Version = Version(3, 2, 0, "RC2_20170916") const val WIDTH = 1280 const val HEIGHT = 720 val DEFAULT_SIZE = WIDTH to HEIGHT @@ -27,7 +27,7 @@ object RHRE3 { const val DATABASE_URL: String = "https://github.com/chrislo27/RHRE-database.git" const val DEV_DATABASE_BRANCH: String = "dev" const val MASTER_DATABASE_BRANCH: String = "master" - const val DATABASE_BRANCH: String = "shake" + const val DATABASE_BRANCH: String = DEV_DATABASE_BRANCH const val DATABASE_CURRENT_VERSION: String = "https://raw.githubusercontent.com/chrislo27/RHRE-database/$DATABASE_BRANCH/current.json" const val DATABASE_RELEASES = "https://github.com/chrislo27/RHRE-database/releases" const val RELEASE_API_URL = "https://api.github.com/repos/chrislo27/RhythmHeavenRemixEditor/releases/latest" diff --git a/core/src/main/kotlin/io/github/chrislo27/rhre3/editor/Editor.kt b/core/src/main/kotlin/io/github/chrislo27/rhre3/editor/Editor.kt index f8e6d9c0b..307159e7f 100644 --- a/core/src/main/kotlin/io/github/chrislo27/rhre3/editor/Editor.kt +++ b/core/src/main/kotlin/io/github/chrislo27/rhre3/editor/Editor.kt @@ -260,13 +260,16 @@ class Editor(val main: RHRE3Application, stageCamera: OrthographicCamera) camera.zoom = MathUtils.lerp(camera.zoom, if (ViewType.GAME_BOUNDARIES in views) 1.5f else 1f, Gdx.graphics.deltaTime * 6.5f) if (remix.playState == PlayState.PLAYING && remix.currentShakeEntities.isNotEmpty()) { - val shakeValue = remix.currentShakeEntities.fold(1f) { acc, it -> acc * ShakeEntity.getShakeIntensity(it.semitone)} + val shakeValue = remix.currentShakeEntities.fold(1f) { acc, it -> + acc * ShakeEntity.getShakeIntensity(it.semitone) + } val intensity = 0.125f val oldX = camera.position.x val oldY = camera.position.y camera.position.y += intensity * MathUtils.randomSign() * MathUtils.random(shakeValue) - camera.position.x += intensity * MathUtils.randomSign() * MathUtils.random(shakeValue) * (ENTITY_HEIGHT / ENTITY_WIDTH) + camera.position.x += intensity * MathUtils.randomSign() * MathUtils.random( + shakeValue) * (ENTITY_HEIGHT / ENTITY_WIDTH) camera.update()