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

c44f1798

Commit c44f1798 authored 5 months ago by TheUltimateOptimist

Downloads
- Plain Diff

Merge branch 'main' into leveleditor

parents 4b447566 bb0f09e9

No related branches found

No related tags found

2 merge requests!38Merge the level editor,!29Merge main into box2d to implement physics

Changes 16

Show whitespace changes

Inline Side-by-side

Showing

src/building.cpp 28 additions, 1 deletion

src/building.cpp
src/building.hpp 33 additions, 10 deletions

src/building.hpp
src/effect.cpp 44 additions, 0 deletions

src/effect.cpp
src/effect.hpp 28 additions, 0 deletions

src/effect.hpp
src/engine.cpp 5 additions, 13 deletions

src/engine.cpp
src/engine.hpp 4 additions, 1 deletion

src/engine.hpp
src/level.cpp 47 additions, 50 deletions

src/level.cpp
src/level.hpp 5 additions, 1 deletion

src/level.hpp
src/main.cpp 84 additions, 7 deletions

src/main.cpp
src/spritesheet.cpp 361 additions, 45 deletions

src/spritesheet.cpp
src/spritesheet.hpp 45 additions, 7 deletions

src/spritesheet.hpp
src/tile.cpp 34 additions, 1 deletion

src/tile.cpp
src/tile.hpp 47 additions, 5 deletions

src/tile.hpp
src/unit.cpp 63 additions, 1 deletion

src/unit.cpp
src/unit.hpp 64 additions, 9 deletions

src/unit.hpp
src/window.hpp 1 addition, 1 deletion

src/window.hpp

with 893 additions and 152 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