Merge branch 'landscape_14' into fmod_integration
add 3D plop sound
- fixed sphere spawner to center
- set plop noise to center
*have fun!*
moved data files, switched sound paused
removed dataDir from cmakelist
Merge branch 'master' into fmod_integration
put spawner to hand
Merge pull request #25 from lanice/fmod_integration

Fmod integration
switch zoom direction when scrolling
use vertex+index buffer for water particles #28
add simple particle shader #28
fix beeing able to pitch below terrain level #23
fix buffer config, update only on particle creation. we will need an particle drawable for more efficient rendering #28
fix camera flip when looking down from above
Merge pull request #31 from lanice/fix_zoom

Fix zoom/pitch
add particle drawable #28
add basic particle buffer rendering #28
Merge remote-tracking branch 'origin/master' into particle_vbo_28

Conflicts:
	src/world.cpp
remove unused graphics context from world, physxWrapper

This was used while experimenting with apex.
Merge remote-tracking branch 'remotes/origin/particle_vbo_28' into particles

Conflicts:
	src/objectscontainer.cpp
	src/objectscontainer.h