mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:49:58 +00:00
Code Issues Releases Wiki Activity
2480 commits 38 branches 54 tags 122 MiB
Commit graph

1515 commits

Author SHA1 Message Date
Marc Zinnschlag
a0ee2954bd Issue #217: moved some functino implementations from ptr.hpp to ptr.cpp 2012-03-21 12:29:07 +01:00
Marc Zinnschlag
0adbe258fd Issue #217: made Ptr track container; fixed a cmake script bug 2012-03-21 12:20:19 +01:00
Chris Robinson
7b22ee6fd1 Use for_each to clear the ffmpeg stream packets 2012-03-20 21:46:12 -07:00
Chris Robinson
2989a1e06e Improve ffmpeg failure messages 2012-03-20 18:57:11 -07:00
Chris Robinson
26a441f29a Add a readAll method to the sound decoder, for potentially more efficient reading 2012-03-20 17:57:28 -07:00
Chris Robinson
deb473b9ae Implement the ffmpeg decoder 2012-03-20 17:05:19 -07:00
Chris Robinson
9a48002025 Fix compilation of the FFmpeg decoder 2012-03-20 14:13:58 -07:00
Chris Robinson
e48745b68e Fix streamMusic's path lookup 2012-03-20 12:39:49 -07:00
scrawl
d451d7bb67 compile fixes for mygui 3.2 2012-03-20 20:24:36 +01:00
scrawl
66baf9ec81 Merge branch 'master' into mygui 2012-03-20 20:02:30 +01:00
Chris Robinson
fc27d5cc19 Restore music playback 2012-03-20 11:31:13 -07:00
Chris Robinson
5ae47f783e Use the sound manager's update to make sure music is still playing 2012-03-20 10:46:10 -07:00
Chris Robinson
0261aac518 Use Ogre's resource group manager to handle sound files 2012-03-20 10:34:36 -07:00
Chris Robinson
80dbf82a74 Explicitly stop sounds instead of relying on their deletion to do it 2012-03-20 07:22:17 -07:00
Chris Robinson
74e79bb4af Merge remote branch 'zini/master' into sound-rewrite 
Conflicts:
	apps/openmw/mwsound/soundmanager.cpp
	apps/openmw/mwsound/soundmanager.hpp
 2012-03-20 06:17:02 -07:00
Marc Zinnschlag
1023ddd587 silenced some warnings 2012-03-20 10:30:21 +01:00
Marc Zinnschlag
4d0d941c2e Merge remote branch 'kromgart/master' 2012-03-20 10:17:35 +01:00
Marc Zinnschlag
2d135d81e7 Merge remote branch 'lgro/glibc_pthreads_fix' 2012-03-20 10:15:47 +01:00
Marc Zinnschlag
6a0474a977 removed some cout spam 2012-03-20 10:15:22 +01:00
Marc Zinnschlag
aca274cbca Merge remote branch 'gus/DialogueSystem' 2012-03-20 10:11:40 +01:00
Marc Zinnschlag
ef711ffdc1 Merge remote branch 'scrawl/weather' 2012-03-20 10:08:43 +01:00
Pieter van der Kloet
0b517d15c1 Made missing data files dialog less scary and added exception handling for esmreader 2012-03-20 02:49:59 +01:00
scrawl
04c6f23a2b disabled solstheim weather (we can't travel there anyway) 
also, there was a bug that could cause this weather to show up on
morrowind, which is fixed now
 2012-03-19 22:54:04 +01:00
Chris Robinson
fd37a4827c Enforce a 15MB limit on the sound buffer cache 2012-03-19 13:19:22 -07:00
Lukasz Gromanowski
fc95917253 Fix for not visible pthreads function with glibc 2.15 
Linking error will appear:

Linking CXX executable ../../openmw
/usr/bin/ld: CMakeFiles/openmw.dir/__/__/components/bsa/bsa_archive.cpp.o: undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
/usr/bin/ld: note: 'pthread_mutexattr_settype@@GLIBC_2.2.5' is defined in DSO /lib/libpthread.so.0 so try adding it to the linker command line
/lib/libpthread.so.0: could not read symbols: Invalid operation
collect2: ld returned 1 exit status

if we don't add explicitly pthreads library to linker flags
after update glibc to version 2.15 on (Arch) Linux.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2012-03-19 20:54:30 +01:00
Roman Melnik
88979577db Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit) 2012-03-19 21:45:53 +02:00
Chris Robinson
04638516b2 Check for stopped active sounds too and remove them 2012-03-19 12:08:40 -07:00
Roman Melnik
a9759c3f33 Fix bug #192: Remove the focus from the console when console is closed 
(set current keyFocusWidget to nullptr)
 2012-03-19 21:01:00 +02:00
