Skip to content

Commit

Permalink
Merge branch 'main' into team-2-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
The-AhmadAA authored Oct 3, 2023
2 parents b5892f7 + a508d2d commit 16944ab
Show file tree
Hide file tree
Showing 41 changed files with 3,099 additions and 17 deletions.
6 changes: 6 additions & 0 deletions source/core/assets/configs/Bombship.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"Bombship" : {
"health": 100,
"baseAttack": 20
}
}
89 changes: 89 additions & 0 deletions source/core/assets/images/bombship/bombship.atlas
Original file line number Diff line number Diff line change
@@ -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
Binary file added source/core/assets/images/bombship/bombship.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
299 changes: 299 additions & 0 deletions source/core/assets/images/towers/PierceTower.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,299 @@
PierceTower.png
size: 896, 192
format: RGBA8888
filter: Linear,Linear
repeat: none
Attack
rotate: false
xy: 0, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 64, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 128, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 192, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 256, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 320, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 384, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 448, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 512, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 576, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 640, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 704, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 768, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 832, 0
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 0, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 64, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Attack
rotate: false
xy: 128, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 192, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 256, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 320, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 384, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 448, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 512, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 576, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 640, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 704, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 768, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 832, 64
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Death
rotate: false
xy: 0, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 64, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 128, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 192, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 256, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 320, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Idle
rotate: false
xy: 384, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Default
rotate: false
xy: 256, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 448, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 512, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 576, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 640, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 704, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Warning
rotate: false
xy: 768, 128
size: 64, 64
orig: 64, 64
offset: 0, 0
index: -1
Binary file added source/core/assets/images/towers/PierceTower.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 16944ab

Please sign in to comment.