Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Fly Higher
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

8aa03446

Commit 8aa03446 authored 10 years ago by Pierre De Wulf

Downloads
- Plain Diff

Merge branch 'MainGame'

parents 43dab24f 3617dd81

Branches PaintGame PropulsionGame

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Assets/0 - Menu/Scenes/MainMenu.unity 0 additions, 7 deletions

Assets/0 - Menu/Scenes/MainMenu.unity
Assets/0 - Menu/Scripts/MainMenuManager.cs 16 additions, 6 deletions

Assets/0 - Menu/Scripts/MainMenuManager.cs
Assets/0 - Menu/Scripts/MiniGameMenuManager.cs 15 additions, 5 deletions

Assets/0 - Menu/Scripts/MiniGameMenuManager.cs
Assets/1 - MainGame/Prefabs/FuelBarPanel.prefab 3 additions, 3 deletions

Assets/1 - MainGame/Prefabs/FuelBarPanel.prefab
Assets/1 - MainGame/Scripts/Bonus.cs 3 additions, 3 deletions

Assets/1 - MainGame/Scripts/Bonus.cs
Assets/1 - MainGame/Scripts/FuelBarScript.cs 13 additions, 0 deletions

Assets/1 - MainGame/Scripts/FuelBarScript.cs
Assets/1 - MainGame/Scripts/FuelControl.cs 11 additions, 0 deletions

Assets/1 - MainGame/Scripts/FuelControl.cs
Assets/1 - MainGame/Scripts/MainGame.cs 15 additions, 6 deletions

Assets/1 - MainGame/Scripts/MainGame.cs
Assets/2 - PainterGame/Scripts/MainPaintScript.cs 1 addition, 1 deletion

Assets/2 - PainterGame/Scripts/MainPaintScript.cs
Assets/PlayerPref/ConstSave.cs 4 additions, 0 deletions

Assets/PlayerPref/ConstSave.cs

with 81 additions and 31 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment