Commits · feature/sound · GameDevWeek / Sommersemester 2015 / Cpp / Deth Buff Arr · GitLab

26 Sep, 2015 34 commits
- doublesound fix · e4cf066c
  Michael Ochmann authored Sep 26, 2015
  
  e4cf066c
- Merge branch 'develop' into feature/sound · 2a850986
  Michael Ochmann authored Sep 26, 2015
  
  2a850986
- embedded jsoncpp · ea2d5dc1
  Michael Ochmann authored Sep 26, 2015
  
  ea2d5dc1
- Merge branch 'develop' into feature/mapgen · 8354dafb
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  8354dafb
- mapgen astroid motion / rotation speed now scaleable · 6b3778da
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  6b3778da
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · 2798a383
  Elias Broschin authored Sep 26, 2015
  
  2798a383
- fixed beam length · 141d7d1d
  Elias Broschin authored Sep 26, 2015
  
  141d7d1d
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · d683bd4a
  Michael Ochmann authored Sep 26, 2015
  
  d683bd4a
- bugfix for stereo fading and ship sound · 1dc1d526
  Michael Ochmann authored Sep 26, 2015
  
  1dc1d526
- fixed mouse button released · 60378b12
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  60378b12
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · e8c7810e
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  e8c7810e
- add astroid move and rotation speed · 5dd1841e
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  5dd1841e
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · a5dbbd2d
  Elias Broschin authored Sep 26, 2015
  
  a5dbbd2d
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · e2190dbd
  Jerry authored Sep 26, 2015
  
  e2190dbd
- now happy? ☃ · a870518c
  Jerry authored Sep 26, 2015
  
  a870518c
- merged audioeventhandler · fefd9992
  Michael Ochmann authored Sep 26, 2015
  
  fefd9992
- added ship audio with stereo flanging · 17705460
  Michael Ochmann authored Sep 26, 2015
  
  17705460
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · 83b0b3f6
  Elias Broschin authored Sep 26, 2015
  
  83b0b3f6
- changes · caee6df5
  Elias Broschin authored Sep 26, 2015
  
  caee6df5
- you shall commit your headers · 04ae7e44
  Jerry authored Sep 26, 2015
  
  04ae7e44
- you shall be there · 2a41dd64
  Jerry authored Sep 26, 2015
  
  2a41dd64
- fixed · 1b3936ec
  Elias Broschin authored Sep 26, 2015
  
  1b3936ec
- Merge branch 'feature/gameplay/commons' of... · 5bd299f0
  Elias Broschin authored Sep 26, 2015
```
Merge branch 'feature/gameplay/commons' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into feature/gameplay/commons
```
  5bd299f0
- bug fix · 28590def
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  28590def
- merged · b59afaec
  Elias Broschin authored Sep 26, 2015
  
  b59afaec
- items can be collected and placed with SPACE (mouse position) - no item... · 0472e956
  Sabrina Katharina Kotzem authored Sep 26, 2015
```
items can be collected and placed with SPACE (mouse position) - no item functions, just cubes in  different sizes as test
```
  0472e956
- merged with develop · 42472494
  Elias Broschin authored Sep 26, 2015
  
  42472494
- merged · 180ee950
  Elias Broschin authored Sep 26, 2015
  
  180ee950
- bugfix · 61c2beb9
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  61c2beb9
- player collider & can colect items · 1cc86e6b
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  1cc86e6b
- new gameplay stuff and laser sound · 620ec1b5
  Elias Broschin authored Sep 26, 2015
  
  620ec1b5
- item dropchance = 25% · ff7c25da
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  ff7c25da
- merge with develop · ac86ed3e
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  ac86ed3e
- item container changes · 3a4e3049
  Sabrina Katharina Kotzem authored Sep 26, 2015
  
  3a4e3049
25 Sep, 2015 6 commits
- fixed a bug in level reload and add a setting for mapgen debug · f3e1379a
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  f3e1379a
- fixed a segfault · 33fc8a21
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  33fc8a21
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · e25a3fdf
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
```
Conflicts:
	src/mapgen/maploader.cpp
```
  e25a3fdf
- made the mapgen better and used more of it in game · 702db16d
  Benjamin 'Albsi' Albsmeier authored Sep 26, 2015
  
  702db16d
- Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/gdw_ss15_cpp into develop · b3a0c5bd
  Elias Broschin authored Sep 26, 2015
  
  b3a0c5bd
- path find physics and map loading · 6dffec22
  Elias Broschin authored Sep 26, 2015
  
  6dffec22