From da04499211b459ef8a01a9690ad8aa24afc35682 Mon Sep 17 00:00:00 2001 From: RandomityGuy <31925790+RandomityGuy@users.noreply.github.com> Date: Fri, 2 Jul 2021 15:28:13 +0530 Subject: [PATCH] fix some bugs, also rip traplaunches yet again cause i ncreased the timestep --- marblegame.hl | Bin 1666517 -> 1666960 bytes src/Main.hx | 1 + src/Marble.hx | 4 ++-- src/Settings.hx | 3 +++ src/gui/PlayMissionGui.hx | 9 +++++---- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/marblegame.hl b/marblegame.hl index ce966c12e2455b58bec1a2f0219d06b5561d913a..c1d63f070e97cf31b50278727d3acec06d8d0748 100644 GIT binary patch delta 3088 zcmcgtdsGzX6`yZrXLfdHAE@Zw#TWQkIR=!RLs1@rKrqQJE z4GIW~Ad=6tX^%Z8j}v2Ct(xsgYierRXsi(-RumNzA5qa5l9T*n+VtL87d7YP-*C>I z8NT`be)rzrcfZ-w-Qnh*@ZR45TiyC1^zCo+C(8O)ul02lS5)WK92{DAa45r&F_g%` zp|(AZ!yK(=l-4eL>shV!oYLB@w4S%OUeH=EDrSMbZvCsa$of~+odpTaOma%~sSPEv zT%RHhXM8M^3K_G7c8Qdm>M^!Me0ft1u|!ectER9;b@ja}h8C&swQnf*4a(U3l{s&7 zN2>XnTiV#GCDrU!6ptq2gZlTX#yHLLfWxT=9n2UKa5qdifjaxfT2jtCFzFY%JCQpdc!K+lWXXSnw=R76iJeT3d#grilwM| zv$Vhfg%!sQFs6Fr@&?9D_6}rE2J^gQRGyuvd6`K&wX1H`@h+Q^xZcxn3~AyZz4^$nutvJf&N?hTirij^bPmXtMA%F%BFm-Ju8dnTDIGjs$02yP=M8@l2+&A30SQK4vjhy7!pP)FJff*Xm9=gIco7 zskw)$Gc}hxV9(H{bk!~+4=2*2GiD#+v8(p!s>hz=RTFFtt8Cs})s`qLI6*R7TWv_L z+}u~{ykQ-~f#Jk3FkBdJ3=f7EBMxH##z2fg81Wc`F@{9EVc(Ha>=Dsf=lgH70tem;`SZCuRe8HdgK6?@%m@(+xkDAgfW%^ zSKj1lReVwv&-<MI|LoB}E#hOPS8_QXDsJ>+6sw*=zhYBixRrfqc!* zHyo)BMNv`>_lBC?HLus~NvbwQg$(~p0iRhN^o<#WyA(f23&sanyq>_!nLbu1DK`!) z((IK*x${b=m6kLu6q6O$z~+bp3UHPd$*{rn6jlKuO#%Udx9e$$esQkfPXbX*2Dy@`hNZZ=7slAZ|yz3(TGhU=u?!th;skp0qlPf zJEGsPJQB7VUq|QyLO(6m{0lNu2R`i8FJt9CLzMNDU;|N}CCYQ6`8Wi+4{-1I)IV{3(a5;n2LqVXgw(yV3|i@uW(b}ps{WM0Vk zivdR=MQmvYufM^N^zhaPOwU0o`Qp{R!r`IwQRlE(*cWEop5);Gi;Wq z>x6$eabxo)M7#R&2k@d$9P0HIv)rYv%mK(D~QV(Q` z5g$Q{hFhD@&qPOK<3}KHCWc*xLk6zr@h~wf#Ffi1AG76OfztbKzeW8`r2gI{=o+!- z3WPkdD(DkekT15Kgh$1Ut1!+eCnqDtsSpd-p0_HmriI?YTFfH?G0(1Ue{Y zCh6iHOf|EJS4q3ENhE%Zo}IthX;Mb#vFyR&+f(p@e3wNzt?7anr@mNdrci;muZ9XNe5cb;;iff@Bt=X_zSSBvr zh77UqHjGD!^S9w~^gZwioM$_QatBJ2`%mH#Qo_n|IW=lpJ4F(vlS(-nE#(h)tf4)0 z2bSEgfsTo}#A1p`pW@_(g|m<5I8xaMqnI~#DohQ5yiC0K8O&iT#224IqGt8^wIv>T z;&XU9n}HZP(LXrSHNoG(bfuV$GY9F#k=<$ju`bs;P1B03zmk%U$hjQ<-L(G$)ylPq delta 2569 zcmbVMeNa@_6@T|Vc3F0j#T2_|vBU){u~Upos-1|!?m`AqBQ&#}0tJJHT{ev|YBfz_ zES0+nS-_8|s~*zS*0h;%GSf6^Q?gTQK3dx$@e|fBRM03U0&ApH+ZiXZ?K$tUs59+9 z*_rd++k1cKch32pbMKb(O()Jaz4Z!+mgvu6%<{$SWAVzyRi3vuIbG`WT~i}nQw5ny zrp3CZru=4u(-J+UMf*~tr_IqbTJ)?I?N5ykn4{;kNb{bQSo0oJXK8kuP^?PZtd1&G zZ7Wc6gq$IiG9gkHcjD|3(??<>-WV|j1zNERSf4qEu+~H$P2N=2+5Hv$e>apRS2YTe`(- zwRtAl?zc`7ODe2iH_7=fvsIYN%wkQSQ2hS7l5(@QJzd%H#BR~vOZNHZ=KmRVZuyss zS2PjNt#Z8B=?5*l)c;r5s}EUnzht0!6MmO&7mSkz?sZNACe9&h;9ndtI{VIW9|Vc%X=gVY+&FL1}-Jw0>(YcxJH9@?*Xv80!eU? zzz;LFX&gI)p&j zp=PGMV^LQy%nZ*n!wZ~Pt13(7i&%IK+*ol0?Ds_OaB1V9?GxE`u*(DF;x|0rAdmbF zcX(`Mk4@x3Qh4QNav(iQ(+m zeZAl&Kw2Cg5D~13gF`IGP#g}^YtAv~qQ#M8utu!IhU2hQwBh^5VXdgfc_-j6R%)Z? zUZV)pN$4h*!zbapw3~AZ4$^D*6eNh?L?65<0@!*Qn&_1{4Z*BHvfMH5Yl7>DVBie+ z3GmJt2s$SK*BCI$fMZ-}9e(R99L&@YRTtO$XO^}eeP^kACH+)%0K58OnwblgSB!P* z0N5#=>;cFX&A4Cy>O~!P4p2Q2yfFZA`giCYymMI;w~R^pZmP(wRI z7htW82GGmZ`NDS_-n%dA-rW~riH(Htgr_qiiiLx))TWnC%KK!uf$kZE0xIO@AoNft zk6eOxZ8X6i8DggZ?)(H6Q>1I3fd7`N?{R^%xxl>)U5yQ&LNJ4=eauWBr9SlaLLrLF za8Kr9rXnePe5;g(-T2GPwDtI9k~M;BFT69|3~m!s`i%dN4MV$qVyg5am*aniNva6ej6hRHa*tH!d+opoG*U-qB?z$* zTN4nZ*GK|FX8jCCu=)zDBH!*SP;XCOoU)9aLsqxsLB=jGzLNIe17pu>Up8YbMHA-U^z|EuZ9qK~g zDD;b$vFq>PpE+^O>}Qf7lW=)q%G1kVzOa?0`p}5GWK5som17XP6`l`AnEFhfI6Ov! z9KwD7;IWS7T!TDe4~*v-HWN_RV%2r16;I-x>) 0.000001) { intersectT *= 0.8; // We uh tick the shit to not actually at the contact time cause bruh // intersectT /= 2; var diff = timeStep - intersectT; diff --git a/src/Settings.hx b/src/Settings.hx index 56c56dcf..46f90b57 100644 --- a/src/Settings.hx +++ b/src/Settings.hx @@ -23,6 +23,7 @@ typedef OptionsSettings = { var shadows:Bool; var musicVolume:Float; var soundVolume:Float; + var vsync:Bool; } typedef ControlsSettings = { @@ -54,6 +55,7 @@ class Settings { shadows: false, musicVolume: 0, soundVolume: 0, + vsync: true }; public static var controlsSettings:ControlsSettings = { @@ -125,6 +127,7 @@ class Settings { controlsSettings = json.controls; progression = json.progression; } + Window.getInstance().vsync = optionsSettings.vsync; } public static function init() { diff --git a/src/gui/PlayMissionGui.hx b/src/gui/PlayMissionGui.hx index fd127f2b..d875a5c1 100644 --- a/src/gui/PlayMissionGui.hx +++ b/src/gui/PlayMissionGui.hx @@ -58,7 +58,7 @@ class PlayMissionGui extends GuiImage { tabAdvanced.pressedAction = (sender) -> { currentList = MissionList.advancedMissions; currentCategory = "advanced"; - setSelectedFunc(0); + setSelectedFunc(cast Math.min(Settings.progression[2], currentList.length - 1)); setCategoryFunc("advanced"); } localContainer.addChild(tabAdvanced); @@ -69,7 +69,7 @@ class PlayMissionGui extends GuiImage { tabIntermediate.pressedAction = (sender) -> { currentList = MissionList.intermediateMissions; currentCategory = "intermediate"; - setSelectedFunc(0); + setSelectedFunc(cast Math.min(Settings.progression[1], currentList.length - 1)); setCategoryFunc("intermediate"); } localContainer.addChild(tabIntermediate); @@ -227,7 +227,7 @@ class PlayMissionGui extends GuiImage { tabBeginner.pressedAction = (sender) -> { currentList = MissionList.beginnerMissions; currentCategory = "beginner"; - setSelectedFunc(0); + setSelectedFunc(cast Math.min(Settings.progression[0], currentList.length - 1)); setCategoryFunc("beginner"); } localContainer.addChild(tabBeginner); @@ -366,6 +366,7 @@ class PlayMissionGui extends GuiImage { public override function render(scene2d:Scene) { super.render(scene2d); - setSelectedFunc(0); + setSelectedFunc(cast Math.min(currentList.length - 1, Settings.progression[["beginner", "intermediate", "advanced"].indexOf(currentCategory)])); + // setSelectedFunc(0); } }