Merge remote-tracking branch 'origin/main' into sdl (84c249d9) · Commits · Alfred Burgess / SpaceOk · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SpaceOk
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Alfred Burgess
SpaceOk
Commits
84c249d9

Commit 84c249d9 authored 1 year ago by

Alfred Burgess

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into sdl

parents d04128a8 34334322

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/asset.h 15 additions, 0 deletions

include/asset.h
include/game-engine.h 16 additions, 3 deletions

include/game-engine.h
include/main.h 2 additions, 0 deletions

include/main.h
include/scene.h 19 additions, 0 deletions

include/scene.h
include/window.h 0 additions, 1 deletion

include/window.h
makefile 1 addition, 1 deletion

makefile
src/asset.cpp 6 additions, 0 deletions

src/asset.cpp
src/game-engine.cpp 63 additions, 2 deletions

src/game-engine.cpp
src/main.cpp 2 additions, 30 deletions

src/main.cpp
src/window.cpp 1 addition, 1 deletion

src/window.cpp

with 125 additions and 38 deletions

0% 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