Code

Team 3 Pull Request Sprint 4#294

Code

Merged

The-AhmadAA merged 104 commits intomainUQcsse3200/2023-studio-3:mainfrom t3branchUQcsse3200/2023-studio-3:t3branchCopy head branch name to clipboardOct 17, 2023

+3,478-526

Commits

Commits on Oct 7, 2023

• ForestGameArea clean up into AssetLoader

  Gaganx0

  committed
  81214e2

  Copy full SHA for 81214e2

• LoadingScreen

  Gaganx0

  committed
  8cfb8af

  Copy full SHA for 8cfb8af

• LoadingScreen update

  Gaganx0

  committed
  f970693

  Copy full SHA for f970693

• LoadingScreen updated

  Gaganx0

  committed
  b9a5fcd

  Copy full SHA for b9a5fcd

• Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3 into t3branch

  Gaganx0

  committed
  e2dde73

  Copy full SHA for e2dde73

• Help Screens Creation

  Gaganx0

  committed
  fde2634

  Copy full SHA for fde2634

• Basic code for new screens

  Gaganx0

  committed
  f0f8c2e

  Copy full SHA for f0f8c2e

• Buttons and transition logic for new help screens

  Gaganx0

  committed
  b961b8c

  Copy full SHA for b961b8c

• Basic Tower help screen

  Gaganx0

  committed
  5e8ecb0

  Copy full SHA for 5e8ecb0

• Buttons update

  Gaganx0

  committed
  bdbd074

  Copy full SHA for bdbd074

• BossMobs help screen creation, Updated Bgs

  Gaganx0

  committed
  4eb450c

  Copy full SHA for 4eb450c

• TowerDescriptionHelpScreen updated

  Gaganx0

  committed
  fc3ad18

  Copy full SHA for fc3ad18

• Typos fixed

  Gaganx0

  committed
  c3c0c1c

  Copy full SHA for c3c0c1c

Commits on Oct 8, 2023

• Game Description screen layout and placeholder images addd

  Gaganx0

  committed
  84acccc

  Copy full SHA for 84acccc

• Images added to GameDescriptionHelpScreen

  Gaganx0

  committed
  0693734

  Copy full SHA for 0693734

• Images added to GameDescriptionHelpScreen

  Gaganx0

  committed
  24d2e20

  Copy full SHA for 24d2e20

• Text added for the images

  Gaganx0

  committed
  338e133

  Copy full SHA for 338e133

• How to play screen added

  Gaganx0

  committed
  91d85cd

  Copy full SHA for 91d85cd

• How to play screen described

  Gaganx0

  committed
  1ea8bf7

  Copy full SHA for 1ea8bf7

Commits on Oct 9, 2023

• Added WinningScreen

  Moksh-Mehta7

  committed
  45000f6

  Copy full SHA for 45000f6

• Added NextLevelScreen

  Moksh-Mehta7

  committed
  0a16e65

  Copy full SHA for 0a16e65

• Text descriptions for Mobs in mobdescriptionscreen

  Gaganx0

  committed
  e8e6e98

  Copy full SHA for e8e6e98

• Images for Mobs in mobdescriptionscreen

  Gaganx0

  committed
  060d0b1

  Copy full SHA for 060d0b1

• Image size and path fixed

  Gaganx0

  committed
  030a2ea

  Copy full SHA for 030a2ea

• Images and description for mob bosses

  Gaganx0

  committed
  fc9f6dc

  Copy full SHA for fc9f6dc

• Images resized, stage added.

  Gaganx0

  committed
  af06f6f

  Copy full SHA for af06f6f

• Tuturial button added

  Gaganx0

  committed
  0d1ac2e

  Copy full SHA for 0d1ac2e

• Base code( MainGameScreen) code added to tutorial

  Gaganx0

  committed
  c60d6ae

  Copy full SHA for c60d6ae

• Added base ingame code for tutorial( Forestgamearea)

  Gaganx0

  committed
  027ef30

  Copy full SHA for 027ef30

Commits on Oct 11, 2023

• Game Title added to Main Menu

  aadityayadav17

  committed
  bcc94d0

  Copy full SHA for bcc94d0

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Gaganx0

  committed
  ac6098e

  Copy full SHA for ac6098e

Commits on Oct 12, 2023

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  1d72e17

  Copy full SHA for 1d72e17

