Skip to content

Commit b3f8e79

Browse files
committed
Merge branches 'master' and 'menu' of https://github.com/BenjaVR/Jungle-Wars into menu
# Conflicts: # core/src/be/howest/junglewars/screens/GameScreen.java
1 parent 0d5194a commit b3f8e79

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

core/src/be/howest/junglewars/gameobjects/power/impl/AttackSpeedPower.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package be.howest.junglewars.gameobjects.power.impl;
22

3-
import be.howest.junglewars.gameobjects.power.IPowerType;
4-
import be.howest.junglewars.gameobjects.power.Power;
3+
import be.howest.junglewars.gameobjects.power.*;
54

65
public class AttackSpeedPower implements IPowerType {
76

core/src/be/howest/junglewars/gameobjects/power/impl/DamagePower.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package be.howest.junglewars.gameobjects.power.impl;
22

3-
import be.howest.junglewars.gameobjects.power.IPowerType;
4-
import be.howest.junglewars.gameobjects.power.Power;
3+
import be.howest.junglewars.gameobjects.power.*;
54

65
public class DamagePower implements IPowerType {
76

core/src/be/howest/junglewars/gameobjects/power/impl/MovementSpeedPower.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package be.howest.junglewars.gameobjects.power.impl;
22

3-
import be.howest.junglewars.gameobjects.power.IPowerType;
4-
import be.howest.junglewars.gameobjects.power.Power;
3+
import be.howest.junglewars.gameobjects.power.*;
54

65
public class MovementSpeedPower implements IPowerType {
76

core/src/be/howest/junglewars/screens/MainMenuScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private void create() {
5454

5555
music = Gdx.audio.newMusic(Gdx.files.internal(Assets.MENU_SONG));
5656
music.setLooping(true);
57-
music.setVolume(0);
57+
music.setVolume(0.3f);
5858
music.play();
5959

6060
// create full screen background

0 commit comments

Comments
 (0)