Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

imt2531_assignment2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

adea66d6

Commit adea66d6 authored 5 years ago by iaminadequate

Downloads
- Plain Diff

merge

parents b71a8fd2 4e8baab7

No related branches found

No related tags found

No related merge requests found

Changes 19

Show whitespace changes

Inline Side-by-side

Showing

include/constants.h 3 additions, 1 deletion

include/constants.h
include/game.h 4 additions, 1 deletion

include/game.h
include/minimap.h 26 additions, 0 deletions

include/minimap.h
include/pacman.h 7 additions, 4 deletions

include/pacman.h
include/shader.h 2 additions, 0 deletions

include/shader.h
include/texture.h 1 addition, 0 deletions

include/texture.h
include/ui.h 6 additions, 0 deletions

include/ui.h
resources/levels/level1 37 additions, 0 deletions

resources/levels/level1
resources/shaders/fragmentOBJ.frag 62 additions, 11 deletions

resources/shaders/fragmentOBJ.frag
resources/shaders/vertexOBJ.vert 20 additions, 23 deletions

resources/shaders/vertexOBJ.vert
src/constants.cpp 5 additions, 2 deletions

src/constants.cpp
src/game.cpp 67 additions, 16 deletions

src/game.cpp
src/levelLoader.CPP 4 additions, 1 deletion

src/levelLoader.CPP
src/minimap.cpp 89 additions, 0 deletions

src/minimap.cpp
src/pacman.cpp 20 additions, 2 deletions

src/pacman.cpp
src/renderer.cpp 1 addition, 0 deletions

src/renderer.cpp
src/shader.cpp 8 additions, 0 deletions

src/shader.cpp
src/texture.cpp 32 additions, 3 deletions

src/texture.cpp
src/ui.cpp 150 additions, 59 deletions

src/ui.cpp

with 544 additions and 123 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