Skip to content

Commit 22b749f

Browse files
jilfranco-unityjilfranco-unity
committed
Merge branch 'develop' into fix/boss-arrow-fade-out
# Conflicts: # CHANGELOG.md - resolved with rider
2 parents a95512b + 1022af4 commit 22b749f

File tree

305 files changed

+7363
-11018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+7363
-11018
lines changed

‎Assets/GameData/Action/Archer/ArcherBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:add1740f30f9604edabacd15b1667e7e87e8d87f7e7f460df83283493815be6f
3-
size 1190
2+
oid sha256:88c1c6a212f87c7bddb294289cc6f3350d5550701def4ad1628167418b3c0eec
3+
size 1244

‎Assets/GameData/Action/Archer/ArcherBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Archer/ArcherChargedShot.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d5bca5771f0ced01f42172068b0ca0d333e1de8f48a0e8211ff7b052c660226f
3-
size 1747
2+
oid sha256:a900c47508ea00231c47ff48371dc4eee2c1fd8db31926b33863f3a7a8953d7c
3+
size 1824

‎Assets/GameData/Action/Archer/ArcherChargedShot.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Archer/ArcherVolley.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2c4317ed0f8ca5e54a3729cb4bec061ff630d0f05860cc9ade9485424e9a847f
3-
size 1197
2+
oid sha256:604af17f516fded57742eca6457cba98500bab260d9e0eecc3d7b0c598021f4d
3+
size 1242

‎Assets/GameData/Action/Archer/ArcherVolley.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Boss/BossImpBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:78a688221c3c529b0ad804a5b0f9124886aea12bb393066d8aa35e4578d9e6a1
3-
size 916
2+
oid sha256:d3a38414ebe044808dcfd275de756dc2a09af6ef96a0f5f5c8acb29458f4691b
3+
size 960

‎Assets/GameData/Action/Boss/BossImpBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Boss/BossImpTrampleAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e931108c6883dc893a12f829d908afcf5f266246c8897d7f7074f1c92410262d
3-
size 1016
2+
oid sha256:45ac5d33a2b653e0dd477fec29018c546426a038822c46e88f7b8c6754f0e200
3+
size 1155

‎Assets/GameData/Action/Boss/BossImpTrampleAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Chase.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d5b5705fc6877e0ba83bd48f12254c34cabcfb11135f2300e4c65f59a10cf1c5
3-
size 844
2+
oid sha256:94472ef1de73836dfe813ec348fee9cfe8b847e686051943821ab845f326a5bd
3+
size 936

‎Assets/GameData/Action/General/Chase.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Drop.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:233623c213dbc645c5c3a93da5963445fbb7028c9b8abaa24b684d5f90e3ee8b
3-
size 979
2+
oid sha256:94d22a36ac1576c723bcf1f8ce4dfd9c7ca66676416072524571360c1f1a1c86
3+
size 1048

‎Assets/GameData/Action/General/Drop.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Emote1.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7d7a3562dcef98fdd8a3cc3e05260fc20347c657447f8c73e2f4a7c210660d3b
3-
size 852
2+
oid sha256:ea7a0a1435120992f5e6eef6a6d3ab6c8613e7939750f307d647c5478148d123
3+
size 943

‎Assets/GameData/Action/General/Emote1.asset.meta

Lines changed: 1 addition & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Emote2.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a5a94ce5639e8dfd8779f6bd62ad091829be81d32a3a1010e1a56f319ec2859d
3-
size 856
2+
oid sha256:72c7e58434927e475198c58c5b0836f964a0d1e13d9ed1f03a85c873030c3d85
3+
size 947

‎Assets/GameData/Action/General/Emote2.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Emote3.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a3383a6d804ec69bfc02cece3b9185af3013c771933258ee5c52f63503292596
3-
size 856
2+
oid sha256:ae455e238cf8a2dd70d34c10c593ffc29024b1deded22d1e460210935fd7712d
3+
size 947

‎Assets/GameData/Action/General/Emote3.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Emote4.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d0e7d6adee1d76e533c911294eb46fc725703b29da36bcbb421b757a22571951
3-
size 852
2+
oid sha256:f23fe02507a4c8e83853014239bbbe7348ec29ad4cda5db6fd91cc409c7e42cc
3+
size 943

