Skip to content

tetra-tower
tetra-tower
Switch branch/tag
History Find file
  • 18류지석's avatar
    Merge branch 'master' into tetris · 538d6e4d
    18류지석 authored 
    # Conflicts:
#	Assets/Prefabs/Rooms/NormalRoom/Room 11(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 15.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 18.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 19(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 2(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4(FR).prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 8.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-2.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Item 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start 1-3(FR).prefab
    538d6e4d
Name
Last commit
 Last update
..
Animation Loading commit data...
Data Loading commit data...
Images Loading commit data...
Palettes Loading commit data...
Physics Materials Loading commit data...
Prefabs Loading commit data...
Resources Loading commit data...
Scenes Loading commit data...
Scripts Loading commit data...
Sprites Loading commit data...
Textures Loading commit data...
Tiles Loading commit data...
Animation.meta Loading commit data...
DamageToPlayer.cs Loading commit data...
DamageToPlayer.cs.meta Loading commit data...
Data.meta Loading commit data...
Images.meta Loading commit data...
MeleeAttack.cs Loading commit data...
MeleeAttack.cs.meta Loading commit data...
MeleeIdle.cs Loading commit data...
MeleeIdle.cs.meta Loading commit data...
MeleeTrack.cs Loading commit data...
MeleeTrack.cs.meta Loading commit data...
Palettes.meta Loading commit data...
Physics Materials.meta Loading commit data...
Prefabs.meta Loading commit data...
Resources.meta Loading commit data...
Scenes.meta Loading commit data...
Scripts.meta Loading commit data...
SkillPlay.cs Loading commit data...
SkillPlay.cs.meta Loading commit data...
Sprites.meta Loading commit data...
Textures.meta Loading commit data...
Tiles.meta Loading commit data...