Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Go Save The King
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c2141187

Commit c2141187 authored 3 days ago by Alan

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/noel-branch' into alan-branch

parents 1da1ac9c 335265a1

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

scenes/Shop.tscn 12 additions, 3 deletions

scenes/Shop.tscn
scenes/game.tscn 2 additions, 0 deletions

scenes/game.tscn
scenes/ui/ui.tscn 151 additions, 61 deletions

scenes/ui/ui.tscn
scripts/game.gd 3 additions, 2 deletions

scripts/game.gd
scripts/ui/display_piece_manager.gd 19 additions, 17 deletions

scripts/ui/display_piece_manager.gd
scripts/ui/game_ui.gd 2 additions, 2 deletions

scripts/ui/game_ui.gd

with 189 additions and 85 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