Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

StatniZaverecnaZkouska
- Activity
- Members
- Labels
- Package Registry
- Model registry
- Terraform modules
- Service Desk
- Model experiments

Snippets Groups Projects

eb3a4775

Commit eb3a4775 authored 2 years ago by Kristýna Janovská

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.fit.cvut.cz/BI-VHS/b221_projects/statnizaverecnazkouska into dev

parents 978ed21d 04c376fc

No related branches found

No related tags found

No related merge requests found

Pipeline #248689 passed 2 years ago

Stage: build

Stage: test

Stage: deploy

Changes 16
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

Assets/SZZ/Code/Scripts/Dialogue/DialogueHolder.cs 5 additions, 5 deletions

Assets/SZZ/Code/Scripts/Dialogue/DialogueHolder.cs
Assets/SZZ/Code/Scripts/Level/Level1Controller.cs 11 additions, 3 deletions

Assets/SZZ/Code/Scripts/Level/Level1Controller.cs
Assets/SZZ/Code/Scripts/Level/Timer.cs 5 additions, 6 deletions

Assets/SZZ/Code/Scripts/Level/Timer.cs
Assets/SZZ/Code/Scripts/Player/Player.cs 12 additions, 0 deletions

Assets/SZZ/Code/Scripts/Player/Player.cs
Assets/SZZ/Code/Scripts/Player/PlayerInteractUI.cs 3 additions, 3 deletions

Assets/SZZ/Code/Scripts/Player/PlayerInteractUI.cs
Assets/SZZ/Code/Scripts/View.cs 3 additions, 0 deletions

Assets/SZZ/Code/Scripts/View.cs
Assets/SZZ/Dialogue/Adela.ink 1 addition, 0 deletions

Assets/SZZ/Dialogue/Adela.ink
Assets/SZZ/Dialogue/Self/level1-start.ink 0 additions, 3 deletions

Assets/SZZ/Dialogue/Self/level1-start.ink
Assets/SZZ/Dialogue/Self/level1-start.ink.meta 0 additions, 7 deletions

Assets/SZZ/Dialogue/Self/level1-start.ink.meta
Assets/SZZ/Dialogue/Self/level1-start.json 0 additions, 1 deletion

Assets/SZZ/Dialogue/Self/level1-start.json
Assets/SZZ/Dialogue/Self/level1-start.json.meta 0 additions, 7 deletions

Assets/SZZ/Dialogue/Self/level1-start.json.meta
Assets/SZZ/Dialogue/Self/max-cheats-reached.ink 1 addition, 1 deletion

Assets/SZZ/Dialogue/Self/max-cheats-reached.ink
Assets/SZZ/Dialogue/Self/max-cheats-reached.json 1 addition, 1 deletion

Assets/SZZ/Dialogue/Self/max-cheats-reached.json
Assets/SZZ/Level/Scenes/building a.unity 7 additions, 7 deletions

Assets/SZZ/Level/Scenes/building a.unity
Assets/SZZ/Prefabs/Logic/GameState.prefab 1 addition, 0 deletions

Assets/SZZ/Prefabs/Logic/GameState.prefab
Assets/SZZ/Prefabs/Logic/View.prefab 44 additions, 0 deletions

Assets/SZZ/Prefabs/Logic/View.prefab

with 94 additions and 44 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