Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

cpp-project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

c5a9fd3b

Commit c5a9fd3b authored 6 months ago by Frederik Alexander Keens

Downloads
- Plain Diff

Merge branch 'uiInteraction/building' into 'main'

Ui interaction/building

See merge request !24

parents 212f0cd1 db8ddd5e

No related branches found

No related tags found

2 merge requests!29Merge main into box2d to implement physics,!24Ui interaction/building

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

src/game/Level.cpp 146 additions, 55 deletions

src/game/Level.cpp
src/game/Level.hpp 10 additions, 1 deletion

src/game/Level.hpp
src/game/ui/Recruitingmenu.cpp 179 additions, 0 deletions

src/game/ui/Recruitingmenu.cpp
src/game/ui/Recruitingmenu.hpp 40 additions, 0 deletions

src/game/ui/Recruitingmenu.hpp
src/game/ui/TileMarker.cpp 90 additions, 0 deletions

src/game/ui/TileMarker.cpp
src/game/ui/TileMarker.hpp 33 additions, 0 deletions

src/game/ui/TileMarker.hpp

with 498 additions and 56 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