Assets/Scripts/Characters/Enemy · d36249ac4bd68dc331ee7eba8c34dd10f4bae4a2 · Oenos / tetra-tower · GitLab

History Find file

Merge remote-tracking branch 'origin/enemy' · d36249ac
18손재민 authored Feb 27, 2019
```
# Conflicts:
#	Assets/Prefabs/Characters/Enemy/Goblin.prefab
#	Assets/Scripts/GameManager.cs
```
d36249ac

Name	Last commit	Last update
..
Animator State		Loading commit data...
Boss		Loading commit data...
Animator State.meta		Loading commit data...
Boss.cs		Loading commit data...
Boss.cs.meta		Loading commit data...
Boss.meta		Loading commit data...
DamageToPlayer.cs		Loading commit data...
DamageToPlayer.cs.meta		Loading commit data...
Enemy.cs		Loading commit data...
Enemy.cs.meta		Loading commit data...
EnemyAir.cs		Loading commit data...
EnemyAir.cs.meta		Loading commit data...
EnemyAntiOverlap.cs		Loading commit data...
EnemyAntiOverlap.cs.meta		Loading commit data...
EnemyAttackInfo.cs		Loading commit data...
EnemyAttackInfo.cs.meta		Loading commit data...
EnemyGround.cs		Loading commit data...
EnemyGround.cs.meta		Loading commit data...
Scarecrow.cs		Loading commit data...
Scarecrow.cs.meta		Loading commit data...