Daniel Evans
|
42c847cfab
|
Merge pull request #111 from tsjost/fix/audio
Replace SFML Audio with libsndfile + OpenAL
|
2016-05-30 22:53:51 +01:00 |
|
Timmy Sjöstedt
|
4909e68b82
|
Added explanatory comments to MADStream
|
2016-05-30 23:44:42 +02:00 |
|
Timmy Sjöstedt
|
5a8b5a603f
|
More alCheck calls
|
2016-05-30 20:06:34 +02:00 |
|
Timmy Sjöstedt
|
0d443cc535
|
Improved sound/music loading. No temporary objects
|
2016-05-30 20:06:34 +02:00 |
|
Timmy Sjöstedt
|
08b45b6c12
|
Sleep while waiting for OpenAL buffers to become available
|
2016-05-30 20:06:34 +02:00 |
|
Timmy Sjöstedt
|
d715cfe24a
|
Make the right part of the code store the name of loaded audio
Otherwise game_play_music_id thinks that the audio hasn't loaded
|
2016-05-30 20:06:34 +02:00 |
|
Timmy Sjöstedt
|
ccabc6f1d8
|
Improved music map access
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
f40a0cf29f
|
Make the SoundManager OpenAL context current
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
fef71de074
|
Removed SFML audio things
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
14e712f202
|
Wait for buffers to become available before uploading data
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
63986edca4
|
Make libmad decoder run in a thread
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
6a1a204728
|
Upload audio data to OpenAL
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
963f4c62ea
|
Make cutscene audio use SoundManager
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
5294b40c40
|
Implement stopMusic method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
861dbf0c2a
|
Implemented playMusic method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
6a14dc3e02
|
Implemented loadMusic method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
7a5bbea3a3
|
Keep track of where to write into the circular buffer
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
b539b09975
|
Set up OpenAL buffers etc for MADStream
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
62243b0382
|
Move alCheck macrofunction into its separate files
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
58fdcd47dc
|
Moved static scale function into MADStream
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
fa13ace921
|
Moved MADStream implementation to source file
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
6afc4e7147
|
Make mission sounds use new audio system
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
9a2bb1b156
|
Reimplement background noise things
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
2bf0500a34
|
Implemented pauseSound method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
ad137421fb
|
Implemented isPlaying method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
59a7189ab3
|
Implemented playSound method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
91c1374b89
|
Implemented isLoaded method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
830922c9ca
|
Removed old PlayingSound struct
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
667031c51f
|
Implemented loadSound method
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
f43e13359a
|
Added Sound struct
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
cd0109af82
|
Added simple method to initialize OpenAL
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
6f8b006787
|
Implement SoundBuffer class to handle OpenAL uploads
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
0d01be5b27
|
Implemented SoundSource class to handle libsndfile loading
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
9fcd3433b3
|
Add OpenAL error checking macro + function
|
2016-05-30 20:06:33 +02:00 |
|
Timmy Sjöstedt
|
f5390ad4a6
|
Include libsndfile & OpenAL
|
2016-05-30 20:06:13 +02:00 |
|
Daniel Evans
|
d490f8c7c6
|
Merge pull request #106 from JayFoxRox/debug-jump-and-flip
Debug features: "Jump to Debug Camera" and "Flip Vehicle"
|
2016-05-30 10:22:38 +01:00 |
|
Jannik Vogel
|
846771aa82
|
Add option to flip vehicle in debug menu
|
2016-05-29 14:59:47 +02:00 |
|
Jannik Vogel
|
79b7ec2b17
|
Add option to jump to camera position in debug menu
|
2016-05-29 14:59:47 +02:00 |
|
Daniel Evans
|
46a7254a41
|
Use FindGLM
|
2016-05-29 00:44:31 +01:00 |
|
Daniel Evans
|
afc0374dab
|
Merge pull request #103 from kragniz/glm-cmake
Copy FindGLM.cmake from glm
|
2016-05-29 00:38:13 +01:00 |
|
Louis Taylor
|
811ec2c4fa
|
Copy FindGLM.cmake from glm
This was removed in upstream in the following commit:
62a7daddcf
|
2016-05-29 00:35:55 +01:00 |
|
Daniel Evans
|
5f4400f362
|
Fix character test to actually be correct
|
2016-05-28 01:32:48 +01:00 |
|
Daniel Evans
|
5628f6ceb9
|
Merge pull request #95 from JayFoxRox/debug-car-spawn
Add car spawner to debug menu
|
2016-05-26 22:39:25 +01:00 |
|
Daniel Evans
|
6422c8ae97
|
Move blip object lookup and make arrows work again.
|
2016-05-26 21:49:26 +01:00 |
|
Jannik Vogel
|
2e002013bd
|
Add car spawner to debug menu
|
2016-05-26 22:17:11 +02:00 |
|
Daniel Evans
|
50cf4293e4
|
Give blips the correct type.
Fixes #94
|
2016-05-26 20:59:15 +01:00 |
|
Daniel Evans
|
b23a81063d
|
Implement ammo: ammo tracking and pickups
Fixes #47
|
2016-05-26 00:44:09 +01:00 |
|
Daniel Evans
|
327ac49e64
|
Only alive characters should perform activities.
Fixes #81
|
2016-05-26 00:40:22 +01:00 |
|
Daniel Evans
|
eef34c972a
|
Script pickups: implement weapon pickups, improve pickup code
|
2016-05-25 23:00:52 +01:00 |
|
Daniel Evans
|
230ad972f0
|
Add world space distance fog
|
2016-05-25 23:00:52 +01:00 |
|