Merge branch 'master' into Atlas_3
dance is back in first level
just a backup
Polish + Hint

Flash Hint for constellation when hit dark cloud
Lose control at the end
Dark cloud clear at the end
Red cloud at the beginning, turn white at the end
Merge branch 'Atlas_3'
sound
get some new scripts via qq

hints
music
sound
audio,..
fresh
Merge branch 'Atlas_3'
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
refresh
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_LearnToPush.unity
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/assetDatabase3
Gemini 1.3 for Babycastle
1st big play test
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_LearnToPush.unity
	Gemini/Assets/Prefab/FallenStarToConstellation.prefab
	Gemini/Assets/Prefab/UI/HintSprite.prefab
	Gemini/Assets/Script/GameStart.cs
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper
checkpoint don't fall
Merge branch 'Atlas_3'

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_LearnToPush.unity
	Gemini/Assets/Prefab/FallenStarToConstellation.prefab
	Gemini/Assets/Prefab/UI/HintSprite.prefab
	Gemini/Assets/Script/GameStart.cs
	Gemini/Assets/Script/Nick/audioManager.cs
	Gemini/Library/CurrentLayout.dwlt
	Gemini/Library/CurrentMaximizeLayout.dwlt
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/expandedItems
	Gemini/Library/guidmapper