Commits on Oct 13, 2023

• Merge branch 'Team-4---Waves' into t3branch

  Show description for acd198f
  Moksh-Mehta7

  committed
  acd198f

  Copy full SHA for acd198f

• Main Menu Screen - Added title, fixed resizing issue & reduce redundancy

  aadityayadav17

  committed
  f5dc0a6

  Copy full SHA for f5dc0a6

Commits on Oct 14, 2023

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  5bbb999

  Copy full SHA for 5bbb999

• SettingsScreen resizing issue fixed

  aadityayadav17

  committed
  faafb4b

  Copy full SHA for faafb4b

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  e21eaf1

  Copy full SHA for e21eaf1

• Merge remote-tracking branch 'origin/Team4-LevelCompleted-Megan' into t3branch

  Show description for e445867
  Moksh-Mehta7

  committed
  e445867

  Copy full SHA for e445867

• Added Triggers to the Next and win screen

  Moksh-Mehta7

  committed
  7dd01a8

  Copy full SHA for 7dd01a8

• Added Background to Next Level Screen

  Moksh-Mehta7

  committed
  7e80840

  Copy full SHA for 7e80840

• Added Background to Losing Screen

  Moksh-Mehta7

  committed
  afbc6be

  Copy full SHA for afbc6be

• made next level working goes to level select

  Moksh-Mehta7

  committed
  930155a

  Copy full SHA for 930155a

• made next level working goes to level select

  Moksh-Mehta7

  committed
  a8f8e3b

  Copy full SHA for a8f8e3b

• Added Java Doc

  Moksh-Mehta7

  committed
  fd986c1

  Copy full SHA for fd986c1

Commits on Oct 15, 2023

• Tutorial clean up and next button

  Gaganx0

  committed
  867accd

  Copy full SHA for 867accd

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Show description for 03e729f
  Gaganx0

  committed
  03e729f

  Copy full SHA for 03e729f

• merge error fixed

  Gaganx0

  committed
  9b3cb8a

  Copy full SHA for 9b3cb8a

• Team 3

  Moksh-Mehta7

  committed
  826721a

  Copy full SHA for 826721a

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  c2f47ce

  Copy full SHA for c2f47ce

• LevelLock 1/n

  aadityayadav17

  committed
  54fce2b

  Copy full SHA for 54fce2b

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Show description for af99a9a
  aadityayadav17

  committed
  af99a9a

  Copy full SHA for af99a9a

Commits on Oct 16, 2023

• implemented story screen again

  Octagunn

  committed
  b7d4ae4

  Copy full SHA for b7d4ae4

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Show description for f693651
  Octagunn

  committed
  f693651

  Copy full SHA for f693651

• Pause on open in tutorial

  Gaganx0

  committed
  ff11ce5

  Copy full SHA for ff11ce5

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  aadityayadav17

  committed
  9f39a2c

  Copy full SHA for 9f39a2c

• LevelLock 2/n

  aadityayadav17

  committed
  d8a72bc

  Copy full SHA for d8a72bc

• LevelLock 3/n

  aadityayadav17

  committed
  b05f6ac

  Copy full SHA for b05f6ac

• Buttons adjusted

  Gaganx0

  committed
  f1a5828

  Copy full SHA for f1a5828

• Tutorial instructions added

  Gaganx0

  committed
  3a91919

  Copy full SHA for 3a91919

• LevelLock 4/n

  aadityayadav17

  committed
  b2f6940

  Copy full SHA for b2f6940

• LevelLock 5/n

  aadityayadav17

  committed
  0156ebf

  Copy full SHA for 0156ebf

• Next Button logic added

  Gaganx0

  committed
  93b7bbb

  Copy full SHA for 93b7bbb

• Next continue backend

  Gaganx0

  committed
  92ddf34

  Copy full SHA for 92ddf34

• implemented level select screen

  Octagunn

  committed
  4cad466

  Copy full SHA for 4cad466

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Gaganx0

  committed
  401e3ae

  Copy full SHA for 401e3ae

• Tutorial Completed

  Gaganx0

  committed
  fb9f76b

  Copy full SHA for fb9f76b

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Show description for 9b8a3a6
  aadityayadav17

  committed
  9b8a3a6

  Copy full SHA for 9b8a3a6

• Tutorial errors fixed

  Gaganx0

  committed
  5d34913

  Copy full SHA for 5d34913

