1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-24 19:09:51 +00:00
Commit graph

2759 commits

Author SHA1 Message Date
Chris Robinson
0d973ac8ff Use the vector's data field instead of the address of the first element
Same thing really, but less convoluted
2012-03-21 14:38:37 -07:00
scrawl
0af8591c03 Window_MinMax 2012-03-21 21:49:37 +01:00
Chris Robinson
fd8326e958 Better handle some ffmpeg errors 2012-03-21 12:20:36 -07:00
scrawl
433a318abb colour -> textcolour 2012-03-21 19:31:56 +01:00
scrawl
37290d9638 fix text colours 2012-03-21 19:23:32 +01:00
scrawl
98f3192448 forgot to git add some stuff 2012-03-21 18:38:08 +01:00
scrawl
9b31b6272f fixed the mouse cursors and fixed MWAttribute & MWSkill 2012-03-21 16:07:56 +01:00
scrawl
2f662a226c replaced all the StaticText in layouts 2012-03-21 14:56:12 +01:00
scrawl
64212c0ee6 replaced all the StaticImage and StaticText in code 2012-03-21 14:54:02 +01:00
scrawl
99461765da restored another bunch of stuff 2012-03-21 14:00:24 +01:00
scrawl
0d56a55756 restored journal window background 2012-03-21 13:57:26 +01:00
scrawl
b0b41a9199 should now compile warning free 2012-03-21 13:48:57 +01:00
scrawl
97ab48993e more deprecated fixes 2012-03-21 13:32:32 +01:00
scrawl
deeb21a131 switched to the new multi-delegates system 2012-03-21 13:27:08 +01:00
Marc Zinnschlag
3dcfcf46cb Issue #217: container change tracking 2012-03-21 12:48:05 +01:00
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
95d27090d7 updated team list again 2012-03-20 13:53:13 +01:00
Marc Zinnschlag
f1f6e21442 fixed a copy & paste error 2012-03-20 10:33:43 +01:00
Marc Zinnschlag
1023ddd587 silenced some warnings 2012-03-20 10:30:21 +01:00
Marc Zinnschlag
50b79de10b Merge remote branch 'psi29a/master' 2012-03-20 10:26:08 +01:00
Marc Zinnschlag
226d0b279e updated team list in readme.txt 2012-03-20 10:22:44 +01:00
Marc Zinnschlag
eed4441013 adjusted changelog again 2012-03-20 10:22:01 +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
Marc Zinnschlag
c3494326db adjusted changelog 2012-03-20 10:08:16 +01:00
Brother Brick
b6b972b73b Removed libbullet and libogre dependencies and added nvidia-toolkit.
We are releasing OpenMW based on static libraries, so the first two
are no longer necessary
2012-03-20 09:53:39 +01:00
Brother Brick
42584b013f Updated dependency to match our PPA 2012-03-20 09:43:48 +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
gugus
7a1ff61541 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-19 21:31:36 +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