Assets/Game Resources · iostmp · Hà Trung (NEGAXY) / GalaxySmash

Merge branch 'master' of http://103.147.34.20:30081/trung.ha/galaxysmash into iostmp · 71c87c2a

Hà Trung (NEGAXY) authored Jan 27, 2022

# Conflicts:
#	Assets/Game Resources/Atlas.spriteatlas
#	Assets/Game Resources/Prefabs/Interface.prefab
#	Assets/OSG Infinity Square Space/Scenes/home.unity
#	Assets/OSG Infinity Square Space/Scenes/main.unity
#	ProjectSettings/ProjectSettings.asset

71c87c2a

Name	Last commit	Last update
..
Animations		Loading commit data...
Characters		Loading commit data...
Data		Loading commit data...
Fonts		Loading commit data...
New Planets		Loading commit data...
PlanetFbxSource		Loading commit data...
Prefabs		Loading commit data...
Scripts		Loading commit data...
Sounds		Loading commit data...
Sprites		Loading commit data...
TreasureFX		Loading commit data...
Animations.meta		Loading commit data...
AtmosphericScattering.shader		Loading commit data...
AtmosphericScattering.shader.meta		Loading commit data...
Characters.meta		Loading commit data...
Data.meta		Loading commit data...
Fonts.meta		Loading commit data...
New Planets.meta		Loading commit data...
Planet.mat		Loading commit data...
Planet.mat.meta		Loading commit data...
PlanetFbxSource.meta		Loading commit data...
Prefabs.meta		Loading commit data...
Scripts.meta		Loading commit data...
Sounds.meta		Loading commit data...
Sprites.meta		Loading commit data...
TreasureFX.meta		Loading commit data...