Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GCCProg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

36cda942

Commit 36cda942 authored 4 years ago by weberma73121

Downloads
- Plain Diff

Merge branch 'master' into 'weber'

Master to weber

See merge request !6

parents 774cbed5 d8696827

Branches

No related tags found

2 merge requests!7Weber to master,!6Master to weber

Changes 20

Show whitespace changes

Inline Side-by-side

Showing

Bomber.cpp 5 additions, 1 deletion

Bomber.cpp
Bomber.hpp 1 addition, 1 deletion

Bomber.hpp
Enemy.cpp 16 additions, 15 deletions

Enemy.cpp
Enemy.hpp 3 additions, 2 deletions

Enemy.hpp
Enemyprojectile.cpp 13 additions, 8 deletions

Enemyprojectile.cpp
Level.cpp 52 additions, 9 deletions

Level.cpp
Level.hpp 74 additions, 69 deletions

Level.hpp
PixelBuffer.cpp 8 additions, 6 deletions

PixelBuffer.cpp
PixelBuffer.hpp 10 additions, 5 deletions

PixelBuffer.hpp
Platform_Win32Console.cpp 4 additions, 4 deletions

Platform_Win32Console.cpp
Scoreb.cpp 176 additions, 0 deletions

Scoreb.cpp
Scoreb.hpp 30 additions, 0 deletions

Scoreb.hpp
Tank.cpp 9 additions, 5 deletions

Tank.cpp
Tank.hpp 1 addition, 1 deletion

Tank.hpp
Trooper.cpp 10 additions, 5 deletions

Trooper.cpp
Trooper.hpp 1 addition, 1 deletion

Trooper.hpp
main.cpp 12 additions, 11 deletions

main.cpp
player.cpp 7 additions, 7 deletions

player.cpp
playerprojectile.cpp 13 additions, 8 deletions

playerprojectile.cpp
project.pro 2 additions, 0 deletions

project.pro

with 447 additions and 158 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