‎Assets/GameData/Action/General/Emote4.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Pick Up.asset

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:dc422e457ae74acecdd4a5a7b42ef3097c57164d54f4faadb77285d301d8c0a4
3+
size 1134

‎Assets/GameData/Action/General/PickUp.asset.meta renamed to ‎Assets/GameData/Action/General/Pick Up.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/PickUp.asset

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Assets/GameData/Action/General/Revive.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:bba82bf1fca05db26436b1db3804cb102fc48419916982246a0216f5e0f40f8a
3-
size 1004
2+
oid sha256:c715449ada5e9579ef7709c0642f8e23a0cdd8f6cb852d9cedb6617ec85667af
3+
size 1048

‎Assets/GameData/Action/General/Revive.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Stunned.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:a05f7099a7996b68ebbcdcb6266c1a04ecfa307b47071e200f2687a01ad3a7de
3-
size 769
2+
oid sha256:5b7e5338c3dffbaff39c04eb1ef35292213cce875d539d97bb99a86ebd3d8155
3+
size 955

‎Assets/GameData/Action/General/Stunned.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/General/Target.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:89ece60ec887f2776ba7ed888539a7e0706f646ef372017ce33a91dc7035729e
3-
size 822
2+
oid sha256:c39ea99c05bd73ad0a72e6a9a08edd412820d693ca3c1ae830046bbf07c58c08
3+
size 938

‎Assets/GameData/Action/General/Target.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Imp/ImpBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:394895e048b1e10db039698943484303db2a89e69dcb57d329ce627e0145eaac
3-
size 913
2+
oid sha256:2a2b666de83998dd62c12a12de7f3875e373a21c17f5e69d751e7e4ab935e1ac
3+
size 957

‎Assets/GameData/Action/Imp/ImpBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Mage/MageBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7e5be6a23abcddd484cc7260eeb5994d71819db7b38d3e86e8cb71bf6ce5d70c
3-
size 1240
2+
oid sha256:b8c89967778813e15e562f2748e3d309dedbf5b603cc8cf48b7574c5957322c0
3+
size 1296

‎Assets/GameData/Action/Mage/MageBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Mage/MageHeal.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:74ab0fac7294b7d7a2445fcb3446f3407813756a6f747a1ade70ac8ba12df3b6
3-
size 1114
2+
oid sha256:6c16b018e4bfa01b23bea3e0f6ef366ac529f16a749e38c93384e1e38a5c7ab8
3+
size 1159

‎Assets/GameData/Action/Mage/MageHeal.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Rogue/RogueBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:632593cdc46477fe5ac9d0723c5486a094c146b690f201c6e4e3d1cd2f52420e
3-
size 1041
2+
oid sha256:bc443643406b521dbe4d65d18709d16cab16611425761abbd2745c74b7b348f4
3+
size 1085

‎Assets/GameData/Action/Rogue/RogueBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Rogue/RogueDashAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:51cf453826c56dbe95e242f997f7d89e3d9088346b0eac1ef0dfe286688bb0f5
3-
size 1107
2+
oid sha256:6626f105bfbe98eca1f6834c43b202c328a51dc0b49a93590e1d3271efb63928
3+
size 1150

‎Assets/GameData/Action/Rogue/RogueDashAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Rogue/RogueStealthMode.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d4626920a5e5ceb6a6b719d8a9d69f9e5abff10f04d12cd54b747af2342e5368
3-
size 1070
2+
oid sha256:a68c50011f0973e6fd8a2a13d9450a711500698c812d390992dafcebb424794d
3+
size 1115

‎Assets/GameData/Action/Rogue/RogueStealthMode.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Tank/TankBaseAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:80c72a81acc09cc7c11c34daf87b425726759f25bb736530272e63703cefbc6f
3-
size 1034
2+
oid sha256:5a81dd6c61c12fb973a505b7d68f14437567fa1826ad7c6cc8b7c90dde50a689
3+
size 1078