Marc Zinnschlag
b46a2bfa01 Merge remote branch 'werdanith/journalmessage' 2012-03-19 19:34:28 +01:00
Marc Zinnschlag
f2a47d421b some cleanup 2012-03-19 19:21:08 +01:00
Michael Papageorgiou
82c4bfbf18 Add a notification when the journal is updated 2012-03-19 20:18:08 +02:00
gugus
d4f3430fc6 fix: topics who should not be displayed are not displayed anymore. 2012-03-19 19:17:20 +01:00
Chris Robinson
6c45d6668b Cache OpenAL buffers for easy reuse 2012-03-19 10:33:06 -07:00
gugus
2707391535 fix for questions 2012-03-19 18:30:52 +01:00
gugus
11569819db compilation fix 2012-03-19 18:01:54 +01:00
gugus
ba4d44eb67 fix for questions. 2012-03-19 18:01:41 +01:00
Chris Robinson
91821ccd8c Add the sound stream to the thread after resetting the mIsFinished flag 2012-03-19 09:08:59 -07:00
Chris Robinson
db46bf39b3 Add a rewind method to the sound decoder 2012-03-19 08:48:25 -07:00
Chris Robinson
afa2cb6de7 Stop trying to read decoded audio once it's finished 2012-03-19 07:51:28 -07:00
Chris Robinson
4f69972a9c Add a method to stream a sound in 3D 2012-03-19 07:28:03 -07:00
Chris Robinson
ae8218bf03 Allocate OpenAL sources when opening the device 
This allows sources to be more efficiently retrieved and returned
 2012-03-19 07:11:01 -07:00
Chris Robinson
8f9d4ff841 Use 6 125ms buffers for OpenAL streams 2012-03-19 05:29:04 -07:00
Chris Robinson
dc6354b2f9 Add functions to get string names for sample types and channel configs 2012-03-19 02:31:40 -07:00
Chris Robinson
4a0b5b7918 Increase the sound stream thread sleep time to 50ms 2012-03-19 02:19:13 -07:00
Chris Robinson
4698e8c0a2 Make the sound stream thread object per-device 2012-03-19 02:15:08 -07:00
Chris Robinson
2c27827e4f Add some comment markers to the OpenAL sound classes 2012-03-19 01:33:33 -07:00
Chris Robinson
e234b90173 Use a loop to find the OpenAL format from the decoder format 2012-03-19 00:49:52 -07:00
Chris Robinson
6a256d3993 Make sure the OpenAL stream list is clear before shutting down 2012-03-19 00:38:56 -07:00
Jason Hooks
fe9e6a732c Some cleanup 2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
gugus
7ca0503205 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 00:20:43 +01:00
gugus
1a832a65f6 Changed a lot of things. Topics can now change durring dialogue without bug. 
Missing: ability to remove keyword
 2012-03-19 00:19:58 +01:00
Chris Robinson
7194114669 Use a background thread to keep OpenAL streams fed 
Maybe this could be moved to the SoundManager instead of in OpenAL, but it's
good enough for now.
 2012-03-18 14:42:19 -07:00
Michael Papageorgiou
d10b18b0f3 Removed a couple of warnings with nosound 2012-03-18 22:50:52 +02:00
gugus
ff5d4b24fc journal filter works now 2012-03-18 21:47:43 +01:00
Michael Papageorgiou
f567950e25 Fix for the --nosound crash 2012-03-18 22:38:53 +02:00
Marc Zinnschlag
af39275a63 Merge remote branch 'scrawl/weather' 2012-03-18 21:07:04 +01:00
scrawl
1907e21207 removed preprocessor constants 2012-03-18 20:44:56 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01:00
Chris Robinson
b938fd7b36 Make the sound output init return void 2012-03-18 12:19:54 -07:00
Chris Robinson
1965b5bc79 Rename some Sound class member functions 2012-03-18 12:03:15 -07:00
Chris Robinson
403e51cef3 Move the sample type and channel config enums to MWSound and give use appropriate names for the values 2012-03-18 11:56:54 -07:00
Chris Robinson
efae7dfe83 Rename some sound decoder class member variables and functions 2012-03-18 11:47:15 -07:00
Chris Robinson
9656456d30 Make sure the sound decoders are closed when they're finished with 2012-03-18 11:34:23 -07:00
Chris Robinson
362e254720 Rename some more sound class member variables and functions 2012-03-18 11:30:53 -07:00
Chris Robinson
162642e672 Prefix some SoundManager class member variables 2012-03-18 11:17:45 -07:00
gugus
9c85a8c1ce Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-18 19:06:52 +01:00
Marc Zinnschlag
ce2cb709c5 fixed getJournalIndex function 2012-03-18 19:05:35 +01:00
gugus
00d3bc9d23 every filters are check during dialogue now. There is a problem with journal. 2012-03-18 18:58:22 +01:00
gugus
7f2ff6f5f1 removed the TODO 2012-03-18 18:05:28 +01:00
gugus
4afe6dd235 death filter 2012-03-18 18:04:51 +01:00
gugus
48e6a42168 Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanager.cpp
 2012-03-18 17:59:11 +01:00
