123
12
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
Merge branch 'master' into Zc-Z
123
12
go back
??
Merge branch 'Zc-Z' of https://github.com/HawkDaght/IndieSpeedRun into Zc-Z

Conflicts:
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
123
go back
Merge branch 'Zc-Z'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_LearnToPush.unity
	Gemini/Assets/Script/Environment/ClearDarkCloud.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
12
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_LearnToPush.unity
	Gemini/Assets/AtlasScene/Atlas_TowerIevel.unity
	Gemini/Assets/Material/ConstellationPuzzle/HintHalo.png.meta
	Gemini/Assets/Material/ConstellationPuzzle/Materials/HintHalo.mat
	Gemini/Assets/Material/ConstellationPuzzle/Materials/HintHalo.mat.meta
	Gemini/Assets/Nick Scene/Nick_contellationpuzzle4.unity
	Gemini/Assets/Prefab/FallenStarToConstellation.prefab
	Gemini/Assets/Prefab/Stars/FallingStar.prefab
	Gemini/Assets/Prefab/Stars/HintSprite.prefab
	Gemini/Assets/Prefab/Stars/HintSprite.prefab.meta
	Gemini/Assets/Script/Environment/ClearDarkCloud.cs
	Gemini/Assets/Script/GameStart.cs
	Gemini/Assets/Script/Nick/FollowStar.cs
	Gemini/Assets/Script/Nick/HintCollect.cs
	Gemini/Assets/Script/Nick/SoundManager.cs
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper