Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team 2 sprint 3 #207

Closed
wants to merge 64 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
1ce6676
added health bar
WW7796332 Sep 22, 2022
cdd0262
Delete health bar_1.png.jpg
WW7796332 Sep 22, 2022
54cb66b
Delete health bar_2.png.jpg
WW7796332 Sep 22, 2022
76d237a
Delete health bar_3.png.jpg
WW7796332 Sep 22, 2022
9c05673
Delete health bar_4.png.jpg
WW7796332 Sep 22, 2022
e895c06
Delete health bar_5.png.jpg
WW7796332 Sep 22, 2022
1accb64
added health bar
WW7796332 Sep 22, 2022
ee9d079
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
WW7796332 Sep 22, 2022
c3a9a9d
added loading bar
WW7796332 Sep 22, 2022
3d52a3a
add init tutorial screen, tutorial actions and tutorial display. Scre…
alyshaziya Sep 26, 2022
3ff602d
Moved dialogue box from TutorialDisplay to TutorialScreen
Sep 27, 2022
2fa16d2
Added skeleton game area for tutorial
Sep 27, 2022
cdaeb78
Added generic constructor
Sep 27, 2022
297a848
Remove unused dialogue box
Sep 27, 2022
365058c
dialogue box show now sets appropriately
Sep 27, 2022
f8ce585
got it working but dialogue doesnt show up :(
alyshaziya Sep 27, 2022
a73b811
removed custom dialogue box display constructor
Sep 27, 2022
a79df2e
Add dialogue box to tutorial game area
Sep 27, 2022
625c95a
Added HealthBarComponent to entities in the game. HealthBar distingui…
hugh5 Sep 27, 2022
107c68d
Merge remote-tracking branch 'origin/team-2-sprint-3' into team-2-spr…
hugh5 Sep 27, 2022
53052d7
Health bar can be set to visible using debug command. Weather events …
hugh5 Sep 28, 2022
96d7d31
fixed imports
hugh5 Sep 28, 2022
d1942e3
Merge branch 'team5-tutorial' into team-2-sprint-3
hugh5 Sep 28, 2022
a57ca98
Loading screen and loading bar displays after tutorial
hugh5 Oct 1, 2022
99cec8b
Added building health bar to info box display
hugh5 Oct 2, 2022
c799cf0
Added all orientations for beach and waves tiles, plus all frames for…
Oct 2, 2022
268ceb6
combine the frames into a large image for each animation
nicococole Oct 2, 2022
48f6823
adding two type figures of grass and one figure of rain
nicococole Oct 2, 2022
96b2d83
Snowy animation completed and scaled to full screen size
Spooey Oct 3, 2022
50b1142
Health Bar uses game time instead of system time
hugh5 Oct 3, 2022
62fe2e2
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Spooey Oct 3, 2022
0a1bade
Added usefule function to health bar and created unit tests
hugh5 Oct 3, 2022
f63b3ef
Added individual waves frame
Oct 3, 2022
544a5f9
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Spooey Oct 3, 2022
e599bf0
Added animations for rain
Spooey Oct 3, 2022
7ef3a08
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Oct 3, 2022
3c7db2e
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Spooey Oct 3, 2022
241f766
adding animitions of grass and rain
nicococole Oct 3, 2022
df72ea2
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
nicococole Oct 3, 2022
d29af24
Added images for snowfall effect
Oct 3, 2022
25556a4
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Oct 3, 2022
3f1b49e
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Spooey Oct 3, 2022
ac63be5
Changed ocean tiles
Spooey Oct 3, 2022
9c642fc
Added aniamations for stormy weather
Spooey Oct 3, 2022
392cc53
adding thunder and snow
nicococole Oct 3, 2022
dd75645
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
nicococole Oct 3, 2022
cbe6212
Updated images for ocean tiles
Oct 3, 2022
5e12698
Fixed rain animations scaling issue and slowed down the ocean animati…
Spooey Oct 3, 2022
7ebe73d
merge conflict for atlantis factory
Spooey Oct 3, 2022
2f73fe5
Added updated ocean tiles, better orientation
Oct 3, 2022
a1cedd2
adding snow and thunder
nicococole Oct 3, 2022
528ea20
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
nicococole Oct 3, 2022
2abcd65
adding figure of weather change to wiki'
nicococole Oct 3, 2022
cebe1e7
adding grass figure to wiki
nicococole Oct 3, 2022
af88a86
adding figure to weather change file
nicococole Oct 3, 2022
4da17ae
adding figure to wiki
nicococole Oct 3, 2022
bf5826b
Added images for sand to grass tiles
Oct 3, 2022
2885919
Chaned snow animation position
Spooey Oct 3, 2022
6629fe5
Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-…
Spooey Oct 3, 2022
141a3c3
merge conflicts
hugh5 Oct 4, 2022
efad884
loading screen loads new assets
hugh5 Oct 4, 2022
fc71150
fixed failing unit test
hugh5 Oct 4, 2022
bcf35e9
Merge branch 'main' into team-2-sprint-3
hugh5 Oct 4, 2022
1761ebf
imports
hugh5 Oct 4, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed custom dialogue box display constructor
removed unneeded arguments from dialogue box display
removed dialogue box display from tutorial screen
  • Loading branch information
user committed Sep 27, 2022
commit a73b811eb85ccee3da321f6355f1834b74484c80
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,9 @@ private void displayUI() {
spawnEntity(gestureDisplay);

Entity dialogueBox = new Entity();
/* FIXME: temporary infobox width value */
this.dialogueBoxDisplay = new DialogueBoxDisplay(537f);
dialogueBoxDisplay.setDialogue("This is example dialogue text");
dialogueBoxDisplay.setTitle("example title");
dialogueBox.addComponent(dialogueBoxDisplay);
dialogueBox.addComponent(new DialogueBoxActions(dialogueBoxDisplay));
this.dialogueBoxDisplay = new DialogueBoxDisplay();
dialogueBox.addComponent(this.dialogueBoxDisplay);
dialogueBox.addComponent(new DialogueBoxActions(this.dialogueBoxDisplay));

spawnEntity(dialogueBox);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,20 +60,13 @@ public class DialogueBoxDisplay extends UIComponent {
/**
* current width of infoBox being displayed
*/
private float infoWidth;
private float infoWidth = 537f;

/**
* reference to current minimap being displayed
*/
private MinimapComponent minimap;

public DialogueBoxDisplay(float infoWidth) {

logger.debug("Creating DialogueBoxDisplay");
this.infoWidth = infoWidth;
addActors();
}

/**
* Set current minimap for reference
*
Expand All @@ -95,7 +88,6 @@ public void create() {
* Add all necessary dialogue box components
*/
public void addActors() {
Stage stage = new Stage();

logger.debug("Creating DialogueBox Actors");
this.backgroundTexture = new Image(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ private void addActors() {


TextButton skipBtn = new TextButton("Skip Tutorial", skin);
this.dialogueBox = new DialogueBoxDisplay(517f);

skipBtn.addListener(
new ChangeListener() {
Expand Down
11 changes: 0 additions & 11 deletions source/core/src/main/com/deco2800/game/screens/TutorialScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
public class TutorialScreen extends ScreenAdapter {
private static final Logger logger = LoggerFactory.getLogger(TutorialScreen.class);
private static final String[] mainGameTextures = {
"images/dialogue_box_pattern2_background.png",
"images/dialogue_box_image_default.png",
"images/exit-button.PNG",
"images/dialogue_box_background_Deep_Sea.png",
"images/heart.png",
"images/bigblack.png",
"images/resource_display.png",
Expand All @@ -66,9 +62,6 @@ public class TutorialScreen extends ScreenAdapter {
private final Renderer renderer;
private final PhysicsEngine physicsEngine;

/** tutorial dialogue box */
private DialogueBoxDisplay dialogueBoxDisplay;

public TutorialScreen(GdxGame game) {
this.game = game;

Expand Down Expand Up @@ -99,7 +92,6 @@ public TutorialScreen(GdxGame game) {
renderer.getDebug().renderPhysicsWorld(physicsEngine.getWorld());

loadAssets();
this.dialogueBoxDisplay = new DialogueBoxDisplay(517f);
createUI();

logger.debug("Initialising main game screen entities");
Expand Down Expand Up @@ -192,9 +184,6 @@ private void createUI() {
.addComponent(new InputDecorator(stage, 10))
.addComponent(new TutorialActions(game));

ui.addComponent(this.dialogueBoxDisplay)
.addComponent(new DialogueBoxActions(this.dialogueBoxDisplay));

ServiceLocator.getEntityService().register(ui);
}
}