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

fix some bugs, also rip traplaunches yet again cause i ncreased the timestep

Browse source
This commit is contained in:
RandomityGuy 2021-07-02 15:28:13 +05:30
parent 874c633e1c
commit da04499211
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
marblegame.hl
View file

Binary file not shown.

1
src/Main.hx
View file

@ -1,5 +1,6 @@
package; package;
import hxd.Window;
import src.AudioManager; import src.AudioManager;
import src.Settings; import src.Settings;
import src.MarbleGame; import src.MarbleGame;

4
src/Marble.hx
View file

@ -97,7 +97,7 @@ final trailParticleOptions:ParticleEmitterOptions = {
lifetimeVariance: 10, lifetimeVariance: 10,
acceleration: 0, acceleration: 0,
colors: [new Vector(1, 1, 0, 0), new Vector(1, 1, 0, 1), new Vector(1, 1, 1, 0)], colors: [new Vector(1, 1, 0, 0), new Vector(1, 1, 0, 1), new Vector(1, 1, 1, 0)],
sizes: [0.7, 0.4, 0.1], sizes: [0.4, 0.4, 0.1],
times: [0, 0.15, 1] times: [0, 0.15, 1]
} }
}; };
@ -842,7 +842,7 @@ class Marble extends GameObject {
var intersectT = this.getIntersectionTime(timeStep, velocity); var intersectT = this.getIntersectionTime(timeStep, velocity);
if (intersectT < timeStep) { if (intersectT < timeStep && intersectT > 0.000001) {
intersectT *= 0.8; // We uh tick the shit to not actually at the contact time cause bruh intersectT *= 0.8; // We uh tick the shit to not actually at the contact time cause bruh
// intersectT /= 2; // intersectT /= 2;
var diff = timeStep - intersectT; var diff = timeStep - intersectT;

3
src/Settings.hx
View file

@ -23,6 +23,7 @@ typedef OptionsSettings = {
var shadows:Bool; var shadows:Bool;
var musicVolume:Float; var musicVolume:Float;
var soundVolume:Float; var soundVolume:Float;
var vsync:Bool;
} }
typedef ControlsSettings = { typedef ControlsSettings = {
@ -54,6 +55,7 @@ class Settings {
shadows: false, shadows: false,
musicVolume: 0, musicVolume: 0,
soundVolume: 0, soundVolume: 0,
vsync: true
}; };
public static var controlsSettings:ControlsSettings = { public static var controlsSettings:ControlsSettings = {
@ -125,6 +127,7 @@ class Settings {
controlsSettings = json.controls; controlsSettings = json.controls;
progression = json.progression; progression = json.progression;
} }
Window.getInstance().vsync = optionsSettings.vsync;
} }
public static function init() { public static function init() {

9
src/gui/PlayMissionGui.hx
View file

@ -58,7 +58,7 @@ class PlayMissionGui extends GuiImage {
tabAdvanced.pressedAction = (sender) -> { tabAdvanced.pressedAction = (sender) -> {
currentList = MissionList.advancedMissions; currentList = MissionList.advancedMissions;
currentCategory = "advanced"; currentCategory = "advanced";
setSelectedFunc(0); setSelectedFunc(cast Math.min(Settings.progression[2], currentList.length - 1));
setCategoryFunc("advanced"); setCategoryFunc("advanced");
} }
localContainer.addChild(tabAdvanced); localContainer.addChild(tabAdvanced);
@ -69,7 +69,7 @@ class PlayMissionGui extends GuiImage {
tabIntermediate.pressedAction = (sender) -> { tabIntermediate.pressedAction = (sender) -> {
currentList = MissionList.intermediateMissions; currentList = MissionList.intermediateMissions;
currentCategory = "intermediate"; currentCategory = "intermediate";
setSelectedFunc(0); setSelectedFunc(cast Math.min(Settings.progression[1], currentList.length - 1));
setCategoryFunc("intermediate"); setCategoryFunc("intermediate");
} }
localContainer.addChild(tabIntermediate); localContainer.addChild(tabIntermediate);
@ -227,7 +227,7 @@ class PlayMissionGui extends GuiImage {
tabBeginner.pressedAction = (sender) -> { tabBeginner.pressedAction = (sender) -> {
currentList = MissionList.beginnerMissions; currentList = MissionList.beginnerMissions;
currentCategory = "beginner"; currentCategory = "beginner";
setSelectedFunc(0); setSelectedFunc(cast Math.min(Settings.progression[0], currentList.length - 1));
setCategoryFunc("beginner"); setCategoryFunc("beginner");
} }
localContainer.addChild(tabBeginner); localContainer.addChild(tabBeginner);
@ -366,6 +366,7 @@ class PlayMissionGui extends GuiImage {
public override function render(scene2d:Scene) { public override function render(scene2d:Scene) {
super.render(scene2d); super.render(scene2d);
setSelectedFunc(0); setSelectedFunc(cast Math.min(currentList.length - 1, Settings.progression[["beginner", "intermediate", "advanced"].indexOf(currentCategory)]));
// setSelectedFunc(0);
} }
} }