123
12
hkg
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF_2.unity
	Gemini/Assets/Prefab/FallenStar.prefab
	Gemini/Assets/Prefab/FallingStar.prefab
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'Atlas_2'
sync
123
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Assets/AtlasScene/Atlas_IGF_2.unity
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
refresh
12
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/InspectorExpandedItems.asset
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
	Gemini/ProjectSettings/EditorBuildSettings.asset
hjg
qwe
Merge branch 'master' into Zc-Z

Conflicts:
	Gemini/Library/assetDatabase3
	Gemini/Library/guidmapper
merge
zc
Merge branch 'master' of https://github.com/HawkDaght/IndieSpeedRun

Conflicts:
	Gemini/Assets/Prefab/Environment/FloatingGate.prefab
	Gemini/Assets/Script/CharControl_upanddown2.cs
	Gemini/Library/guidmapper
Merge branch 'Atlas_2'

Conflicts:
	Gemini/Library/assetDatabase3
LEVEL ADJUSTMENT

LEVEL GATING FLOATING EFFECT
BIG BALL DON'T CRUSH BY LIGHTENNING