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

6a474ef5

Commit 6a474ef5 authored 5 months ago by Frederik Alexander Keens

Downloads
- Plain Diff

Merge branch 'unit_movement' into 'main'

Unit movement

See merge request !23

parents c5a9fd3b 4e43e175

Branches

No related tags found

2 merge requests!29Merge main into box2d to implement physics,!23Unit movement

Changes 13

Show whitespace changes

Inline Side-by-side

Showing

config.xml 2 additions, 2 deletions

config.xml
src/game/Building.hpp 0 additions, 18 deletions

src/game/Building.hpp
src/game/Config.cpp 18 additions, 17 deletions

src/game/Config.cpp
src/game/Config.hpp 114 additions, 4 deletions

src/game/Config.hpp
src/game/Engine.cpp 6 additions, 1 deletion

src/game/Engine.cpp
src/game/Engine.hpp 6 additions, 0 deletions

src/game/Engine.hpp
src/game/Level.cpp 195 additions, 32 deletions

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

src/game/Level.hpp
src/game/Tile.cpp 4 additions, 0 deletions

src/game/Tile.cpp
src/game/Tile.hpp 2 additions, 35 deletions

src/game/Tile.hpp
src/game/Unit.cpp 139 additions, 71 deletions

src/game/Unit.cpp
src/game/Unit.hpp 114 additions, 101 deletions

src/game/Unit.hpp
src/game/ui/Menu.cpp 4 additions, 1 deletion

src/game/ui/Menu.cpp

with 660 additions and 283 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