Tutorial screen2 #4

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

Open

alice-wondering wants to merge 96 commits into ejap501:master from booksaw:tutorialScreen2

.github/workflows/gradle.yml

-Original file line number
+Diff line change
@@ -0,0 +1,44 @@
+    # This workflow uses actions that are not certified by GitHub.
+    # They are provided by a third-party and are governed by
+    # separate terms of service, privacy policy, and support
+    # documentation.
+    # This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+    # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+    name: Java CI with Gradle
+    on:
+      push:
+        branches: [ master ]
+      pull_request:
+        branches: [ master ]
+    jobs:
+      build:
+        runs-on: ubuntu-latest
+        steps:
+        - uses: actions/checkout@v2
+        - name: Set up JDK 11
+          uses: actions/setup-java@v2
+          with:
+            java-version: '11'
+            distribution: 'temurin'
+    #    - name: Build with Gradle
+    #      uses: gradle/gradle-build-action@937999e9cc2425eddc7fd62d1053baf041147db7
+    #      with:
+    #        arguments: desktop:dist
+        - name: Make gradlew executable
+          run: chmod +x ./gradlew
+        - name: Build with Gradle
+          run: ./gradlew desktop:dist
+        - name: Run tests with Gradle
+          run: ./gradlew test
+        - name: Upload a Build Artifact
+          uses: actions/upload-artifact@v2.3.1
+          with:
+            name: Spice_Traders
+            path: desktop/build/libs/desktop-1.0.jar

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -113,3 +113,4 @@ Thumbs.db @@
     /ios/xcode/native/
     /ios/IOSLauncher.app
     /ios/IOSLauncher.app.dSYM
+    core/src/com/mygdx/pirategame/gameobjects/CannonFire_Old.java

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -58,6 +58,38 @@ project(":core") { @@
         dependencies {
             api "com.badlogicgames.gdx:gdx:$gdxVersion"
             api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+            testCompile "junit:junit:4.+"
+            testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+            testCompile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+            testImplementation "org.mockito:mockito-core:3.+"
+        }
+    }
+    project(":test") {
+        apply plugin: "java-library"
+        sourceSets.test.java.srcDirs = ["src/"]
+        dependencies {
+            compile project(":desktop")
+            compile project(":core")
+            api "com.badlogicgames.gdx:gdx:$gdxVersion"
+            api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+            testCompile 'junit:junit:4.+'
+            testCompile "com.badlogicgames.gdx:gdx-backend-headless:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+            testCompile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+            testCompile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+            testImplementation "org.mockito:mockito-core:3.+"
         }
     }

core/assets/Tutorial.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

0 core/assets/W.png → core/assets/Unused/W.png

File renamed without changes

0 core/assets/minimap.png → core/assets/Unused/minimap.png

File renamed without changes

0 core/assets/alcuin_flag.png → core/assets/college/Flags/alcuin_flag.png

File renamed without changes

0 core/assets/anne_lister_flag.png → ...assets/college/Flags/anne_lister_flag.png

File renamed without changes

0 core/assets/constantine_flag.png → ...assets/college/Flags/constantine_flag.png

File renamed without changes

0 core/assets/derwent_flag.png → core/assets/college/Flags/derwent_flag.png

File renamed without changes

0 core/assets/goodricke_flag.png → core/assets/college/Flags/goodricke_flag.png

File renamed without changes

0 core/assets/halifax_flag.png → core/assets/college/Flags/halifax_flag.png

File renamed without changes

0 core/assets/james_flag.png → core/assets/college/Flags/james_flag.png

File renamed without changes

0 core/assets/langwith_flag.png → core/assets/college/Flags/langwith_flag.png

File renamed without changes

0 core/assets/vanbrugh_flag.png → core/assets/college/Flags/vanbrugh_flag.png

File renamed without changes

0 core/assets/alcuin_ship.png → core/assets/college/Ships/alcuin_ship.png

File renamed without changes

0 core/assets/anne_lister_ship.png → ...assets/college/Ships/anne_lister_ship.png

File renamed without changes

0 core/assets/constantine_ship.png → ...assets/college/Ships/constantine_ship.png

