Skip to content

Commit

Permalink
Merge branch 'main' into Team6
Browse files Browse the repository at this point in the history
  • Loading branch information
rahulsagar500 authored Sep 12, 2023
2 parents 44b6afc + 4b79697 commit 9197017
Showing 109 changed files with 4,122 additions and 936 deletions.
Binary file removed source/core/assets/badlogic.jpg
Binary file not shown.
1 change: 0 additions & 1 deletion source/core/assets/configs/tower.json
Original file line number Diff line number Diff line change
@@ -33,6 +33,5 @@
"health": 10,
"baseAttack": 10,
"cost": 10

}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/core/assets/images/economy/crystalUI.png
Binary file not shown.
Binary file added source/core/assets/images/economy/scrapBanner.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 removed source/core/assets/images/economy/scrapsUI.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified source/core/assets/images/ingamebg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/lose-screen/lose-bg.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes.
55 changes: 55 additions & 0 deletions source/core/assets/images/projectiles/burn_effect.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@

burn_effect.png
size: 256, 64
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 78, 2
size: 36, 31
orig: 36, 31
offset: 0, 0
index: -1
projectile
rotate: false
xy: 2, 2
size: 36, 31
orig: 36, 31
offset: 0, 0
index: -1
projectile
rotate: false
xy: 154, 2
size: 35, 31
orig: 35, 31
offset: 0, 0
index: -1
projectile
rotate: false
xy: 40, 2
size: 36, 31
orig: 36, 31
offset: 0, 0
index: -1
projectile
rotate: false
xy: 116, 2
size: 36, 31
orig: 36, 31
offset: 0, 0
index: -1
projectileFinal
rotate: false
xy: 191, 2
size: 31, 31
orig: 31, 31
offset: 0, 0
index: -1
default
rotate: false
xy: 78, 2
size: 36, 31
orig: 36, 31
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.
41 changes: 41 additions & 0 deletions source/core/assets/images/projectiles/firework_anim.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

firework_anim.png
size: 128, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 23, 2
size: 19, 16
orig: 19, 16
offset: 0, 0
index: -1
projectile
rotate: false
xy: 65, 2
size: 19, 16
orig: 19, 16
offset: 0, 0
index: -1
projectile
rotate: false
xy: 44, 2
size: 19, 16
orig: 19, 16
offset: 0, 0
index: -1
projectile
rotate: false
xy: 2, 2
size: 19, 16
orig: 19, 16
offset: 0, 0
index: -1
default
rotate: false
xy: 23, 2
size: 19, 16
orig: 19, 16
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.
41 changes: 41 additions & 0 deletions source/core/assets/images/projectiles/oldstun_effect.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

stun_effect.png
size: 256, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 86, 3
size: 41, 27
orig: 41, 27
offset: 0, 0
index: -1
projectile
rotate: false
xy: 2, 2
size: 40, 28
orig: 40, 28
offset: 0, 0
index: -1
projectile
rotate: false
xy: 129, 2
size: 40, 28
orig: 40, 28
offset: 0, 0
index: -1
projectile
rotate: false
xy: 44, 2
size: 40, 28
orig: 40, 28
offset: 0, 0
index: -1
default
rotate: false
xy: 86, 3
size: 41, 27
orig: 41, 27
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.
42 changes: 42 additions & 0 deletions source/core/assets/images/projectiles/pierce_anim.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

pierce_anim.png
size: 256, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 2, 2
size: 35, 26
orig: 35, 26
offset: 0, 0
index: -1
projectile
rotate: false
xy: 76, 2
size: 35, 26
orig: 35, 26
offset: 0, 0
index: -1
projectile
rotate: false
xy: 39, 2
size: 35, 26
orig: 35, 26
offset: 0, 0
index: -1
projectile
rotate: false
xy: 113, 2
size: 35, 26
orig: 35, 26
offset: 0, 0
index: -1
default
projectile
rotate: false
xy: 2, 2
size: 35, 26
orig: 35, 26
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.
41 changes: 41 additions & 0 deletions source/core/assets/images/projectiles/stun_effect.atlas
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@

stun_effect.png
size: 128, 32
format: RGBA8888
filter: Nearest, Nearest
repeat: none
projectile
rotate: false
xy: 2, 2
size: 21, 19
orig: 21, 19
offset: 0, 0
index: -1
projectile
rotate: false
xy: 48, 2
size: 20, 19
orig: 20, 19
offset: 0, 0
index: -1
projectile
rotate: false
xy: 25, 2
size: 21, 19
orig: 21, 19
offset: 0, 0
index: -1
projectile
rotate: false
xy: 70, 2
size: 17, 19
orig: 17, 19
offset: 0, 0
index: -1
default
rotate: false
xy: 2, 2
size: 21, 19
orig: 21, 19
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.
Binary file modified source/core/assets/images/terrain_use.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 9197017

Please sign in to comment.