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.

Sign up for GitHub

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

Jump to bottom

Team 2 sprint 3 #207

Closed
wants to merge 64 commits into from
Closed

Team 2 sprint 3 #207

wants to merge 64 commits into from

Commits on Sep 22, 2022

  1. added health bar

    @WW7796332
    WW7796332 committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    1ce6676 View commit details
    Browse the repository at this point in the history

  2. Delete health bar_1.png.jpg

    @WW7796332
    WW7796332 authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    cdd0262 View commit details
    Browse the repository at this point in the history

  3. Delete health bar_2.png.jpg

    @WW7796332
    WW7796332 authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    54cb66b View commit details
    Browse the repository at this point in the history

  4. Delete health bar_3.png.jpg

    @WW7796332
    WW7796332 authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    76d237a View commit details
    Browse the repository at this point in the history

  5. Delete health bar_4.png.jpg

    @WW7796332
    WW7796332 authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    9c05673 View commit details
    Browse the repository at this point in the history

  6. Delete health bar_5.png.jpg

    @WW7796332
    WW7796332 authored Sep 22, 2022
    Configuration menu
    Copy the full SHA
    e895c06 View commit details
    Browse the repository at this point in the history

  7. added health bar

    @WW7796332
    WW7796332 committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    1accb64 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @WW7796332
    WW7796332 committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    ee9d079 View commit details
    Browse the repository at this point in the history

  9. added loading bar

    @WW7796332
    WW7796332 committed Sep 22, 2022
    Configuration menu
    Copy the full SHA
    c3a9a9d View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2022

  1. add init tutorial screen, tutorial actions and tutorial display. Scre… 

    …en now changes from main screen -> cutscenes -> tutorial -> main game. Made tutorial skippable.
    @alyshaziya
    alyshaziya committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    3d52a3a View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Moved dialogue box from TutorialDisplay to TutorialScreen

    usrnatc committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    3ff602d View commit details
    Browse the repository at this point in the history

  2. Added skeleton game area for tutorial

    usrnatc committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    2fa16d2 View commit details
    Browse the repository at this point in the history

  3. Added generic constructor 

    added text null checks
    usrnatc committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    cdaeb78 View commit details
    Browse the repository at this point in the history

  4. Remove unused dialogue box

    usrnatc committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    297a848 View commit details
    Browse the repository at this point in the history

  5. dialogue box show now sets appropriately 

    removed generic constructor
    usrnatc committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    365058c View commit details
    Browse the repository at this point in the history

  6. got it working but dialogue doesnt show up :(

    @alyshaziya
    alyshaziya committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    f8ce585 View commit details
    Browse the repository at this point in the history

  7. removed custom dialogue box display constructor 

    removed unneeded arguments from dialogue box display
removed dialogue box display from tutorial screen
    user committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    a73b811 View commit details
    Browse the repository at this point in the history

  8. Add dialogue box to tutorial game area 

    display dialogue box in tutorial game area
load tutorial game area from tutorial screen
    user committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    a79df2e View commit details
    Browse the repository at this point in the history

  9. Added HealthBarComponent to entities in the game. HealthBar distingui… 

    …shes between friendly and non-friendly entities.
    @hugh5
    hugh5 committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    625c95a View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/team-2-sprint-3' into team-2-spr… 

    …int-3
    @hugh5
    hugh5 committed Sep 27, 2022
    Configuration menu
    Copy the full SHA
    107c68d View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2022

  1. Health bar can be set to visible using debug command. Weather events … 

    …also lasts longer
    @hugh5
    hugh5 committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    53052d7 View commit details
    Browse the repository at this point in the history

  2. fixed imports

    @hugh5
    hugh5 committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    96d7d31 View commit details
    Browse the repository at this point in the history

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

    @hugh5
    hugh5 committed Sep 28, 2022
    Configuration menu
    Copy the full SHA
    d1942e3 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. Loading screen and loading bar displays after tutorial

    @hugh5
    hugh5 committed Oct 1, 2022
    Configuration menu
    Copy the full SHA
    a57ca98 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2022

  1. Added building health bar to info box display

    @hugh5
    hugh5 committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    99cec8b View commit details
    Browse the repository at this point in the history

  2. Added all orientations for beach and waves tiles, plus all frames for… 

    … animation (if implemented)
    syl2211 committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    c799cf0 View commit details
    Browse the repository at this point in the history

  3. combine the frames into a large image for each animation

    @nicococole
    nicococole committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    268ceb6 View commit details
    Browse the repository at this point in the history

  4. adding two type figures of grass and one figure of rain

    @nicococole
    nicococole committed Oct 2, 2022
    Configuration menu
    Copy the full SHA
    48f6823 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. Snowy animation completed and scaled to full screen size

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    96b2d83 View commit details
    Browse the repository at this point in the history

  2. Health Bar uses game time instead of system time

    @hugh5
    hugh5 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    50b1142 View commit details
    Browse the repository at this point in the history

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

    …studio-3 into team-2-sprint-3
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    62fe2e2 View commit details
    Browse the repository at this point in the history

  4. Added usefule function to health bar and created unit tests

    @hugh5
    hugh5 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    0a1bade View commit details
    Browse the repository at this point in the history

  5. Added individual waves frame

    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    f63b3ef View commit details
    Browse the repository at this point in the history

  6. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    544a5f9 View commit details
    Browse the repository at this point in the history

  7. Added animations for rain

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    e599bf0 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    7ef3a08 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    3c7db2e View commit details
    Browse the repository at this point in the history

  10. adding animitions of grass and rain

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    241f766 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    df72ea2 View commit details
    Browse the repository at this point in the history

  12. Added images for snowfall effect

    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    d29af24 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    25556a4 View commit details
    Browse the repository at this point in the history

  14. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    3f1b49e View commit details
    Browse the repository at this point in the history

  15. Changed ocean tiles

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    ac63be5 View commit details
    Browse the repository at this point in the history

  16. Added aniamations for stormy weather

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    9c642fc View commit details
    Browse the repository at this point in the history

  17. adding thunder and snow

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    392cc53 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    dd75645 View commit details
    Browse the repository at this point in the history

  19. Updated images for ocean tiles

    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    cbe6212 View commit details
    Browse the repository at this point in the history

  20. Fixed rain animations scaling issue and slowed down the ocean animati… 

    …on frame rate
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    5e12698 View commit details
    Browse the repository at this point in the history

  21. merge conflict for atlantis factory

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    7ebe73d View commit details
    Browse the repository at this point in the history

  22. Added updated ocean tiles, better orientation

    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2f73fe5 View commit details
    Browse the repository at this point in the history

  23. adding snow and thunder

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    a1cedd2 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    528ea20 View commit details
    Browse the repository at this point in the history

  25. adding figure of weather change to wiki' 

    /

'
    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2abcd65 View commit details
    Browse the repository at this point in the history

  26. adding grass figure to wiki

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    cebe1e7 View commit details
    Browse the repository at this point in the history

  27. adding figure to weather change file

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    af88a86 View commit details
    Browse the repository at this point in the history

  28. adding figure to wiki

    @nicococole
    nicococole committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    4da17ae View commit details
    Browse the repository at this point in the history

  29. Added images for sand to grass tiles

    syl2211 committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    bf5826b View commit details
    Browse the repository at this point in the history

  30. Chaned snow animation position

    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    2885919 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'team-2-sprint-3' of https://github.com/UQdeco2800/2022-… 

    …studio-3 into team-2-sprint-3
    @Spooey
    Spooey committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    6629fe5 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. merge conflicts

    @hugh5
    hugh5 committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    141a3c3 View commit details
    Browse the repository at this point in the history

  2. loading screen loads new assets

    @hugh5
    hugh5 committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    efad884 View commit details
    Browse the repository at this point in the history

  3. fixed failing unit test

    @hugh5
    hugh5 committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    fc71150 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into team-2-sprint-3 

    # Conflicts:
#	source/core/src/main/com/deco2800/game/areas/AtlantisGameArea.java
#	source/core/src/main/com/deco2800/game/entities/factories/BuildingFactory.java
#	source/core/src/main/com/deco2800/game/entities/factories/EnemyFactory.java
    @hugh5
    hugh5 committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    bcf35e9 View commit details
    Browse the repository at this point in the history

  5. imports

    @hugh5
    hugh5 committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    1761ebf View commit details
    Browse the repository at this point in the history