File renamed without changes

0 core/assets/derwent_ship.png → core/assets/college/Ships/derwent_ship.png

File renamed without changes

0 core/assets/enemyShip1.png → core/assets/college/Ships/enemyShip1.png

File renamed without changes

0 core/assets/goodricke_ship.png → core/assets/college/Ships/goodricke_ship.png

File renamed without changes

0 core/assets/player_ship.png → core/assets/college/Ships/player_ship.png

File renamed without changes

0 core/assets/ship.png → core/assets/college/Ships/ship.png

File renamed without changes

0 core/assets/ship1.png → core/assets/college/Ships/ship1.png

File renamed without changes

0 core/assets/unaligned_ship.png → core/assets/college/Ships/unaligned_ship.png

File renamed without changes

0 core/assets/islands.tsx → core/assets/map/islands.tsx

File renamed without changes.

core/assets/map.tmx → core/assets/map/map.tmx

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     <?xml version="1.0" encoding="UTF-8"?>
-    <map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="64" tileheight="64" infinite="0" nextlayerid="21" nextobjectid="1575">
+    <map version="1.5" tiledversion="1.7.2" orientation="orthogonal" renderorder="right-down" width="128" height="128" tilewidth="64" tileheight="64" infinite="0" nextlayerid="21" nextobjectid="1580">
      <editorsettings>
       <export target="../../../Desktop/map..tmx" format="tmx"/>
      </editorsettings>
@@ Expand Down Expand Up / @@ -659,6 +659,7 @@ @@
       <object id="1483" x="1472" y="5952" width="192" height="64"/>
       <object id="1484" x="1664" y="5888" width="256" height="64"/>
       <object id="1485" x="1920" y="5824" width="64" height="64"/>
+      <object id="1578" x="3200" y="7168.5" width="63.75" height="63.25"/>
      </objectgroup>
      <objectgroup id="15" name="CollegeWalls1" visible="0">
       <object id="1486" x="1792" y="5952" width="320" height="320"/>
@@ Expand Down @@

0 core/assets/rocks.tsx → core/assets/map/rocks.tsx

File renamed without changes.

0 core/assets/tile_01.png → core/assets/map/tile_01.png

File renamed without changes

0 core/assets/tile_02.png → core/assets/map/tile_02.png

File renamed without changes

0 core/assets/tile_03.png → core/assets/map/tile_03.png

File renamed without changes

0 core/assets/tile_04.png → core/assets/map/tile_04.png

File renamed without changes

0 core/assets/tile_05.png → core/assets/map/tile_05.png

File renamed without changes

0 core/assets/tile_06.png → core/assets/map/tile_06.png

File renamed without changes

0 core/assets/tile_07.png → core/assets/map/tile_07.png

File renamed without changes

0 core/assets/tile_08.png → core/assets/map/tile_08.png

File renamed without changes

0 core/assets/tile_09.png → core/assets/map/tile_09.png

File renamed without changes

0 core/assets/tile_10.png → core/assets/map/tile_10.png

File renamed without changes

0 core/assets/tile_11.png → core/assets/map/tile_11.png

File renamed without changes

0 core/assets/tile_12.png → core/assets/map/tile_12.png

File renamed without changes

0 core/assets/tile_13.png → core/assets/map/tile_13.png

File renamed without changes

0 core/assets/tile_14.png → core/assets/map/tile_14.png

File renamed without changes

0 core/assets/tile_15.png → core/assets/map/tile_15.png

File renamed without changes

0 core/assets/tile_16.png → core/assets/map/tile_16.png

File renamed without changes

0 core/assets/tile_17.png → core/assets/map/tile_17.png

File renamed without changes

0 core/assets/tile_18.png → core/assets/map/tile_18.png

File renamed without changes

0 core/assets/tile_19.png → core/assets/map/tile_19.png

File renamed without changes

0 core/assets/tile_20.png → core/assets/map/tile_20.png

File renamed without changes

0 core/assets/tile_21.png → core/assets/map/tile_21.png

File renamed without changes

0 core/assets/tile_22.png → core/assets/map/tile_22.png