gugus
34b33b78d2 better filters 2012-03-18 17:58:14 +01:00
Marc Zinnschlag
76b24d9d1a fixed a compile error 2012-03-18 17:30:05 +01:00
Chris Robinson
2f92559fc7 Use OpenAL's linear attenuation model 
We should use the inverse distance clamped model (the default), but we first
need to handle muting sounds that are beyond their max distance. Linear
attenuation doesn't give a proper rolloff, but it makes the sounds silent at
max distance.
 2012-03-18 09:05:38 -07:00
gugus
8740354c80 inventory filter now use player inventory 2012-03-18 17:03:54 +01:00
Chris Robinson
a256b9a7b0 Remove a comment about Audiere 2012-03-18 08:42:55 -07:00
gugus
019a28093b better filters 2012-03-18 15:26:18 +01:00
scrawl
3a00fbb950 removed mygui from source tree and use system install instead 2012-03-18 15:11:37 +01:00
Marc Zinnschlag
d9677cb33e fixed problem with parsing optional string arguments 2012-03-18 14:27:49 +01:00
gugus
100c6a42a5 better default values for filters 2012-03-18 11:32:05 +01:00
Marc Zinnschlag
655f9fe920 Merge remote branch 'k1ll/staticogre' 2012-03-18 11:16:34 +01:00
Marc Zinnschlag
af875896ad fix for issue #179 2012-03-18 11:09:38 +01:00
Chris Robinson
3fea3e7d25 Fix stereo files with libsndfile 2012-03-17 23:47:12 -07:00
Chris Robinson
f7ac94d686 Pass the new position to the sound update method 2012-03-17 23:41:45 -07:00
Chris Robinson
44fc204864 Avoid passing a sound decoder to the play methods 2012-03-17 23:30:43 -07:00
Chris Robinson
ddfa906922 Add a missing include 2012-03-17 22:45:28 -07:00
Chris Robinson
a69ec91242 Remove some unnecessary wrappers and do some small cleanups 2012-03-17 22:13:57 -07:00
Marc Zinnschlag
187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 2012-03-17 19:32:44 +01:00
Chris Robinson
a91085a1b9 Add a couple comments 2012-03-17 10:45:11 -07:00
Chris Robinson
7160d20db3 Be more consistent with the vector orientations given the sound handler 2012-03-17 10:36:34 -07:00
Chris Robinson
cbeff4657f Pass the loop and untracked flags when playing a 3d sound 2012-03-17 10:16:22 -07:00
Chris Robinson
87adf6002a Fix a copy-paste typo in the openal output 2012-03-17 09:57:39 -07:00
Chris Robinson
5563f583ff Add and implement methods to update tracked sounds on an object 2012-03-17 09:51:03 -07:00
Chris Robinson
979ae89aab Pass volume and pitch parameters to streamed sounds 2012-03-17 09:37:41 -07:00
Chris Robinson
cac07d0fbf Remove some unnecessary methods 2012-03-17 09:27:31 -07:00
Chris Robinson
e49a090af7 Remove unnecessary hack 2012-03-17 09:16:09 -07:00
Chris Robinson
d57051375d Implement non-streaming sounds with OpenAL 2012-03-17 09:15:47 -07:00
gugus
f87bd65ae1 Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem 2012-03-17 17:00:28 +01:00
gugus
846196d048 fixed a crash 2012-03-17 16:56:22 +01:00
Chris Robinson
9adf1e8461 Keep a handle on played sounds 2012-03-17 08:02:46 -07:00
scrawl
21143f006b fix several warnings 2012-03-17 15:47:22 +01:00
scrawl
9d4f79bcfc GCC compile fix 2012-03-17 15:24:47 +01:00
Michael Papageorgiou
dbbf50a184 Journal sounds, close sound will be added later 2012-03-17 15:52:57 +02:00
Chris Robinson
656863ec6e Add functions to play sounds 2012-03-17 06:51:44 -07:00
Chris Robinson
a46f8ced05 Keep the sound output's listener updated with the camera position 2012-03-17 06:18:59 -07:00
scrawl
5e939e4818 map window now works for interiors 2012-03-17 13:59:51 +01:00
scrawl
1840401172 weather transitions (e.g. from clear to cloudy) use timescale 2012-03-17 13:14:31 +01:00
scrawl
3ae69f792a no light-"jumps" during night 2012-03-17 12:57:52 +01:00
Chris Robinson
2dabdcb9e5 Add a function to update the sound listener 2012-03-17 04:22:54 -07:00
Chris Robinson
2429755bf1 Make the sound's Play method return void 2012-03-17 03:20:43 -07:00
Chris Robinson
caf5d71d44 Make the sound decoder's Open method return void 
Errors are thrown, not returned
 2012-03-17 03:18:28 -07:00
