Skip to content

Commit

Permalink
resolved merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
shiv-0831 committed Sep 9, 2023
2 parents 2a1b8e8 + 9c39e7b commit eb7fcfa
Show file tree
Hide file tree
Showing 720 changed files with 5,101 additions and 409 deletions.
770 changes: 770 additions & 0 deletions hs_err_pid11232.log

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions source/core/assets/configs/Engineers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"engineer" : {
"health": 100,
"baseAttack": 5
}
}
7 changes: 7 additions & 0 deletions source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"baseAttack": 0,
"cost": 1
},
<<<<<<< HEAD
"fireTower": {
"health": 10,
"baseAttack": 10,
Expand All @@ -23,5 +24,11 @@
"health": 10,
"baseAttack": 10,
"cost": 10
=======
"TNTTower": {
"health": 10,
"baseAttack": 5,
"cost": 1
>>>>>>> main
}
}
Binary file added source/core/assets/images/Dusty_MoonBG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/economy/crystal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/core/assets/images/economy/crystalUI.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions source/core/assets/images/economy/econ-tower.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@

econ-tower.png
size: 256, 64
format: RGBA8888
filter: Nearest, Nearest
repeat: none
idle
rotate: false
xy: 122, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 122, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 32, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 182, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 92, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 2, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 152, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
move1
rotate: false
xy: 62, 2
size: 28, 31
orig: 28, 31
offset: 0, 0
index: -1
Binary file added source/core/assets/images/economy/econ-tower.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 eb7fcfa

Please sign in to comment.