Code

Team 2 sprint 3#207

Code

Closed

hugh5 wants to merge 64 commits intomainUQdeco2800/2022-studio-3:mainfrom team-2-sprint-3UQdeco2800/2022-studio-3:team-2-sprint-3Copy head branch name to clipboard

+1,159-119

Commits

Commits on Sep 22, 2022

• added health bar

  WW7796332

  committed
  1ce6676

• Delete health bar_1.png.jpg

  WW7796332

  authored
  cdd0262

• Delete health bar_2.png.jpg

  WW7796332

  authored
  54cb66b

• Delete health bar_3.png.jpg

  WW7796332

  authored
  76d237a

• Delete health bar_4.png.jpg

  WW7796332

  authored
  9c05673

• Delete health bar_5.png.jpg

  WW7796332

  authored
  e895c06

• added health bar

  WW7796332

  committed
  1accb64

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  WW7796332

  committed
  ee9d079

• added loading bar

  WW7796332

  committed
  c3a9a9d

Commits on Sep 26, 2022

• add init tutorial screen, tutorial actions and tutorial display. Screen now changes from main screen -> cutscenes -> tutorial -> main game. Made tutorial skippable.

  alyshaziya

  committed
  3d52a3a

Commits on Sep 27, 2022

• Moved dialogue box from TutorialDisplay to TutorialScreen

  

  usrnatc

  committed
  3ff602d

• Added skeleton game area for tutorial

  

  usrnatc

  committed
  2fa16d2

• Added generic constructor

  Show description for cdaeb78
  

  usrnatc

  committed
  cdaeb78

• Remove unused dialogue box

  

  usrnatc

  committed
  297a848

• dialogue box show now sets appropriately

  Show description for 365058c
  

  usrnatc

  committed
  365058c

• got it working but dialogue doesnt show up :(

  alyshaziya

  committed
  f8ce585

• removed custom dialogue box display constructor

  Show description for a73b811
  

  user

  committed
  a73b811

• Add dialogue box to tutorial game area

  Show description for a79df2e
  

  user

  committed
  a79df2e

• Added HealthBarComponent to entities in the game. HealthBar distinguishes between friendly and non-friendly entities.

  hugh5

  committed
  625c95a

• Merge remote-tracking branch 'origin/team-2-sprint-3' into team-2-sprint-3

  hugh5

  committed
  107c68d

Commits on Sep 28, 2022

• Health bar can be set to visible using debug command. Weather events also lasts longer

  hugh5

  committed
  53052d7

• fixed imports

  hugh5

  committed
  96d7d31

• Merge branch 'team5-tutorial' into team-2-sprint-3

  hugh5

  committed
  d1942e3

Commits on Oct 1, 2022

• Loading screen and loading bar displays after tutorial

  hugh5

  committed
  a57ca98

Commits on Oct 2, 2022

• Added building health bar to info box display

  hugh5

  committed
  99cec8b

• Added all orientations for beach and waves tiles, plus all frames for animation (if implemented)

  

  syl2211

  committed
  c799cf0

• combine the frames into a large image for each animation

  nicococole

  committed
  268ceb6

• adding two type figures of grass and one figure of rain

  nicococole

  committed
  48f6823

Commits on Oct 3, 2022

• Snowy animation completed and scaled to full screen size

  Spooey

  committed
  96b2d83

• Health Bar uses game time instead of system time

  hugh5

  committed
  50b1142

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  Spooey

  committed
  62fe2e2

• Added usefule function to health bar and created unit tests

  hugh5

  committed
  0a1bade

• Added individual waves frame

  

  syl2211

  committed
  f63b3ef

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  Spooey

  committed
  544a5f9

• Added animations for rain

  Spooey

  committed
  e599bf0

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  

  syl2211

  committed
  7ef3a08

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  Spooey

  committed
  3c7db2e

• adding animitions of grass and rain

  nicococole

  committed
  241f766

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  nicococole

  committed
  df72ea2

• Added images for snowfall effect

  

  syl2211

  committed
  d29af24

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  

  syl2211

  committed
  25556a4

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  Spooey

  committed
  3f1b49e

• Changed ocean tiles

  Spooey

  committed
  ac63be5

• Added aniamations for stormy weather

  Spooey

  committed
  9c642fc

• adding thunder and snow

  nicococole

  committed
  392cc53

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  nicococole

  committed
  dd75645

• Updated images for ocean tiles

  

  syl2211

  committed
  cbe6212

• Fixed rain animations scaling issue and slowed down the ocean animation frame rate

  Spooey

  committed
  5e12698

• merge conflict for atlantis factory

  Spooey

  committed
  7ebe73d

• Added updated ocean tiles, better orientation

  

  syl2211

  committed
  2f73fe5

• adding snow and thunder

  nicococole

  committed
  a1cedd2

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  nicococole

  committed
  528ea20

• adding figure of weather change to wiki'

  Show description for 2abcd65
  nicococole

  committed
  2abcd65

• adding grass figure to wiki

  nicococole

  committed
  cebe1e7

• adding figure to weather change file

  nicococole

  committed
  af88a86

• adding figure to wiki

  nicococole

  committed
  4da17ae

• Added images for sand to grass tiles

  

  syl2211

  committed
  bf5826b

• Chaned snow animation position

  Spooey

  committed
  2885919

• Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-studio-3 into team-2-sprint-3

  Spooey

  committed
  6629fe5

Commits on Oct 4, 2022

• merge conflicts

  hugh5

  committed
  141a3c3

• loading screen loads new assets

  hugh5

  committed
  efad884

• fixed failing unit test

  hugh5

  committed
  fc71150

• Merge branch 'main' into team-2-sprint-3

  Show description for bcf35e9
  hugh5

  committed
  bcf35e9

• imports

  hugh5

  committed
  1761ebf