Merge branch 'main' into team-2-sound

.github/workflows/javadoc_publish.yaml

@@ -1,32 +1,32 @@
-name: Publish Javadoc to web
+# name: Publish Javadoc to web
 
-on: 
-  push:
-    # Sequence of patterns matched against refs/heads
-    branches:    
-      # Push events on main branch
-      - main
+# on: 
+#   push:
+#     # Sequence of patterns matched against refs/heads
+#     branches:    
+#       # Push events on main branch
+#       - main
 
-jobs:
-  build_and_publish_jdoc:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3 # Checkout repo to remote machine
-      - name: Set up OpenJDK17 
-        uses: actions/setup-java@v1
-        with:
-          java-version: '17'
+# jobs:
+#   build_and_publish_jdoc:
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3 # Checkout repo to remote machine
+#       - name: Set up OpenJDK17 
+#         uses: actions/setup-java@v1
+#         with:
+#           java-version: '17'
 
-      - name: Build Javadoc
-        run: |
-          cd $GRADLE_DIR
-          chmod +x ./gradlew
-          ./gradlew javadoc
-        env:
-          GRADLE_DIR: 'source' # Modify this to wherever './gradlew' is 
+#       - name: Build Javadoc
+#         run: |
+#           cd $GRADLE_DIR
+#           chmod +x ./gradlew
+#           ./gradlew javadoc
+#         env:
+#           GRADLE_DIR: 'source' # Modify this to wherever './gradlew' is 
 
-      - name: Deploy docs to GH Pages
-        uses: JamesIves/[email protected]
-        with:
-          branch: gh-pages # The branch the action should deploy to.
-          folder: source/core/build/docs/javadoc/ # The folder the action should deploy.
+#       - name: Deploy docs to GH Pages
+#         uses: JamesIves/[email protected]
+#         with:
+#           branch: gh-pages # The branch the action should deploy to.
+#           folder: source/core/build/docs/javadoc/ # The folder the action should deploy.

README.md

@@ -1,4 +1,4 @@
-# UQ 2023 Studio 3  
+# UQ 2023 Studio 3 
 
 ## Description
 

source/core/assets/configs/Bombship.json

@@ -0,0 +1,6 @@
+{
+  "Bombship" : {
+  "health": 100,
+  "baseAttack": 20
+}
+}

source/core/assets/images/bombship/bombship.atlas

@@ -0,0 +1,89 @@
+bombship.png
+size: 32, 286
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+destroy
+  rotate: false
+  xy: 0, 0
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+destroy
+  rotate: false
+  xy: 0, 32
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+destroy
+  rotate: false
+  xy: 0, 64
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+destroy
+  rotate: false
+  xy: 0, 96
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+destroy
+  rotate: false
+  xy: 0, 128
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 0, 160
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+idle
+  rotate: false
+  xy: 0, 160
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+idle
+  rotate: false
+  xy: 0, 181
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+idle
+  rotate: false
+  xy: 0, 202
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+start
+  rotate: false
+  xy: 0, 223
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+start
+  rotate: false
+  xy: 0, 244
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1
+start
+  rotate: false
+  xy: 0, 265
+  size: 26, 21
+  orig: 26, 21
+  offset: 0, 0
+  index: -1