Assets/Scripts · e67350c17cefb549a2652a40b09136e4850d5fa9 · MIM / man-in-the-mirror · GitLab

History Find file

Merge remote-tracking branch 'origin/model' · e67350c1
18손재민 authored May 20, 2019
```
# Conflicts:
#	Assets/Scenes/ModelScene.meta
#	Assets/Scripts/Player.cs
```
e67350c1

Name	Last commit	Last update
..
Bullets		Loading commit data...
Extensions		Loading commit data...
Generals		Loading commit data...
Interactors		Loading commit data...
Managers		Loading commit data...
Map		Loading commit data...
MapEditor		Loading commit data...
Bullets.meta		Loading commit data...
CameraController.cs		Loading commit data...
CameraController.cs.meta		Loading commit data...
Extensions.meta		Loading commit data...
Generals.meta		Loading commit data...
Interactors.meta		Loading commit data...
Managers.meta		Loading commit data...
Map.meta		Loading commit data...
MapEditor.meta		Loading commit data...
MapManager.cs		Loading commit data...
MapManager.cs.meta		Loading commit data...
MirrorMaterial.cs		Loading commit data...
MirrorMaterial.cs.meta		Loading commit data...
Player.cs		Loading commit data...
Player.cs.meta		Loading commit data...
PlayerController.cs		Loading commit data...
PlayerController.cs.meta		Loading commit data...
TestTools.cs		Loading commit data...
TestTools.cs.meta		Loading commit data...