Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cpp-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Maul
cpp-project
Commits
63fa5a76
Commit
63fa5a76
authored
5 months ago
by
Frederik
Browse files
Options
Downloads
Patches
Plain Diff
Fix problems from merge
parent
7bca314e
No related branches found
No related tags found
2 merge requests
!33
Win end screen
,
!29
Merge main into box2d to implement physics
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/game/Level.cpp
+10
-7
10 additions, 7 deletions
src/game/Level.cpp
src/game/ui/Endscreen.cpp
+6
-12
6 additions, 12 deletions
src/game/ui/Endscreen.cpp
src/game/ui/TileMarker.cpp
+6
-6
6 additions, 6 deletions
src/game/ui/TileMarker.cpp
src/game/ui/TileMarker.hpp
+1
-1
1 addition, 1 deletion
src/game/ui/TileMarker.hpp
with
23 additions
and
26 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
