mirror of
https://github.com/inf112-v20/Fiasko.git
synced 2025-01-31 23:29:36 +01:00
Merge branch 'master' of https://github.com/inf112-v20/Fiasko
This commit is contained in:
commit
4c9d5ecc9c
@ -107,6 +107,8 @@ public class BoardActiveScreen extends AbstractScreen implements InputProcessor
|
|||||||
roboRallyWrapper.roboRallyGame = debugGame;
|
roboRallyWrapper.roboRallyGame = debugGame;
|
||||||
this.debugGame = temp;
|
this.debugGame = temp;
|
||||||
return true;
|
return true;
|
||||||
|
} else if (keyCode == Input.Keys.TAB && roboRallyWrapper.roboRallyGame.getGameState() == GameState.CHOOSING_CARDS) {
|
||||||
|
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getCardChoiceScreen(roboRallyWrapper));
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package inf112.fiasko.roborally.gamewrapper.screens;
|
package inf112.fiasko.roborally.gamewrapper.screens;
|
||||||
|
|
||||||
import com.badlogic.gdx.Gdx;
|
import com.badlogic.gdx.Gdx;
|
||||||
|
import com.badlogic.gdx.Input;
|
||||||
import com.badlogic.gdx.InputAdapter;
|
import com.badlogic.gdx.InputAdapter;
|
||||||
import com.badlogic.gdx.InputMultiplexer;
|
import com.badlogic.gdx.InputMultiplexer;
|
||||||
import com.badlogic.gdx.Screen;
|
import com.badlogic.gdx.Screen;
|
||||||
@ -160,6 +161,14 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
|
|||||||
stage.draw();
|
stage.draw();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean keyUp(int keyCode) {
|
||||||
|
if (keyCode == Input.Keys.TAB) {
|
||||||
|
roboRallyWrapper.setScreen(roboRallyWrapper.screenManager.getBoardActiveScreen(roboRallyWrapper));
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders the base shape of cards
|
* Renders the base shape of cards
|
||||||
*/
|
*/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user