-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'Team_7_s2' of https://github.com/UQcsse3200/2023-studio-3…
… into Team_7_s2
- Loading branch information
Showing
20 changed files
with
2,895 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,348 @@ | ||
| boss2.png | ||
| size: 980, 651 | ||
| format: RGBA8888 | ||
| filter: Linear,Linear | ||
| repeat: none | ||
| Idle | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 140, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 280, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| default | ||
| rotate: false | ||
| xy: 280, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 420, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 560, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 700, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 840, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 0, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Idle | ||
| rotate: false | ||
| xy: 140, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 280, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 420, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 560, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 700, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 840, 93 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 0, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 140, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 280, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Walk | ||
| rotate: false | ||
| xy: 420, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 560, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 700, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 840, 186 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 0, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 140, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 280, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 420, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 560, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 700, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A1 | ||
| rotate: false | ||
| xy: 840, 279 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 0, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 140, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 280, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 420, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 560, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Hurt | ||
| rotate: false | ||
| xy: 700, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 840, 372 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 0, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 140, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 280, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 420, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 560, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| boss_death | ||
| rotate: false | ||
| xy: 700, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Charging | ||
| rotate: false | ||
| xy: 840, 465 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Charging | ||
| rotate: false | ||
| xy: 0, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Charging | ||
| rotate: false | ||
| xy: 140, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Charging | ||
| rotate: false | ||
| xy: 280, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| Charging | ||
| rotate: false | ||
| xy: 420, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A2 | ||
| rotate: false | ||
| xy: 560, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| A2 | ||
| rotate: false | ||
| xy: 700, 558 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions
33
source/core/assets/images/projectiles/attack_projectile.atlas
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| attack_projectile.png | ||
| size: 420, 93 | ||
| format: RGBA8888 | ||
| filter: Linear,Linear | ||
| repeat: none | ||
| P | ||
| rotate: false | ||
| xy: 0, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| P | ||
| rotate: false | ||
| xy: 140, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| p | ||
| rotate: false | ||
| xy: 280, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 | ||
| default | ||
| rotate: false | ||
| xy: 280, 0 | ||
| size: 140, 93 | ||
| orig: 140, 93 | ||
| offset: 0, 0 | ||
| index: -1 |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.