• LevelLock 6/n

  aadityayadav17

  committed
  62dce2c

  Copy full SHA for 62dce2c

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Gaganx0

  committed
  8ff669a

  Copy full SHA for 8ff669a

• Merged Main into T3

  Moksh-Mehta7

  committed
  c37532c

  Copy full SHA for c37532c

• Fixed some error

  Moksh-Mehta7

  committed
  b1ae073

  Copy full SHA for b1ae073

• Resizing fixed

  aadityayadav17

  committed
  31ad595

  Copy full SHA for 31ad595

• Removed Boxed Boy

  Moksh-Mehta7

  committed
  1d13463

  Copy full SHA for 1d13463

• Removed Boxed Boy

  Moksh-Mehta7

  committed
  d35d359

  Copy full SHA for d35d359

• Merge errors fixed

  Gaganx0

  committed
  34848ec

  Copy full SHA for 34848ec

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Show description for e84a4cb
  Gaganx0

  committed
  e84a4cb

  Copy full SHA for e84a4cb

• made changes in losing screen

  Moksh-Mehta7

  committed
  a3494f4

  Copy full SHA for a3494f4

• made changes in NextLevelScreen

  Moksh-Mehta7

  committed
  3a9925c

  Copy full SHA for 3a9925c

• Story Screen

  aadityayadav17

  committed
  e908c51

  Copy full SHA for e908c51

• Loading Screen

  Gaganx0

  committed
  8e29c7e

  Copy full SHA for 8e29c7e

• loading screen

  Nidhidass1

  committed
  26b6b96

  Copy full SHA for 26b6b96

• Loading Screen Background Added

  Nidhidass1

  committed
  79ace2b

  Copy full SHA for 79ace2b

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  63fbd88

  Copy full SHA for 63fbd88

• LevelSelect Screen planet border fixed

  Gaganx0

  committed
  a1638fe

  Copy full SHA for a1638fe

• made changes in WinningScreen

  Moksh-Mehta7

  committed
  dba8a7a

  Copy full SHA for dba8a7a

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  1f34223

  Copy full SHA for 1f34223

• Font Change for LevelSelectScreen

  aadityayadav17

  committed
  eb0cae2

  Copy full SHA for eb0cae2

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  aadityayadav17

  committed
  a1ec628

  Copy full SHA for a1ec628

• MainMenuScreen Maintainability

  aadityayadav17

  committed
  0a8b568

  Copy full SHA for 0a8b568

• Added Test file for AnimationTexturePair

  Moksh-Mehta7

  committed
  f9381ad

  Copy full SHA for f9381ad

• Added Java Doc

  Gaganx0

  committed
  a70be9d

  Copy full SHA for a70be9d

• Added JavaDoc

  aadityayadav17

  committed
  2a4f41e

  Copy full SHA for 2a4f41e

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  aadityayadav17

  committed
  0602b96

  Copy full SHA for 0602b96

• Merge branch 'main' into t3branch

  aadityayadav17

  committed
  7584f55

  Copy full SHA for 7584f55

• Added Test file for AssetLoader

  Moksh-Mehta7

  committed
  2c371a0

  Copy full SHA for 2c371a0

• Merge

  aadityayadav17

  committed
  a63bfb0

  Copy full SHA for a63bfb0

• Merge remote-tracking branch 'origin/t3branch' into t3branch

  Moksh-Mehta7

  committed
  667df0c

  Copy full SHA for 667df0c

• Back button in tutorial

  Gaganx0

  committed
  346aeed

  Copy full SHA for 346aeed

Commits on Oct 17, 2023

• Merge branch 'main' into t3branch

  Show description for d4d0e1c
  aadityayadav17

  committed
  d4d0e1c

  Copy full SHA for d4d0e1c

• merge main in t3branch

  aadityayadav17

  committed
  e011f17

  Copy full SHA for e011f17

• Merge branch 'main' into t3branch

  aadityayadav17

  committed
  f926875

  Copy full SHA for f926875

• Merge branch 'main' of https://github.com/UQcsse3200/2023-studio-3 into t3branch

  Gaganx0

  committed
  4260c71

  Copy full SHA for 4260c71

• Merge branch 'main' into t3branch

  Moksh-Mehta7

  committed
  242dbbe

  Copy full SHA for 242dbbe