File renamed without changes

0 core/assets/tile_23.png → core/assets/map/tile_23.png

File renamed without changes

0 core/assets/tile_24.png → core/assets/map/tile_24.png

File renamed without changes

0 core/assets/tile_25.png → core/assets/map/tile_25.png

File renamed without changes

0 core/assets/tile_26.png → core/assets/map/tile_26.png

File renamed without changes

0 core/assets/tile_27.png → core/assets/map/tile_27.png

File renamed without changes

0 core/assets/tile_28.png → core/assets/map/tile_28.png

File renamed without changes

0 core/assets/tile_29.png → core/assets/map/tile_29.png

File renamed without changes

0 core/assets/tile_30.png → core/assets/map/tile_30.png

File renamed without changes

0 core/assets/tile_31.png → core/assets/map/tile_31.png

File renamed without changes

0 core/assets/tile_32.png → core/assets/map/tile_32.png

File renamed without changes

0 core/assets/tile_33.png → core/assets/map/tile_33.png

File renamed without changes

0 core/assets/tile_34.png → core/assets/map/tile_34.png

File renamed without changes

0 core/assets/tile_35.png → core/assets/map/tile_35.png

File renamed without changes

0 core/assets/tile_36.png → core/assets/map/tile_36.png

File renamed without changes

0 core/assets/tile_37.png → core/assets/map/tile_37.png

File renamed without changes

0 core/assets/tile_38.png → core/assets/map/tile_38.png

File renamed without changes

0 core/assets/tile_39.png → core/assets/map/tile_39.png

File renamed without changes

0 core/assets/tile_40.png → core/assets/map/tile_40.png

File renamed without changes

0 core/assets/tile_41.png → core/assets/map/tile_41.png

File renamed without changes

0 core/assets/tile_42.png → core/assets/map/tile_42.png

File renamed without changes

0 core/assets/tile_43.png → core/assets/map/tile_43.png

File renamed without changes

0 core/assets/tile_44.png → core/assets/map/tile_44.png

File renamed without changes

0 core/assets/tile_45.png → core/assets/map/tile_45.png

File renamed without changes

0 core/assets/tile_46.png → core/assets/map/tile_46.png

File renamed without changes

0 core/assets/tile_47.png → core/assets/map/tile_47.png

File renamed without changes

0 core/assets/tile_48.png → core/assets/map/tile_48.png

File renamed without changes

0 core/assets/tile_49.png → core/assets/map/tile_49.png

File renamed without changes

0 core/assets/tile_50.png → core/assets/map/tile_50.png

File renamed without changes

0 core/assets/tile_51.png → core/assets/map/tile_51.png

File renamed without changes

0 core/assets/tile_52.png → core/assets/map/tile_52.png

File renamed without changes

0 core/assets/tile_53.png → core/assets/map/tile_53.png

File renamed without changes

0 core/assets/tile_54.png → core/assets/map/tile_54.png

File renamed without changes

0 core/assets/tile_55.png → core/assets/map/tile_55.png

File renamed without changes

0 core/assets/tile_56.png → core/assets/map/tile_56.png

File renamed without changes

0 core/assets/tile_57.png → core/assets/map/tile_57.png

File renamed without changes

0 core/assets/tile_58.png → core/assets/map/tile_58.png

File renamed without changes

0 core/assets/tile_59.png → core/assets/map/tile_59.png

File renamed without changes

0 core/assets/tile_60.png → core/assets/map/tile_60.png

File renamed without changes

0 core/assets/tile_61.png → core/assets/map/tile_61.png

File renamed without changes

0 core/assets/tile_62.png → core/assets/map/tile_62.png

File renamed without changes

0 core/assets/tile_63.png → core/assets/map/tile_63.png

File renamed without changes

0 core/assets/tile_64.png → core/assets/map/tile_64.png

File renamed without changes

0 core/assets/tile_65.png → core/assets/map/tile_65.png

File renamed without changes

0 core/assets/tile_66.png → core/assets/map/tile_66.png

File renamed without changes

0 core/assets/tile_67.png → core/assets/map/tile_67.png

