ENSEEIHT/projet-programmation-orientee-objet
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.inpt.fr/tobgang/sagittarius

Browse source
This commit is contained in:
Damien 2021-05-14 10:44:47 +02:00
parent 9d9c4dca8a fcd75dd8c6
commit 0c80b8d2db
3 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/sagittarius/SagittariusGame.java
View file

@ -1,7 +1,6 @@
package sagittarius; package sagittarius;
import com.badlogic.gdx.Game; import com.badlogic.gdx.Game;
import com.badlogic.gdx.Gdx;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.audio.Music;
import sagittarius.view.*; import sagittarius.view.*;

1
core/src/sagittarius/model/Bow.java
View file

@ -8,7 +8,6 @@ import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.files.*;
import sagittarius.view.GameScreen; import sagittarius.view.GameScreen;
import sagittarius.SagittariusGame; import sagittarius.SagittariusGame;

2
core/src/sagittarius/view/ResumeScreen.java
View file

@ -3,7 +3,6 @@ package sagittarius.view;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener; import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener;
import com.badlogic.gdx.utils.Align;
import com.kotcrab.vis.ui.VisUI; import com.kotcrab.vis.ui.VisUI;
import com.kotcrab.vis.ui.widget.VisCheckBox; import com.kotcrab.vis.ui.widget.VisCheckBox;
import com.kotcrab.vis.ui.widget.VisTable; import com.kotcrab.vis.ui.widget.VisTable;
@ -66,7 +65,6 @@ public class ResumeScreen extends BaseScreen {
SagittariusGame.music.stop(); SagittariusGame.music.stop();
SagittariusGame.disableMusic = true; SagittariusGame.disableMusic = true;
} }
else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){ else if (!disableMusic.isChecked() && ! SagittariusGame.music.isPlaying()){
SagittariusGame.music.play(); SagittariusGame.music.play();
SagittariusGame.disableMusic = false; SagittariusGame.disableMusic = false;