Chris Robinson
1b41987e18 Move OpenAL_SoundStream function definitions out of the class 2012-03-17 03:15:07 -07:00
Chris Robinson
2f6b73d461 Prevent streamMusic from throwing an exception 2012-03-17 03:06:35 -07:00
Chris Robinson
207d7dd89e Stop and delete the current music before deleting the sound output 2012-03-17 03:01:51 -07:00
Chris Robinson
1ade01edc8 Add a function to stream sounds 2012-03-17 02:55:08 -07:00
Chris Robinson
9cf42f6d0f Flesh out the sound decoder a bit more 2012-03-17 02:51:46 -07:00
Chris Robinson
637617056b Make a skeleton Sound class 2012-03-17 02:45:18 -07:00
Chris Robinson
246b0266fb Remove references to Audiere. It's not supported for now. 2012-03-17 00:11:59 -07:00
Chris Robinson
46cd84aac5 Add a skeleton ffmpeg decoder 2012-03-16 23:59:21 -07:00
Chris Robinson
1322b1e160 Move Sound_Output's definition to a separate header 2012-03-16 23:40:07 -07:00
Chris Robinson
10037e79e7 Add a skeleton decoder class using mpg123 and libsndfile 2012-03-16 23:18:15 -07:00
Chris Robinson
45b612ab3b Add a skeleton output classs using OpenAL 2012-03-16 22:12:17 -07:00
Chris Robinson
42b445383f Remove Mangle- and OpenEngine-related sound code 
Start of the sound code refactoring. Currently there is no sound, but it will
be added back.
 2012-03-16 17:08:13 -07:00
scrawl
3e4cf64a77 Merge branch 'master' into shaders 2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79 sun gradually disappears 2012-03-16 20:39:58 +01:00
scrawl
d18b3271b1 transition tweak 2 2012-03-16 20:32:41 +01:00
scrawl
460b584934 transition tweaks 2012-03-16 19:49:01 +01:00
scrawl
a67cc8e73b more fixes 2012-03-16 19:02:33 +01:00
gugus
10321ff51a Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-16 17:58:23 +01:00
gugus
042d87f77f a lot of clean up 2012-03-16 17:53:34 +01:00
gugus
91801e5cab stop spamming messages 2012-03-16 17:39:14 +01:00
gugus
56a84b6a1a choices works. The only thing remaining is the script arguments problems. 
Need a lot of clean up too.
 2012-03-16 17:30:59 +01:00
scrawl
c885ec1bd1 Merge branch 'master' into minimap 2012-03-16 17:10:27 +01:00
scrawl
91d2031eb7 first attempt at map window 2012-03-16 17:09:31 +01:00
Michael Papageorgiou
b2c6d52db1 Another file search fix 2012-03-16 09:00:18 +02:00
scrawl
877cb2aca7 much better looking moons 2012-03-15 20:35:23 +01:00
scrawl
e354203c21 stars rotation 2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson
e8eea03b4c Fixed a few more non-virtual destructor warnings 2012-03-15 17:40:42 +01:00
Marc Zinnschlag
a7211d2a90 Merge remote branch 'werdanith/searchfix' 2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7 Improved matching for the FileListLocator 2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d warning level adjustments and some related fixes 2012-03-15 16:01:41 +01:00
k1ll
b7eb7ff8e3 Added support for linking static Ogre libraries and plugins into the launcher and openmw. 2012-03-15 15:51:39 +01:00
Marc Zinnschlag
6f9d9c0f9e another armour class detection fix 2012-03-15 15:05:14 +01:00
Marc Zinnschlag
7ab20c3eb1 fixed armour class detection 2012-03-15 14:36:12 +01:00
Marc Zinnschlag
c616d005e8 fixed a spelling mistake 2012-03-15 14:31:16 +01:00
Marc Zinnschlag
3c3fb8d706 Merge remote branch 'werdanith/activationsounds2' into equipment 2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7 Fix regression with locating sound files 2012-03-15 13:56:46 +02:00
scrawl
2edd7e59f4 some fixes and facilities for saving the fog of war to disk 2012-03-14 20:44:06 +01:00
gugus
07d8d654cd one step toward function filters and end choices. 2012-03-14 18:47:29 +01:00