thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-04-26 12:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

do all the backport fixes

Browse source
This commit is contained in:
RandomityGuy 2023-07-21 21:03:16 +05:30
parent d10ef86dcf
commit 035a62dfc8
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/InstanceManager.hx
View file

@ -60,7 +60,7 @@ class InstanceManager {
dtsShader.currentOpacity = instance.gameObject.currentOpacity; dtsShader.currentOpacity = instance.gameObject.currentOpacity;
} }
var transform = instance.emptyObj.getAbsPos(); 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.setPassName(minfo.mesh.material.mainPass.name);
minfo.meshbatch.material.mainPass.enableLights = minfo.mesh.material.mainPass.enableLights; minfo.meshbatch.material.mainPass.enableLights = minfo.mesh.material.mainPass.enableLights;
minfo.meshbatch.setTransform(transform); minfo.meshbatch.setTransform(transform);
@ -78,7 +78,7 @@ class InstanceManager {
minfo.transparencymeshbatch.material.blendMode = Alpha; minfo.transparencymeshbatch.material.blendMode = Alpha;
// minfo.transparencymeshbatch.material.color.a = instance.gameObject.currentOpacity; // minfo.transparencymeshbatch.material.color.a = instance.gameObject.currentOpacity;
// minfo.transparencymeshbatch.material.mainPass.setPassName(minfo.mesh.material.mainPass.name); // 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.enableLights = minfo.mesh.material.mainPass.enableLights;
// minfo.transparencymeshbatch.material.mainPass.depthWrite = false; // minfo.transparencymeshbatch.material.mainPass.depthWrite = false;
// if (dtsShader != null) { // if (dtsShader != null) {

2
src/Marble.hx
View file

@ -712,7 +712,7 @@ class Marble extends GameObject {
if (rollVolume > 1) if (rollVolume > 1)
rollVolume = 1; rollVolume = 1;
if (contactPct < 0.05) if (contactPct < 0.05)
rollVolume = 0; rollVolume = rollSound.volume / 5;
var slipVolume = 0.0; var slipVolume = 0.0;
if (slipAmount > 1e-4) { if (slipAmount > 1e-4) {

10
src/MarbleWorld.hx
View file

@ -468,23 +468,23 @@ class MarbleWorld extends Scheduler {
public function updateGameState() { public function updateGameState() {
if (this.outOfBounds) if (this.outOfBounds)
return; // We will update state manually 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.playGui.setCenterText('none');
this.marble.mode = Start; 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.playGui.setCenterText('ready');
this.marble.mode = Start; 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.playGui.setCenterText('set');
this.marble.mode = Start; 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.playGui.setCenterText('go');
this.marble.mode = Play; this.marble.mode = Play;
} }
if (this.timeState.currentAttemptTime >= 5.5) { if (this.timeState.currentAttemptTime >= 5.5 && this.finishTime == null) {
this.playGui.setCenterText('none'); this.playGui.setCenterText('none');
this.marble.mode = Play; this.marble.mode = Play;
} }

2
src/gui/MainMenuGui.hx
View file

@ -27,7 +27,7 @@ class MainMenuGui extends GuiImage {
versionText.vertSizing = Top; versionText.vertSizing = Top;
versionText.position = new Vector(289, 450); versionText.position = new Vector(289, 450);
versionText.extent = new Vector(62, 18); versionText.extent = new Vector(62, 18);
versionText.text.text = "1.1.9"; versionText.text.text = "1.1.10";
versionText.text.textColor = 0; versionText.text.textColor = 0;
this.addChild(versionText); this.addChild(versionText);