Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

City_Builder
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

6deb92ac

Commit 6deb92ac authored 1 year ago by Tamás Péter

Downloads
- Plain Diff

Resolved conflicts occured while merging feature/lobby-city into develop

parents f79cd73b d04d5748

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

City Builder/Application/Application.cpp 15 additions, 5 deletions

City Builder/Application/Application.cpp
City Builder/Application/Application.h 1 addition, 1 deletion

City Builder/Application/Application.h
City Builder/Application/lobbyfinal.txt 754 additions, 0 deletions

City Builder/Application/lobbyfinal.txt
City Builder/Game/City.cpp 3 additions, 3 deletions

City Builder/Game/City.cpp
City Builder/Game/City.h 1 addition, 1 deletion

City Builder/Game/City.h
City Builder/imgui.ini 7 additions, 5 deletions

City Builder/imgui.ini

with 781 additions and 15 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