Merge branch 'develop' into 'master'
Develop See merge request !3
Showing
- Assets/Sequences/Cellular.incseq 1 addition, 1 deletionAssets/Sequences/Cellular.incseq
- Assets/Sprites/Buttons/Cellular_Hover.png 0 additions, 0 deletionsAssets/Sprites/Buttons/Cellular_Hover.png
- Assets/Sprites/Buttons/Cellular_Normal.png 0 additions, 0 deletionsAssets/Sprites/Buttons/Cellular_Normal.png
- Assets/Sprites/Buttons/Cellular_Selected.png 0 additions, 0 deletionsAssets/Sprites/Buttons/Cellular_Selected.png
- Assets/Sprites/Temperature Bar/Minus.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/Minus.png
- Assets/Sprites/Temperature Bar/Plus.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/Plus.png
- Assets/Sprites/Temperature Bar/ProgressBar.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/ProgressBar.png
- Assets/Sprites/Temperature Bar/ProgressBarMask.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/ProgressBarMask.png
- Assets/Sprites/Temperature Bar/ProgressBarTick.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/ProgressBarTick.png
- Assets/Sprites/Temperature Bar/ProgressBarTickMask.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/ProgressBarTickMask.png
- Assets/Sprites/Temperature Bar/ProgressTrack.png 0 additions, 0 deletionsAssets/Sprites/Temperature Bar/ProgressTrack.png
- Databases/Asset.json 3 additions, 3 deletionsDatabases/Asset.json
- Intermediate/GeneratedCode/Generated.cpp 504 additions, 836 deletionsIntermediate/GeneratedCode/Generated.cpp
- Intermediate/lib/EntryPoint.dll 0 additions, 0 deletionsIntermediate/lib/EntryPoint.dll
- Intermediate/lib/EntryPoint.exp 0 additions, 0 deletionsIntermediate/lib/EntryPoint.exp
- Intermediate/preview.jpg 0 additions, 0 deletionsIntermediate/preview.jpg
- Prefabs/Button/Button.prefabtree 2 additions, 2 deletionsPrefabs/Button/Button.prefabtree
- Prefabs/Slider/Slider.prefabtree 1 addition, 1 deletionPrefabs/Slider/Slider.prefabtree
- Scenes/1654293363274681100/scene/Root.scene 54 additions, 54 deletionsScenes/1654293363274681100/scene/Root.scene
- Settings/Logic.json 8 additions, 625 deletionsSettings/Logic.json
Loading
Please register or sign in to comment