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

f3eaad31

Commit f3eaad31 authored 5 months ago by Frederik Alexander Keens

Downloads
- Plain Diff

Merge branch 'buildingFeatures' into 'main'

Building features

See merge request !34

parents 88f1189a 1687c1cf

No related branches found

No related tags found

2 merge requests!34Building features,!29Merge main into box2d to implement physics

Changes 10

Show whitespace changes

Inline Side-by-side

Showing

src/game/Building.cpp 4 additions, 0 deletions

src/game/Building.cpp
src/game/Building.hpp 2 additions, 6 deletions

src/game/Building.hpp
src/game/Level.cpp 60 additions, 19 deletions

src/game/Level.cpp
src/game/Level.hpp 1 addition, 0 deletions

src/game/Level.hpp
src/game/Spritesheet.cpp 1 addition, 1 deletion

src/game/Spritesheet.cpp
src/game/Unit.cpp 8 additions, 0 deletions

src/game/Unit.cpp
src/game/Unit.hpp 3 additions, 0 deletions

src/game/Unit.hpp
src/game/ui/Menu.cpp 4 additions, 6 deletions

src/game/ui/Menu.cpp
src/game/ui/Recruitingmenu.cpp 31 additions, 37 deletions

src/game/ui/Recruitingmenu.cpp
src/game/ui/Recruitingmenu.hpp 2 additions, 2 deletions

src/game/ui/Recruitingmenu.hpp

with 116 additions and 71 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