Skip to content

Commit

Permalink
Merge pull request #254 from UQcsse3200/team-2-ahmad
Browse files Browse the repository at this point in the history
Team 2 ahmad
  • Loading branch information
The-AhmadAA authored Oct 14, 2023
2 parents dd19dbd + b158bc5 commit b616de7
Show file tree
Hide file tree
Showing 106 changed files with 3,739 additions and 10,250 deletions.
56 changes: 28 additions & 28 deletions .github/workflows/javadoc_publish.yaml
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# UQ 2023 Studio 3
# UQ 2023 Studio 3

## Description

Expand Down
770 changes: 0 additions & 770 deletions hs_err_pid11232.log

This file was deleted.

768 changes: 0 additions & 768 deletions hs_err_pid14780.log

This file was deleted.

786 changes: 0 additions & 786 deletions hs_err_pid19432.log

This file was deleted.

929 changes: 0 additions & 929 deletions hs_err_pid22188.log

This file was deleted.

765 changes: 0 additions & 765 deletions hs_err_pid22716.log

This file was deleted.

860 changes: 0 additions & 860 deletions hs_err_pid26164.log

This file was deleted.

801 changes: 0 additions & 801 deletions hs_err_pid27428.log

This file was deleted.

840 changes: 0 additions & 840 deletions hs_err_pid28328.log

This file was deleted.

808 changes: 0 additions & 808 deletions hs_err_pid29160.log

This file was deleted.

4 changes: 1 addition & 3 deletions source/core/assets/configs/Boss.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"mobBoss": {
"health": 100,
"baseAttack": 25,
"spookyFactor": 7
"baseAttack": 0
}
}
223 changes: 223 additions & 0 deletions source/core/assets/images/mobs/arcane_archer.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@

arcane_archer.png
size: 512, 256
format: RGBA8888
filter: Nearest, Nearest
repeat: none
arcane_archer_attack
rotate: false
xy: 290, 2
size: 65, 44
orig: 65, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 362, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 146, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 74, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 362, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 218, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_attack
rotate: false
xy: 362, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 2, 2
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 2, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 146, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 74, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 434, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 218, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 2, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_death
rotate: false
xy: 146, 2
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 434, 140
size: 69, 44
orig: 69, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 290, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 146, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 290, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 74, 2
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 146, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_dodge
rotate: false
xy: 290, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 74, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 2, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 218, 94
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 2, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 218, 2
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 290, 186
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 74, 140
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
arcane_archer_run
rotate: false
xy: 218, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
default
rotate: false
xy: 218, 48
size: 70, 44
orig: 70, 44
offset: 0, 0
index: -1
Binary file added source/core/assets/images/mobs/arcane_archer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b616de7

Please sign in to comment.