diff --git a/src/InstanceManager.hx b/src/InstanceManager.hx index c8c15934..cd2d9b11 100644 --- a/src/InstanceManager.hx +++ b/src/InstanceManager.hx @@ -60,7 +60,7 @@ class InstanceManager { dtsShader.currentOpacity = instance.gameObject.currentOpacity; } var transform = instance.emptyObj.getAbsPos(); - minfo.meshbatch.shadersChanged = true; + // minfo.meshbatch.shadersChanged = true; minfo.meshbatch.material.mainPass.setPassName(minfo.mesh.material.mainPass.name); minfo.meshbatch.material.mainPass.enableLights = minfo.mesh.material.mainPass.enableLights; minfo.meshbatch.setTransform(transform); @@ -78,7 +78,7 @@ class InstanceManager { minfo.transparencymeshbatch.material.blendMode = Alpha; // minfo.transparencymeshbatch.material.color.a = instance.gameObject.currentOpacity; // minfo.transparencymeshbatch.material.mainPass.setPassName(minfo.mesh.material.mainPass.name); - minfo.transparencymeshbatch.shadersChanged = true; + // minfo.transparencymeshbatch.shadersChanged = true; minfo.transparencymeshbatch.material.mainPass.enableLights = minfo.mesh.material.mainPass.enableLights; // minfo.transparencymeshbatch.material.mainPass.depthWrite = false; // if (dtsShader != null) { diff --git a/src/Marble.hx b/src/Marble.hx index 0473dd50..515e526d 100644 --- a/src/Marble.hx +++ b/src/Marble.hx @@ -712,7 +712,7 @@ class Marble extends GameObject { if (rollVolume > 1) rollVolume = 1; if (contactPct < 0.05) - rollVolume = 0; + rollVolume = rollSound.volume / 5; var slipVolume = 0.0; if (slipAmount > 1e-4) { diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index b42bb35b..f6a08a2e 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -468,23 +468,23 @@ class MarbleWorld extends Scheduler { public function updateGameState() { if (this.outOfBounds) return; // We will update state manually - if (this.timeState.currentAttemptTime < 0.5) { + if (this.timeState.currentAttemptTime < 0.5 && this.finishTime == null) { this.playGui.setCenterText('none'); this.marble.mode = Start; } - if ((this.timeState.currentAttemptTime >= 0.5) && (this.timeState.currentAttemptTime < 2)) { + if ((this.timeState.currentAttemptTime >= 0.5) && (this.timeState.currentAttemptTime < 2) && this.finishTime == null) { this.playGui.setCenterText('ready'); this.marble.mode = Start; } - if ((this.timeState.currentAttemptTime >= 2) && (this.timeState.currentAttemptTime < 3.5)) { + if ((this.timeState.currentAttemptTime >= 2) && (this.timeState.currentAttemptTime < 3.5) && this.finishTime == null) { this.playGui.setCenterText('set'); this.marble.mode = Start; } - if ((this.timeState.currentAttemptTime >= 3.5) && (this.timeState.currentAttemptTime < 5.5)) { + if ((this.timeState.currentAttemptTime >= 3.5) && (this.timeState.currentAttemptTime < 5.5) && this.finishTime == null) { this.playGui.setCenterText('go'); this.marble.mode = Play; } - if (this.timeState.currentAttemptTime >= 5.5) { + if (this.timeState.currentAttemptTime >= 5.5 && this.finishTime == null) { this.playGui.setCenterText('none'); this.marble.mode = Play; } diff --git a/src/gui/MainMenuGui.hx b/src/gui/MainMenuGui.hx index 63b2e200..fcf7d02b 100644 --- a/src/gui/MainMenuGui.hx +++ b/src/gui/MainMenuGui.hx @@ -27,7 +27,7 @@ class MainMenuGui extends GuiImage { versionText.vertSizing = Top; versionText.position = new Vector(289, 450); versionText.extent = new Vector(62, 18); - versionText.text.text = "1.1.9"; + versionText.text.text = "1.1.10"; versionText.text.textColor = 0; this.addChild(versionText);