‎Assets/GameData/Action/Tank/TankBaseAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Tank/TankShieldBuff.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f052fd6beabaf4e1bf4d5607e42ead147b165f59a5a36b519ed056642d5dd86a
3-
size 1367
2+
oid sha256:c99ae90cda110563ebb4407b6b96e8922fd07b0ba644605b749e7c88a77fe0c8
3+
size 1416

‎Assets/GameData/Action/Tank/TankShieldBuff.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Tank/TankShieldRush.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:0c4d84204e386bc5bc1dfbf7fc673be7d8c265e79bb3cb325c91ca114f6ac84f
3-
size 1066
2+
oid sha256:56c52cddc9d762301fab1e85c7ff4c2a2a823c1923e443b79c4393dc567f93f6
3+
size 1111

‎Assets/GameData/Action/Tank/TankShieldRush.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/Tank/TankTestAoeAttack.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7c294656c979832d10820d8a2f7aa56ea7eaa502d8960c6e99b79ff24b741403
3-
size 1074
2+
oid sha256:128831c2653da234d73871d4c35a362c211877c49fd1e34a506698d6f9b44ea6
3+
size 1119

‎Assets/GameData/Action/Tank/TankTestAoeAttack.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Action/VandalImp/ImpToss.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2ddd66833c793d93eb956aa3ceb8b580db3ab92a46334b0e60bb7a99e5636005
3-
size 1153
2+
oid sha256:823bcb4f8d8f3ff3d52fadd9fc83db58bcd2be00d286f49c335da89d3ebe3394
3+
size 1126

‎Assets/GameData/Action/VandalImp/ImpToss.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/GameData/Character/Archer/Archer.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9d525de16846e73d76bc72eb190c57ea8d35257d79d6da6ab1d3b3775955d0d7
3-
size 782
2+
oid sha256:5c03582d7b930a297d36646d4623d9db14a707c0f438821172b69c4c7d63e2d0
3+
size 978

‎Assets/GameData/Character/Imp/Imp.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:43e076424e36f94f11d46a4b2d88d30a94457458535d89ee20f302d7c19f49c4
3-
size 659
2+
oid sha256:ed7d2e5258588d2a39e38e5e8374699291caafa6d226d4203d0a1619b2f8840c
3+
size 745

‎Assets/GameData/Character/ImpBoss/ImpBoss.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:82289028624e8b897ca15a2b4f568f473dc232ca52a507bee6aa020fa92d1a04
3-
size 666
2+
oid sha256:9d6d4491082dc0840ab95389e58e42bf0495be5c6e1e57dc587014098b3c1d96
3+
size 807

‎Assets/GameData/Character/Mage/Mage.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:3eaf176772d79ce896b5b0a291f6e70de5fed160891da4e1268ea33b40e56b82
3-
size 777
2+
oid sha256:73d22b4f8764ea3696a72b9b569b5417dc98bc40dc3f36e53a110e63f3dfac8b
3+
size 918

‎Assets/GameData/Character/Rogue/Rogue.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:851dc11f3c17e3416b1957397a5e89d7aca441f3d9d6681bc701966da3516541
3-
size 780
2+
oid sha256:6597b8feafa5b3308373594eefcc2fca40bc5c6001d6c3e989b324a1e5c2f070
3+
size 976

‎Assets/GameData/Character/Tank/Tank.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d223ee27a5e5c44fe5a98342f9e997dc00e4afd11f8a8cd6a537eaef40460f30
3-
size 777
2+
oid sha256:2381354147f58b49e3c37273e34db142f03e3321fddb7217c62584a9c298645f
3+
size 918

‎Assets/GameData/Character/VandalImp/VandalImp.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:6135b8795be90c0ee170bfdd401595eaa0892ba2b54f3b1f8771b5da9ce81cd7
3-
size 666
2+
oid sha256:7026fabc76f3420eca1d4619f17c66d3e67b35f831eed55cf1ca9e31f7b792d1
3+
size 751

‎Assets/Models/DungeonPieces.FBX

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:d8c3954835038728b0c18257dd8b41aff5f3530b8e128a61a269e9cb3a9d2498
3-
size 914432
2+
oid sha256:0f296f2a70e195b84ebca698b470031894ecd268c12f0167710960dc5085ff07
3+
size 1050944

0 commit comments

Comments
 (0)