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

512e95d0

Commit 512e95d0 authored 6 months ago by Frederik Alexander Keens

Downloads
- Plain Diff

Merge branch 'player' into 'main'

Implement Player Class

See merge request !27

parents 6a474ef5 e9f846cd

No related branches found

No related tags found

2 merge requests!29Merge main into box2d to implement physics,!27Implement Player Class

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

res/level.h5 0 additions, 0 deletions

res/level.h5
src/game/Building.cpp 5 additions, 0 deletions

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

src/game/Building.hpp
src/game/Level.cpp 46 additions, 6 deletions

src/game/Level.cpp
src/game/Level.hpp 16 additions, 8 deletions

src/game/Level.hpp
src/game/Player.cpp 147 additions, 0 deletions

src/game/Player.cpp
src/game/Player.hpp 50 additions, 0 deletions

src/game/Player.hpp
src/game/Unit.cpp 13 additions, 13 deletions

src/game/Unit.cpp
src/game/Unit.hpp 5 additions, 2 deletions

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

src/game/ui/Menu.cpp
src/game/ui/TileMarker.cpp 3 additions, 2 deletions

src/game/ui/TileMarker.cpp

with 292 additions and 36 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