File renamed without changes

0 core/assets/tile_68.png → core/assets/map/tile_68.png

File renamed without changes

0 core/assets/tile_69.png → core/assets/map/tile_69.png

File renamed without changes

0 core/assets/tile_70.png → core/assets/map/tile_70.png

File renamed without changes

0 core/assets/tile_71.png → core/assets/map/tile_71.png

File renamed without changes

0 core/assets/tile_72.png → core/assets/map/tile_72.png

File renamed without changes

0 core/assets/tile_73.png → core/assets/map/tile_73.png

File renamed without changes

0 core/assets/tile_74.png → core/assets/map/tile_74.png

File renamed without changes

0 core/assets/tile_75.png → core/assets/map/tile_75.png

File renamed without changes

0 core/assets/tile_76.png → core/assets/map/tile_76.png

File renamed without changes

0 core/assets/tile_77.png → core/assets/map/tile_77.png

File renamed without changes

0 core/assets/tile_78.png → core/assets/map/tile_78.png

File renamed without changes

0 core/assets/tile_79.png → core/assets/map/tile_79.png

File renamed without changes

0 core/assets/tile_80.png → core/assets/map/tile_80.png

File renamed without changes

0 core/assets/tile_81.png → core/assets/map/tile_81.png

File renamed without changes

0 core/assets/tile_82.png → core/assets/map/tile_82.png

File renamed without changes

0 core/assets/tile_83.png → core/assets/map/tile_83.png

File renamed without changes

0 core/assets/tile_84.png → core/assets/map/tile_84.png

File renamed without changes

0 core/assets/tile_85.png → core/assets/map/tile_85.png

File renamed without changes

0 core/assets/tile_86.png → core/assets/map/tile_86.png

File renamed without changes

0 core/assets/tile_87.png → core/assets/map/tile_87.png

File renamed without changes

0 core/assets/tile_88.png → core/assets/map/tile_88.png

File renamed without changes

0 core/assets/tile_93.png → core/assets/map/tile_93.png

File renamed without changes

0 core/assets/tile_94.png → core/assets/map/tile_94.png

File renamed without changes

0 core/assets/water.tsx → core/assets/map/water.tsx

File renamed without changes.

core/assets/map_blurred.png

0 core/assets/coin-pickup.mp3 → core/assets/sfx_and_music/coin-pickup.mp3

File renamed without changes.

core/assets/sfx_and_music/explode.mp3

Binary file not shown.

0 core/assets/explosion.wav → core/assets/sfx_and_music/explosion.wav

File renamed without changes.

0 core/assets/pirate-music.mp3 → core/assets/sfx_and_music/pirate-music.mp3

File renamed without changes.

0 core/assets/ship-explosion-2.wav → ...assets/sfx_and_music/ship-explosion-2.wav

File renamed without changes.

0 core/assets/ship-hit.wav → core/assets/sfx_and_music/ship-hit.wav

File renamed without changes.

0 core/assets/wood-bump.mp3 → core/assets/sfx_and_music/wood-bump.mp3

File renamed without changes.

core/build.gradle

-Original file line number
+Diff line change
@@ -1,6 +1,13 @@
     sourceCompatibility = 1.7
+    dependencies {
+        implementation 'com.badlogicgames.gdx:gdx-backend-headless:1.10.0'
+        implementation 'junit:junit:4.11'
+        implementation 'org.mockito:mockito-all:1.10.7'
+    }
     [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
-    sourceSets.main.java.srcDirs = [ "src/" ]
+    sourceSets.main.java.srcDirs = [ "src/main/java" ]
+    sourceSets.test.java.srcDirs = [ "src/test/java" ]
+    sourceSets.test.resources.srcDirs = ["../core/assets"]
     eclipse.project.name = appName + "-core"

core/src/com/mygdx/pirategame/Coin.java

This file was deleted.

core/src/com/mygdx/pirategame/EnemyShip.java

This file was deleted.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tutorial screen2 #4

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Tutorial screen2 #4

Are you sure you want to change the base?

Uh oh!

Tutorial screen2 #4

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Uh oh!