Skip to content

S
SSBookMinigames
Switch branch/tag
History Find file
  • saad's avatar
    Merge branch 'mcq_edit' into pt_CS_saad · 7b654ffa
    saad authored 
    # Conflicts:
#	My project/Assets/Prefabs/CS/Canvas.prefab
#	My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs
#	My project/Assets/WebGLTemplates.meta
#	My project/Assets/WebGLTemplates/InteractiveVideo/Logo.png
#	My project/Assets/WebGLTemplates/InteractiveVideo/index.html
#	My project/Assets/WebGLTemplates/InteractiveVideo/index.html.meta
#	My project/UserSettings/EditorUserSettings.asset
#	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
#	My project/UserSettings/Layouts/default-6000.dwlt
    7b654ffa
Name
Last commit
 Last update
..
ALArcade Loading commit data...
Art Loading commit data...
Audio Loading commit data...
Clean Vector Icons Loading commit data...
Cosmic_Retro_Hangar_Demo Loading commit data...
EKstudio Loading commit data...
FlatKit Loading commit data...
GUI PRO Kit - Simple Casual Loading commit data...
Holograms Loading commit data...
Import Packages Loading commit data...
JMO Assets Loading commit data...
Lab Assets Loading commit data...
Lana Studio Loading commit data...
Plugins Loading commit data...
Polygon Arsenal Loading commit data...
PolygonSciFiCity Loading commit data...
Prefabs Loading commit data...
Resources Loading commit data...
RobotSphere Loading commit data...
SFX Loading commit data...
Scenes Loading commit data...
ScienceStreet Loading commit data...
Settings Loading commit data...
Shaders Loading commit data...
TextMesh Pro Loading commit data...
TutorialInfo Loading commit data...
UI Loading commit data...
UniText Loading commit data...
UnityTechnologies Loading commit data...
VFX Loading commit data...
WebGLTemplates Loading commit data...
_Recovery Loading commit data...
_project Loading commit data...
assetsshaders Loading commit data...
ALArcade.meta Loading commit data...
Art.meta Loading commit data...
Audio.meta Loading commit data...
AutoForceImpact.cs Loading commit data...
AutoForceImpact.cs.meta Loading commit data...
CFXR Explosion 1.prefab Loading commit data...
CFXR Explosion 1.prefab.meta Loading commit data...
CFXR Magic Poof.prefab Loading commit data...
CFXR Magic Poof.prefab.meta Loading commit data...
CODEBASE.md Loading commit data...
CODEBASE.md.meta Loading commit data...
Canvas.prefab Loading commit data...
Canvas.prefab.meta Loading commit data...
Clean Vector Icons.meta Loading commit data...
Confetti_blast_multicolor.prefab Loading commit data...
Confetti_blast_multicolor.prefab.meta Loading commit data...
Cosmic_Retro_Hangar_Demo.meta Loading commit data...
DefaultVolumeProfile.asset Loading commit data...
DefaultVolumeProfile.asset.meta Loading commit data...
DotFloating.prefab Loading commit data...
DotFloating.prefab.meta Loading commit data...
EKstudio.meta Loading commit data...
Explosion.mp3 Loading commit data...
Explosion.mp3.meta Loading commit data...
FlatKit.meta Loading commit data...
Fonts.meta Loading commit data...
GUI PRO Kit - Simple Casual.meta Loading commit data...
Hakawaty.asset Loading commit data...
Hakawaty.asset.meta Loading commit data...
Holograms.meta Loading commit data...
Import Packages.meta Loading commit data...
InputSystem_Actions.inputactions Loading commit data...
InputSystem_Actions.inputactions.meta Loading commit data...
JMO Assets.meta Loading commit data...
JuicyTFButton.cs Loading commit data...
JuicyTFButton.cs.meta Loading commit data...
Lab Assets.meta Loading commit data...
Lana Studio.meta Loading commit data...
M_sprite.mat Loading commit data...
M_sprite.mat.meta Loading commit data...
MachineVFXController.cs Loading commit data...
MachineVFXController.cs.meta Loading commit data...
Machn_2.prefab Loading commit data...
Machn_2.prefab.meta Loading commit data...
Plugins.meta Loading commit data...
Polygon Arsenal.meta Loading commit data...
PolygonSciFiCity.meta Loading commit data...
Prefabs.meta Loading commit data...
RandomImpactJump.cs Loading commit data...
RandomImpactJump.cs.meta Loading commit data...
Readme.asset Loading commit data...
Readme.asset.meta Loading commit data...
Resources.meta Loading commit data...
RobotSphere.meta Loading commit data...
SFX.meta Loading commit data...
Scenes.meta Loading commit data...
ScienceFloating.prefab Loading commit data...
ScienceFloating.prefab.meta Loading commit data...
ScienceStreet.meta Loading commit data...
Settings.meta Loading commit data...
Shaders.meta Loading commit data...
TSHakwaty-Regular SDF.asset Loading commit data...
TSHakwaty-Regular SDF.asset.meta Loading commit data...
TextMesh Pro.meta Loading commit data...
TutorialInfo.meta Loading commit data...
UI.meta Loading commit data...
UniText.meta Loading commit data...
UnityTechnologies.meta Loading commit data...
UniversalRenderPipelineGlobalSettings.asset Loading commit data...
UniversalRenderPipelineGlobalSettings.asset.meta Loading commit data...
VFX.meta Loading commit data...
WebGLTemplates.meta Loading commit data...
_Recovery.meta Loading commit data...
_project.meta Loading commit data...
assetsshaders.meta Loading commit data...
fast move.wav Loading commit data...
fast move.wav.meta Loading commit data...
floating.prefab Loading commit data...
floating.prefab.meta Loading commit data...
images8.png Loading commit data...
images8.png.meta Loading commit data...
perlin-noise-cloud-example.1Wc8gX1d.png Loading commit data...
perlin-noise-cloud-example.1Wc8gX1d.png.meta Loading commit data...
spritescience.png Loading commit data...
spritescience.png.meta Loading commit data...
spritescienceblack.png Loading commit data...
spritescienceblack.png.meta Loading commit data...