Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Space-Shooter
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

16a5eaa5

Commit 16a5eaa5 authored 4 years ago by Lenny Siol

Downloads
- Plain Diff

Merge branch 'develop' into 'master'

Finish Feature: Audio

See merge request !15

parents 62604ce8 79080a4b

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Code/Space-Shooter_Game/Space-Shooter_Game.depend 21 additions, 11 deletions

Code/Space-Shooter_Game/Space-Shooter_Game.depend
Code/Space-Shooter_Game/assets/extern/audio/loop.wav 0 additions, 0 deletions

Code/Space-Shooter_Game/assets/extern/audio/loop.wav
Code/Space-Shooter_Game/src/Audio/Audio.cpp 29 additions, 0 deletions

Code/Space-Shooter_Game/src/Audio/Audio.cpp
Code/Space-Shooter_Game/src/Audio/Audio.h 22 additions, 0 deletions

Code/Space-Shooter_Game/src/Audio/Audio.h
Code/Space-Shooter_Game/src/Game/Game.cpp 5 additions, 0 deletions

Code/Space-Shooter_Game/src/Game/Game.cpp
Code/Space-Shooter_Game/src/Game/Game.h 3 additions, 0 deletions

Code/Space-Shooter_Game/src/Game/Game.h
README.md 2 additions, 1 deletion

README.md

with 82 additions and 12 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