diff --git a/data/shapes/astrolabe/astrolabe_solid_glow.png b/data/shapes/astrolabe/astrolabe_solid_glow.png index 4a2763bd..59b81ef6 100644 Binary files a/data/shapes/astrolabe/astrolabe_solid_glow.png and b/data/shapes/astrolabe/astrolabe_solid_glow.png differ diff --git a/data/shapes/astrolabe/clouds_advanced.png b/data/shapes/astrolabe/clouds_advanced.png index f8701f7c..b9d44bf6 100644 Binary files a/data/shapes/astrolabe/clouds_advanced.png and b/data/shapes/astrolabe/clouds_advanced.png differ diff --git a/data/shapes/astrolabe/clouds_beginner.png b/data/shapes/astrolabe/clouds_beginner.png index 67f8dc52..3425a217 100644 Binary files a/data/shapes/astrolabe/clouds_beginner.png and b/data/shapes/astrolabe/clouds_beginner.png differ diff --git a/data/shapes/astrolabe/clouds_intermediate.png b/data/shapes/astrolabe/clouds_intermediate.png index 1cef74dc..13be6fd7 100644 Binary files a/data/shapes/astrolabe/clouds_intermediate.png and b/data/shapes/astrolabe/clouds_intermediate.png differ diff --git a/data/shapes/balls/marble01.skin.png b/data/shapes/balls/marble01.skin.png index 9c9fd5b3..d2b1f7c0 100644 Binary files a/data/shapes/balls/marble01.skin.png and b/data/shapes/balls/marble01.skin.png differ diff --git a/data/shapes/balls/marble02.skin.png b/data/shapes/balls/marble02.skin.png index 537bf73c..bf4f11ba 100644 Binary files a/data/shapes/balls/marble02.skin.png and b/data/shapes/balls/marble02.skin.png differ diff --git a/data/shapes/balls/marble03.skin.png b/data/shapes/balls/marble03.skin.png index b9e799ec..3a06ec3c 100644 Binary files a/data/shapes/balls/marble03.skin.png and b/data/shapes/balls/marble03.skin.png differ diff --git a/data/shapes/balls/marble04.skin.png b/data/shapes/balls/marble04.skin.png index 35fa9015..beaea538 100644 Binary files a/data/shapes/balls/marble04.skin.png and b/data/shapes/balls/marble04.skin.png differ diff --git a/data/shapes/balls/marble05.skin.png b/data/shapes/balls/marble05.skin.png index ab759331..4a994bf7 100644 Binary files a/data/shapes/balls/marble05.skin.png and b/data/shapes/balls/marble05.skin.png differ diff --git a/data/shapes/balls/marble06.skin.png b/data/shapes/balls/marble06.skin.png index d26fa4aa..99172a8e 100644 Binary files a/data/shapes/balls/marble06.skin.png and b/data/shapes/balls/marble06.skin.png differ diff --git a/data/shapes/balls/marble07.skin.png b/data/shapes/balls/marble07.skin.png index 4934e2e1..b021b19f 100644 Binary files a/data/shapes/balls/marble07.skin.png and b/data/shapes/balls/marble07.skin.png differ diff --git a/data/shapes/balls/marble08.skin.png b/data/shapes/balls/marble08.skin.png index 488473da..f4d16ff0 100644 Binary files a/data/shapes/balls/marble08.skin.png and b/data/shapes/balls/marble08.skin.png differ diff --git a/data/shapes/balls/marble09.skin.png b/data/shapes/balls/marble09.skin.png index cc4bd16e..8d8d3a8d 100644 Binary files a/data/shapes/balls/marble09.skin.png and b/data/shapes/balls/marble09.skin.png differ diff --git a/data/shapes/balls/marble10.skin.png b/data/shapes/balls/marble10.skin.png index dc311931..bea38f38 100644 Binary files a/data/shapes/balls/marble10.skin.png and b/data/shapes/balls/marble10.skin.png differ diff --git a/data/shapes/balls/marble11.skin.png b/data/shapes/balls/marble11.skin.png index eda485fd..fe856451 100644 Binary files a/data/shapes/balls/marble11.skin.png and b/data/shapes/balls/marble11.skin.png differ diff --git a/data/shapes/balls/marble12.skin.png b/data/shapes/balls/marble12.skin.png index 35ddd6e0..e1f03b2a 100644 Binary files a/data/shapes/balls/marble12.skin.png and b/data/shapes/balls/marble12.skin.png differ diff --git a/data/shapes/balls/marble13.skin.png b/data/shapes/balls/marble13.skin.png index f7fd4a5b..41c04f61 100644 Binary files a/data/shapes/balls/marble13.skin.png and b/data/shapes/balls/marble13.skin.png differ diff --git a/data/shapes/balls/marble14.skin.png b/data/shapes/balls/marble14.skin.png index 7c48d09d..0153ab11 100644 Binary files a/data/shapes/balls/marble14.skin.png and b/data/shapes/balls/marble14.skin.png differ diff --git a/data/shapes/balls/marble15.skin.png b/data/shapes/balls/marble15.skin.png index 28f6ea94..a2eb3d48 100644 Binary files a/data/shapes/balls/marble15.skin.png and b/data/shapes/balls/marble15.skin.png differ diff --git a/data/shapes/balls/marble16.skin.png b/data/shapes/balls/marble16.skin.png index 28cac5f3..978baf5a 100644 Binary files a/data/shapes/balls/marble16.skin.png and b/data/shapes/balls/marble16.skin.png differ diff --git a/data/shapes/balls/marble17.skin.png b/data/shapes/balls/marble17.skin.png index 4a750211..785150e0 100644 Binary files a/data/shapes/balls/marble17.skin.png and b/data/shapes/balls/marble17.skin.png differ diff --git a/data/shapes/balls/marble18.skin.png b/data/shapes/balls/marble18.skin.png index 24e0b389..8ca669fd 100644 Binary files a/data/shapes/balls/marble18.skin.png and b/data/shapes/balls/marble18.skin.png differ diff --git a/data/shapes/balls/marble19.skin.png b/data/shapes/balls/marble19.skin.png index 75d5021d..9a0599b8 100644 Binary files a/data/shapes/balls/marble19.skin.png and b/data/shapes/balls/marble19.skin.png differ diff --git a/data/shapes/balls/marble20.skin.png b/data/shapes/balls/marble20.skin.png index 6882b898..73fd2b06 100644 Binary files a/data/shapes/balls/marble20.skin.png and b/data/shapes/balls/marble20.skin.png differ diff --git a/data/shapes/balls/marble21.skin.png b/data/shapes/balls/marble21.skin.png index 4f9fbd84..9b99d52f 100644 Binary files a/data/shapes/balls/marble21.skin.png and b/data/shapes/balls/marble21.skin.png differ diff --git a/data/shapes/balls/marble22.skin.png b/data/shapes/balls/marble22.skin.png index ebc1a41d..e1fa0dd8 100644 Binary files a/data/shapes/balls/marble22.skin.png and b/data/shapes/balls/marble22.skin.png differ diff --git a/data/shapes/balls/marble23.skin.png b/data/shapes/balls/marble23.skin.png index f41fdbf8..b577fe99 100644 Binary files a/data/shapes/balls/marble23.skin.png and b/data/shapes/balls/marble23.skin.png differ diff --git a/data/shapes/balls/marble24.skin.png b/data/shapes/balls/marble24.skin.png index 4bc0bc9c..b002c6de 100644 Binary files a/data/shapes/balls/marble24.skin.png and b/data/shapes/balls/marble24.skin.png differ diff --git a/data/shapes/balls/marble25.skin.png b/data/shapes/balls/marble25.skin.png index aeb3a0f8..42f3293e 100644 Binary files a/data/shapes/balls/marble25.skin.png and b/data/shapes/balls/marble25.skin.png differ diff --git a/data/shapes/balls/marble26.skin.png b/data/shapes/balls/marble26.skin.png index 3135d978..d5d83774 100644 Binary files a/data/shapes/balls/marble26.skin.png and b/data/shapes/balls/marble26.skin.png differ diff --git a/data/shapes/balls/marble27.skin.png b/data/shapes/balls/marble27.skin.png index a2550477..4c207370 100644 Binary files a/data/shapes/balls/marble27.skin.png and b/data/shapes/balls/marble27.skin.png differ diff --git a/data/shapes/balls/marble28.skin.png b/data/shapes/balls/marble28.skin.png index b277f5e1..c4615a57 100644 Binary files a/data/shapes/balls/marble28.skin.png and b/data/shapes/balls/marble28.skin.png differ diff --git a/data/shapes/balls/marble29.skin.png b/data/shapes/balls/marble29.skin.png index fca6fc8f..e03460e6 100644 Binary files a/data/shapes/balls/marble29.skin.png and b/data/shapes/balls/marble29.skin.png differ diff --git a/data/shapes/balls/marble30.skin.png b/data/shapes/balls/marble30.skin.png index 42499cd5..22bb749e 100644 Binary files a/data/shapes/balls/marble30.skin.png and b/data/shapes/balls/marble30.skin.png differ diff --git a/data/shapes/balls/marble31.skin.png b/data/shapes/balls/marble31.skin.png index 52e49c9d..c51dc6c1 100644 Binary files a/data/shapes/balls/marble31.skin.png and b/data/shapes/balls/marble31.skin.png differ diff --git a/data/shapes/balls/marble32.skin.png b/data/shapes/balls/marble32.skin.png index e91dbbe0..d74d36b1 100644 Binary files a/data/shapes/balls/marble32.skin.png and b/data/shapes/balls/marble32.skin.png differ diff --git a/data/shapes/balls/marble33.skin.png b/data/shapes/balls/marble33.skin.png index e6d68542..4984de72 100644 Binary files a/data/shapes/balls/marble33.skin.png and b/data/shapes/balls/marble33.skin.png differ diff --git a/data/shapes/balls/marble34.skin.png b/data/shapes/balls/marble34.skin.png index 9b040428..cbfdcfc9 100644 Binary files a/data/shapes/balls/marble34.skin.png and b/data/shapes/balls/marble34.skin.png differ diff --git a/data/shapes/balls/marble35.skin.png b/data/shapes/balls/marble35.skin.png index eb371b85..d9a439b9 100644 Binary files a/data/shapes/balls/marble35.skin.png and b/data/shapes/balls/marble35.skin.png differ diff --git a/data/shapes/bumpers/bumper.png b/data/shapes/bumpers/bumper.png index 3270b47f..98302a27 100644 Binary files a/data/shapes/bumpers/bumper.png and b/data/shapes/bumpers/bumper.png differ diff --git a/data/shapes/images/blast_orbit_bump.png b/data/shapes/images/blast_orbit_bump.png index 2e7c4643..ecba4ae4 100644 Binary files a/data/shapes/images/blast_orbit_bump.png and b/data/shapes/images/blast_orbit_bump.png differ diff --git a/data/shapes/images/blast_orbit_skin.png b/data/shapes/images/blast_orbit_skin.png index e5219384..bcab9b40 100644 Binary files a/data/shapes/images/blast_orbit_skin.png and b/data/shapes/images/blast_orbit_skin.png differ diff --git a/data/shapes/images/grow.png b/data/shapes/images/grow.png index 64afb448..e960fe58 100644 Binary files a/data/shapes/images/grow.png and b/data/shapes/images/grow.png differ diff --git a/data/shapes/images/grow_bump.png b/data/shapes/images/grow_bump.png index 5bf4ad9c..0c72bb96 100644 Binary files a/data/shapes/images/grow_bump.png and b/data/shapes/images/grow_bump.png differ diff --git a/data/shapes/items/antigrav_bump.png b/data/shapes/items/antigrav_bump.png index 3131a0aa..5b3d0fd0 100644 Binary files a/data/shapes/items/antigrav_bump.png and b/data/shapes/items/antigrav_bump.png differ diff --git a/data/shapes/items/antigrav_skin.png b/data/shapes/items/antigrav_skin.png index cb7e8365..fdecdf64 100644 Binary files a/data/shapes/items/antigrav_skin.png and b/data/shapes/items/antigrav_skin.png differ diff --git a/data/shapes/items/blue.gem.png b/data/shapes/items/blue.gem.png index 0f69b4ce..ad152948 100644 Binary files a/data/shapes/items/blue.gem.png and b/data/shapes/items/blue.gem.png differ diff --git a/data/shapes/items/egg_skin.png b/data/shapes/items/egg_skin.png index de18409a..fe86db5d 100644 Binary files a/data/shapes/items/egg_skin.png and b/data/shapes/items/egg_skin.png differ diff --git a/data/shapes/items/red.gem.png b/data/shapes/items/red.gem.png index 1eec7f8a..ae0ec798 100644 Binary files a/data/shapes/items/red.gem.png and b/data/shapes/items/red.gem.png differ diff --git a/data/shapes/items/superJump_bump.png b/data/shapes/items/superJump_bump.png index d99a8ac9..f90e63d7 100644 Binary files a/data/shapes/items/superJump_bump.png and b/data/shapes/items/superJump_bump.png differ diff --git a/data/shapes/items/superJump_skin.png b/data/shapes/items/superJump_skin.png index 5eaf4644..a84ac722 100644 Binary files a/data/shapes/items/superJump_skin.png and b/data/shapes/items/superJump_skin.png differ diff --git a/data/shapes/items/superSpeed_skin.png b/data/shapes/items/superSpeed_skin.png index 24211ffe..fd592a0b 100644 Binary files a/data/shapes/items/superSpeed_skin.png and b/data/shapes/items/superSpeed_skin.png differ diff --git a/data/shapes/items/timeTravel_skin.png b/data/shapes/items/timeTravel_skin.png index 2eba47c2..cf2208d2 100644 Binary files a/data/shapes/items/timeTravel_skin.png and b/data/shapes/items/timeTravel_skin.png differ diff --git a/data/shapes/items/yellow.gem.png b/data/shapes/items/yellow.gem.png index 428d9d2a..ae3c783c 100644 Binary files a/data/shapes/items/yellow.gem.png and b/data/shapes/items/yellow.gem.png differ diff --git a/data/shapes/pads/ringglass.png b/data/shapes/pads/ringglass.png index ad1e36c2..4aa2733a 100644 Binary files a/data/shapes/pads/ringglass.png and b/data/shapes/pads/ringglass.png differ diff --git a/data/shapes/pads/ringtex.png b/data/shapes/pads/ringtex.png index 2c16f551..05dfae96 100644 Binary files a/data/shapes/pads/ringtex.png and b/data/shapes/pads/ringtex.png differ diff --git a/data/shapes/structures/glass.normal.png b/data/shapes/structures/glass.normal.png index d6463c33..dd2b9346 100644 Binary files a/data/shapes/structures/glass.normal.png and b/data/shapes/structures/glass.normal.png differ diff --git a/data/shapes/structures/glass.png b/data/shapes/structures/glass.png index 3487d268..9d85e4d0 100644 Binary files a/data/shapes/structures/glass.png and b/data/shapes/structures/glass.png differ diff --git a/data/shapes/structures/glass2.png b/data/shapes/structures/glass2.png index 330a6b6c..2e3b0419 100644 Binary files a/data/shapes/structures/glass2.png and b/data/shapes/structures/glass2.png differ diff --git a/data/skies/gemCubemapUp.png b/data/skies/gemCubemapUp.png index c70ae7d4..c19c3991 100644 Binary files a/data/skies/gemCubemapUp.png and b/data/skies/gemCubemapUp.png differ diff --git a/data/skies/gemCubemapUp2.png b/data/skies/gemCubemapUp2.png index 5fc78d0d..c1f14338 100644 Binary files a/data/skies/gemCubemapUp2.png and b/data/skies/gemCubemapUp2.png differ diff --git a/data/skies/gemCubemapUp3.png b/data/skies/gemCubemapUp3.png index 021783c2..482261a1 100644 Binary files a/data/skies/gemCubemapUp3.png and b/data/skies/gemCubemapUp3.png differ diff --git a/data/textures/beam.normal.png b/data/textures/beam.normal.png index 7350bbc2..ff9be018 100644 Binary files a/data/textures/beam.normal.png and b/data/textures/beam.normal.png differ diff --git a/data/textures/beam.png b/data/textures/beam.png index 453f2868..c7c28cef 100644 Binary files a/data/textures/beam.png and b/data/textures/beam.png differ diff --git a/data/textures/beam_side.normal.png b/data/textures/beam_side.normal.png index 5d4f6586..7841d8d8 100644 Binary files a/data/textures/beam_side.normal.png and b/data/textures/beam_side.normal.png differ diff --git a/data/textures/beam_side.png b/data/textures/beam_side.png index 1e02e575..b86b24c2 100644 Binary files a/data/textures/beam_side.png and b/data/textures/beam_side.png differ diff --git a/data/textures/edge.normal.png b/data/textures/edge.normal.png index 99b29c69..5354c076 100644 Binary files a/data/textures/edge.normal.png and b/data/textures/edge.normal.png differ diff --git a/data/textures/edge_white.png b/data/textures/edge_white.png index 95ca1249..28c52958 100644 Binary files a/data/textures/edge_white.png and b/data/textures/edge_white.png differ diff --git a/data/textures/edge_white_shadow.png b/data/textures/edge_white_shadow.png index ab2ad271..7d8c15c2 100644 Binary files a/data/textures/edge_white_shadow.png and b/data/textures/edge_white_shadow.png differ diff --git a/data/textures/friction_high.normal.png b/data/textures/friction_high.normal.png index 7c66edde..70ff1ce9 100644 Binary files a/data/textures/friction_high.normal.png and b/data/textures/friction_high.normal.png differ diff --git a/data/textures/friction_high.png b/data/textures/friction_high.png index 7c7edd2a..e4bb5853 100644 Binary files a/data/textures/friction_high.png and b/data/textures/friction_high.png differ diff --git a/data/textures/friction_high_shadow.png b/data/textures/friction_high_shadow.png index 28730cbc..4243d659 100644 Binary files a/data/textures/friction_high_shadow.png and b/data/textures/friction_high_shadow.png differ diff --git a/data/textures/friction_high_shadow_mbu.png b/data/textures/friction_high_shadow_mbu.png deleted file mode 100644 index 4920a2a2..00000000 Binary files a/data/textures/friction_high_shadow_mbu.png and /dev/null differ diff --git a/data/textures/friction_low.normal.png b/data/textures/friction_low.normal.png index 05ea4b91..5bca4634 100644 Binary files a/data/textures/friction_low.normal.png and b/data/textures/friction_low.normal.png differ diff --git a/data/textures/friction_low.png b/data/textures/friction_low.png index 259ec698..855536b5 100644 Binary files a/data/textures/friction_low.png and b/data/textures/friction_low.png differ diff --git a/data/textures/friction_low_shadow.png b/data/textures/friction_low_shadow.png index e6ebc447..1dab866b 100644 Binary files a/data/textures/friction_low_shadow.png and b/data/textures/friction_low_shadow.png differ diff --git a/data/textures/plate.normal.png b/data/textures/plate.normal.png index de01c8c1..f6894cf5 100644 Binary files a/data/textures/plate.normal.png and b/data/textures/plate.normal.png differ diff --git a/data/textures/plate.randomize.png b/data/textures/plate.randomize.png index 4e523372..99b5ed78 100644 Binary files a/data/textures/plate.randomize.png and b/data/textures/plate.randomize.png differ diff --git a/data/textures/stripe_caution.png b/data/textures/stripe_caution.png index 780ea2d3..ce227f2f 100644 Binary files a/data/textures/stripe_caution.png and b/data/textures/stripe_caution.png differ diff --git a/data/textures/tile_advanced.png b/data/textures/tile_advanced.png index 80f8260a..e594f090 100644 Binary files a/data/textures/tile_advanced.png and b/data/textures/tile_advanced.png differ diff --git a/data/textures/tile_beginner.png b/data/textures/tile_beginner.png index adbc0665..a84eb78c 100644 Binary files a/data/textures/tile_beginner.png and b/data/textures/tile_beginner.png differ diff --git a/data/textures/tile_intermediate.png b/data/textures/tile_intermediate.png index 9cdbb340..f0c053dd 100644 Binary files a/data/textures/tile_intermediate.png and b/data/textures/tile_intermediate.png differ diff --git a/data/textures/tile_underside.png b/data/textures/tile_underside.png index 296a3ec5..506605f8 100644 Binary files a/data/textures/tile_underside.png and b/data/textures/tile_underside.png differ diff --git a/data/textures/wall_beginner.png b/data/textures/wall_beginner.png index 41710ce9..7a6aa0ac 100644 Binary files a/data/textures/wall_beginner.png and b/data/textures/wall_beginner.png differ diff --git a/src/DifBuilder.hx b/src/DifBuilder.hx index 09b514ad..51c987a4 100644 --- a/src/DifBuilder.hx +++ b/src/DifBuilder.hx @@ -212,8 +212,8 @@ class DifBuilder { var worker = new ResourceLoaderWorker(() -> { var diffuseTex = ResourceLoader.getTexture(baseTexture).resource; diffuseTex.wrap = Repeat; - diffuseTex.mipMap = Linear; - diffuseTex.filter = Linear; + diffuseTex.mipMap = Nearest; + // diffuseTex.filter = Linear; var normalTex = ResourceLoader.getTexture(normalTexture).resource; normalTex.wrap = Repeat; normalTex.mipMap = Nearest; diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index e1b6487a..0b3b9e2f 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -278,7 +278,7 @@ class MarbleWorld extends Scheduler { this.playGui.init(this.scene2d, this.mission.game.toLowerCase(), () -> { this.scene.addChild(this.sky); this._ready = true; - AudioManager.playShell(); + // AudioManager.playShell(); MarbleGame.canvas.clearContent(); if (this.endPad != null) this.endPad.generateCollider(); @@ -1450,7 +1450,7 @@ class MarbleWorld extends Scheduler { } var endGameCode = () -> { this.dispose(); - var pmg = new LevelSelectGui(["beginner", "intermediate", "advanced"][mission.difficultyIndex]); + var pmg = new LevelSelectGui(["beginner", "intermediate", "advanced", "multiplayer"][mission.difficultyIndex]); LevelSelectGui.currentSelectionStatic = mission.index + 1; MarbleGame.canvas.setContent(pmg); #if js @@ -1465,6 +1465,7 @@ class MarbleWorld extends Scheduler { }, (sender) -> { var restartGameCode = () -> { MarbleGame.canvas.popDialog(egg); + playGui.setGuiVisibility(true); this.restart(true); #if js pointercontainer.hidden = true; @@ -1828,7 +1829,7 @@ class MarbleWorld extends Scheduler { this._disposed = true; AudioManager.stopAllSounds(); - AudioManager.playShell(); + // AudioManager.playShell(); } } diff --git a/src/MissionList.hx b/src/MissionList.hx index 5bb5a6d6..1fb8789f 100644 --- a/src/MissionList.hx +++ b/src/MissionList.hx @@ -77,7 +77,7 @@ class MissionList { ultraMissions.set("beginner", parseDifficulty("ultra", "missions", "beginner", 0)); ultraMissions.set("intermediate", parseDifficulty("ultra", "missions", "intermediate", 1)); ultraMissions.set("advanced", parseDifficulty("ultra", "missions", "advanced", 2)); - ultraMissions.set("multiplayer", parseDifficulty("ultra", "missions", "multiplayer", 2)); + ultraMissions.set("multiplayer", parseDifficulty("ultra", "missions", "multiplayer", 3)); @:privateAccess ultraMissions["beginner"][ultraMissions["beginner"].length - 1].next = ultraMissions["intermediate"][0]; @:privateAccess ultraMissions["intermediate"][ultraMissions["intermediate"].length - 1].next = ultraMissions["advanced"][0]; diff --git a/src/shaders/CubemapRenderer.hx b/src/shaders/CubemapRenderer.hx index 6204f5c4..504c9d85 100644 --- a/src/shaders/CubemapRenderer.hx +++ b/src/shaders/CubemapRenderer.hx @@ -8,6 +8,7 @@ import h3d.Engine; import h3d.Camera; import src.MarbleGame; import h3d.mat.Texture; +import src.Settings; class CubemapRenderer { public var cubemap:Texture; @@ -38,7 +39,8 @@ class CubemapRenderer { Renderer.cubemapPass = true; for (i in 0...facesPerRender) { var index = (nextFaceToRender + i) % 6; - Renderer.dirtyBuffers = true; + if (Settings.optionsSettings.reflectionDetail >= 4) + Renderer.dirtyBuffers = true; e.pushTarget(cubemap, index); this.camera.setCubeMap(index, position);