push your code #98

safayoussef · 2022-10-31T21:31:43Z

☑️ Definition of Done checklist

Meaningful title and valuable description in pull request
Code change tested manually if not covered by automated tests
Pull request linked to one or more issues/stories
Acceptance criteria of the linked stories satisfied
Code change comprehended by those who approved it
State of target branch maintained or improved after the code change
Go to MainActivityTest in the Android App and uncommit @test
Run test manually. Add a picture of the test result in the comments.
Comment @test again to avoid future problems with the CI

This commit enables player name and score to be saved in a SQL database. Then,the data can be retrived from the database to show it on the Leaderboard. The leaderboard also has a function to clear all player scores. Related Issues: #4 , #30 , #71

…Fragments

Since, the server will be removed. The game server workflow is not needed anymore.

The server directory is no longer needed since we are introducing the leaderboard inside the database.

The parameter "leaderboard.class" is replaced now with "Scoreboard.class"

Set export Schema to false for to avoid android CI error

…creen' into Database-Setup-and-Leaderboard-Screen

Your changes needs to be commited if you want to change branch and avoid losing the changes

Fixes related issue: #6

Closes related issue: #6

# Conflicts: # Android/islandRush/app/src/androidTest/java/com/quinstedt/islandRush/LeaderboardTest.kt # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/BrokerConnection.java # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/ControlPad.java # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/Joystick.java # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/MainActivity.java

The logic for save score screen is now implemented in the leaderboard animation class. The leaderboard activity and the save score screen is deleted. The position of number 5 is fixed.

This reverts commit 854be02.

…he animation and in the leaderbord and stored in the database.

Adding Mood CI tag in README

Modding Instruction Removed

Add annotation for camera in Smartcar Specification

# Conflicts: # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlChoice.java # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlPad.java # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/Joystick.java

Redy to merge

…PLAY_SCREEN # Conflicts: # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlChoice.java

Redy to merge

How to play Instructions and button Animation is approved

+ made a new mod with different starting point and option to get to more places on the island and on the other islands

Use 'actions/upload-artifact@v2' to try to export without zipping

+ removed Exploration.zip file

Exploration Mode and Race Mode

adding a screen before the race

Final Change. Waiting for the video to be inserted.

Small fixes

Closes related issue: #90

Closes related issue: #91

The README is complete now

Quinstedt and others added 30 commits May 18, 2022 10:53

removed the fragments and testing the Server alternatives

f77a520

Fixed the test so that they match this version

e55209c

Merge remote-tracking branch 'origin/Without-Fragments' into Without-…

ee8ee10

…Fragments

Delete gameServer-build.yml

701967b

Since, the server will be removed. The game server workflow is not needed anymore.

Delete GameServer directory

9dd097b

The server directory is no longer needed since we are introducing the leaderboard inside the database.

Merge branch 'master' into Database-Setup-and-Leaderboard-Screen

961aab5

Change parameter of a method

0043da6

The parameter "leaderboard.class" is replaced now with "Scoreboard.class"

Change PlayerScoreDatabase class

4e62e3f

Set export Schema to false for to avoid android CI error

Change build.gradle

6a5131a

Comment out leaderboard test

3c55baf

Improvements on Leaderboard screen

7774700

Comment out leaderboard test class

36e8d99

Create Instruction screen

7de60fe

Merge branch 'master' into Database-Setup-and-Leaderboard-Screen

4c6115d

Merge remote-tracking branch 'origin/Database-Setup-and-Leaderboard-S…

a520b9f

…creen' into Database-Setup-and-Leaderboard-Screen

fixed the bug created after the merge

68af5e3

Merge remote-tracking branch 'origin/Database-Setup-and-Leaderboard-S…

186c717

…creen' into Database-Setup-and-Leaderboard-Screen

Keep changes when switching branch

05cfd7c

Your changes needs to be commited if you want to change branch and avoid losing the changes

Added pause button for joystick and control pad

5d52372

Fixes related issue: #6

Fixed time readings

06dc500

Closes related issue: #6

Merge branch 'master' into Pause-Timer

a051cc8

Create a new branch for Instruction screen

ee5df67

Adapt save score screen logic

f695564

The logic for save score screen is now implemented in the leaderboard animation class. The leaderboard activity and the save score screen is deleted. The position of number 5 is fixed.

Adapt save score screen logic

5e56835

The logic for save score screen is now implemented in the leaderboard animation class. The leaderboard activity and the save score screen is deleted. The position of number 5 is fixed.

Small fixes

854be02

Revert "Small fixes"

6f3f132

This reverts commit 854be02.

Small fix

271e62f

the leaderboard bug has been fixed, the player name is shown now in t…

237ffa1

…he animation and in the leaderbord and stored in the database.

faisal1201 and others added 30 commits May 28, 2022 02:27

Merge pull request #92 from DIT113-V22/Modd-CI-Tag

0a598b2

Adding Mood CI tag in README

Update README.md

5821e99

Modding Instruction Removed

Update README.md

6671bc8

Add annotation for camera in Smartcar Specification

Merge remote-tracking branch 'origin/master' into HOW_TO_PLAY_SCREEN

88c07fa

Merge master to how to play screen

b1cbf88

updated some comments, all test passing manually

ee2642d

Redy to merge

Merge remote-tracking branch 'origin/HOW_TO_PLAY_SCREEN' into HOW_TO_…

738d3fb

…PLAY_SCREEN # Conflicts: # Android/islandRush/app/src/main/java/com/quinstedt/islandRush/activityClasses/ControlChoice.java

updated some comments, all test passing manually

57b1227

Redy to merge

Merge pull request #88 from DIT113-V22/HOW_TO_PLAY_SCREEN

f104389

How to play Instructions and button Animation is approved

Added Exploration Mode

1320093

+ made a new mod with different starting point and option to get to more places on the island and on the other islands

Fix artifact uploading error

c56449c

Use 'actions/upload-artifact@v2' to try to export without zipping

Updated modding information here as well

7cbc723

Updated modding instructions here as well

746f494

Added second Godot CI workflow

ac4b2f3

Changed directory name to fix CI

2b400e0

+ removed Exploration.zip file

Changed second directory name to fix CI

71b6ae5

adding a screen before the race

3e897fe

adding stopCar() before the animation of the leaderboard starts

fb84181

updating a bug that was found in the class

1412991

Decreased the check time in the finish line

4beaea5

constraint in the scoreboard

940dde0

Merge pull request #85 from DIT113-V22/Exploration-Mod

e653087

Exploration Mode and Race Mode

Merge pull request #96 from DIT113-V22/improvingRaceMode

59da1fb

adding a screen before the race

Update README.md

cd0db2e

Final Change. Waiting for the video to be inserted.

Update README.md

c8ff87d

Small fixes

Added banner for the game

75f0071

Added the link to the video

6273ed8

Closes related issue: #90

Finalized Readme

a8dbd3d

Closes related issue: #91

Merge pull request #91 from DIT113-V22/Update-Readme

3bd2045

The README is complete now

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

push your code #98

push your code #98

safayoussef commented Oct 31, 2022 •

edited by Quinstedt

Loading

push your code #98

Are you sure you want to change the base?

push your code #98

Conversation

safayoussef commented Oct 31, 2022 • edited by Quinstedt Loading

☑️ Definition of Done checklist

safayoussef commented Oct 31, 2022 •

edited by Quinstedt

Loading