Commit Graph

53 Commits (a872ea128bc8beeb78551e5b2a257c02325f86f4)

Author SHA1 Message Date
Piotr Dziwinski a872ea128b Add MakeUnique template to avoid use of naked new 2015-07-17 20:06:59 +02:00
Piotr Dziwinski f581d87474 Fix double increment bug in OpenAL channel allocation 2015-07-16 07:16:55 +02:00
Piotr Dziwinski c8498548cc Remove manual memory management in oalsound
Plugging a few more memory leaks detected by valgrind
2015-07-15 22:43:30 +02:00
Piotr Dziwinski 9b232ee3f5 Sound enum refactoring
* rename Sound -> SoundType
 * add parsing string to SoundType
2015-07-09 21:32:25 +02:00
krzys-h 6d152d5aee Fixed console spam when music files are not installed
Closes #359
2014-11-02 13:35:00 +01:00
krzys-h 0245fdc6c3 Merge branch 'dev-physfs' into dev
Conflicts:
	src/app/app.cpp
2014-10-19 16:18:36 +02:00
krzys-h 9ea0b37408 Possible fix for #331 2014-10-19 14:21:55 +02:00
krzys-h f65b00089a Merge branch 'dev' into dev-physfs
Conflicts:
	data
2014-10-14 15:42:19 +02:00
krzys-h 9fd6cf5449 Changed all occurences of PPC in the code to TerranovaTeam 2014-10-14 15:26:18 +02:00
Piotr Dziwinski 5274acd624 Merge with dev 2014-10-07 22:15:40 +02:00
Piotr Dziwinski ac019c263d Remove unnecessary delete checks (#318) 2014-08-09 22:45:07 +02:00
krzys-h 7b04f67358 Fixed music loading 2014-07-10 15:38:37 +02:00
Krzysztof Dermont 754154341d More work on PhysFS support
* added output stream
* fixed music loading
2014-06-22 15:01:06 +02:00
Krzysztof Dermont 2260f6bf4f Big part of PhysFS support
* removed -mod argument
* removed -datadir argument
* removed -lang argument
* removed some dead ui code
* added resource manager and file loaders (stream and SDL)
* changed interface textures location to match new directory structure
* removed CGameData for mod support
* added PhysFS support
2014-06-20 23:51:28 +02:00
krzys-h f0d97bfdb9 Better datadir mod support 2014-05-18 12:12:47 +02:00
andreymal 1a0dcedf83 fixed m_oldMusic.push_back(nullptr) and segfault 2014-03-02 18:00:02 +04:00
krzys-h bb2a9bcfd3 Added option to set pause audio in Scene 2014-02-21 14:19:58 +01:00
erihel 2433cb595a Added a check when trying to play a music file 2014-02-21 10:13:48 +01:00
erihel f21ab91184 Changed max channels to fix compilation error 2014-02-02 02:01:42 +01:00
erihel d84d38280b Changed max number of sound channels 2014-02-02 01:50:34 +01:00
erihel c5ae2610b5 Minor changes to sound support.
* changed channel limit from 64 to 2048 that will decrease if error is found while trying to play sound
* added id to each channel to avoid collisions when more than 1 object tries to modify a sound
* minor formatting changes
2014-01-18 03:42:07 +01:00
krzys-h 999490e88b Code for changing music in pause mode
As requested by @Emxx52. Only code for now, we don't have the music yet. Temporairly in developements builds music will change to Prototype (in CBot editor) and Constructive Destruction (in SatCom)
2013-12-31 16:58:21 +01:00
krzys-h 9631f26270 Don't stop music when SatCom or pause menu is opened 2013-12-28 16:45:11 +01:00
krzys-h e9addb5a5e Added smooth transition in music - issue #205 2013-12-28 12:30:46 +01:00
erihel fe3f9ea38c Sound support changes
* removed 2d sound
* fixed listener orientation (propably issue #235)
* removed unused code and minor refactoring
2013-12-19 22:46:29 +01:00
Piotr Dziwinski 950a3474d5 Refactored sound code
* fixed formatting and naming to be uniform with rest of code
 * moved default implementation of CSound to cpp module
2013-05-27 10:19:16 +02:00
Piotr Dziwinski 8765d58b02 Fixed code formatting
* moved braces to new lines
 * fixed some function/variable names
 * fixed whitespace issues
2013-05-27 10:19:16 +02:00
erihel 3c442d17dc Fix for issue #202 with 3D sound disabled 2013-05-03 21:12:39 +02:00
krzys-h 166a6b4403 Improved music cache 2013-05-02 16:37:11 +02:00
krzys-h f419293207 Minor refactoring 2013-05-01 12:12:32 +02:00
erihel 88478990b9 * Fix a problem with CleanUp function trying to clean up music cache twice 2013-04-26 14:15:11 +02:00
krzys-h cdba398d29 Added music files cache 2013-04-13 16:34:52 +02:00
krzys-h ebffda717b Implemented AudioChange (partially)
There is some issues due to #173
Issue #172
2013-04-13 11:44:16 +02:00
erihel 8a0383c9f0 * More work on sound 2013-04-12 01:46:30 +02:00
erihel 82fdc2ba23 * Fixed problem with 2D sound mode 2013-04-11 23:16:32 +02:00
erihel 99d386b61a * Fixed problem with MuteAll and some sounds not playing after muting other sounds (like game menu sound) 2013-04-09 13:20:31 +02:00
erihel 846e7b6578 * Adjusted pan computing function from original game (2D sound should work correctly)
* Set max sound distance to 110.0f to match original colobot (for issue #123)
2013-04-08 01:42:12 +02:00
erihel 7513bc5864 * Set distance model to fix issue #123 2013-04-07 16:26:15 +02:00
erihel f4b1cabbde * Sound are too quiet in 3D mode, for now added support for 2D sound option in menu. In 2D mode sounds are normal (Issue #123) 2013-04-07 13:35:39 +02:00
erihel b7b5f002a6 * Removed warning while compiling brain.cpp
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
2013-03-30 16:03:25 +01:00
erihel 9f5bef030d * Adjusted sound volume to game settings
* Added fabs to remove logs about pitch having negative values
2013-03-14 23:03:03 +01:00
Piotr Dziwinski b361d27d33 Removed unnecessary print 2013-02-28 20:29:16 +01:00
erihel 3a594dc3a8 * Changed AdjustFrequency formula
* Changed SetVolume to match orginal game formula
2013-02-24 18:04:38 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
erihel 9f75a29e88 * Fixed sound pitch causing segfault
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
2013-01-16 01:45:38 +01:00
erihel 58f35e44ae * Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
erihel 983373f150 * Fixed pitch calculation (sound in cut scenes will work as well as robot tracks sound)
* Fixed applying effects to sounds
* Changed volume to range 0.0-1.0 except for values in UI
2013-01-09 23:19:10 +01:00
erihel fff9d235e4 * Fixed problem with freeing buffers while conneted to a source resulting with "Unable to unload buffer message"
* Fixed posible segfault while trying to play sound after not loading file properly
2013-01-04 21:44:16 +01:00
erihel c9ca8f2b62 * Fixed segault when could not set sound pitch (bad logger call)
* All 81 audio files should be loaded instead of 69 high quality
* Changed volume ajustment formula to proper one
2012-12-28 21:19:50 +01:00
erihel c793d2d4c6 * Changed Ret to Get methods in sound module
* Added video settings to profile
* Resolution change is now posibble but restart is required
2012-12-25 21:36:50 +01:00