scrawl
b0b41a9199
should now compile warning free
13 years ago
scrawl
97ab48993e
more deprecated fixes
13 years ago
scrawl
deeb21a131
switched to the new multi-delegates system
13 years ago
scrawl
d451d7bb67
compile fixes for mygui 3.2
13 years ago
scrawl
66baf9ec81
Merge branch 'master' into mygui
13 years ago
Marc Zinnschlag
1023ddd587
silenced some warnings
13 years ago
Marc Zinnschlag
4d0d941c2e
Merge remote branch 'kromgart/master'
13 years ago
Marc Zinnschlag
2d135d81e7
Merge remote branch 'lgro/glibc_pthreads_fix'
13 years ago
Marc Zinnschlag
6a0474a977
removed some cout spam
13 years ago
Marc Zinnschlag
aca274cbca
Merge remote branch 'gus/DialogueSystem'
13 years ago
Marc Zinnschlag
ef711ffdc1
Merge remote branch 'scrawl/weather'
13 years ago
Pieter van der Kloet
0b517d15c1
Made missing data files dialog less scary and added exception handling for esmreader
13 years ago
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
13 years ago
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>
13 years ago
Roman Melnik
88979577db
Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)
13 years ago
Roman Melnik
a9759c3f33
Fix bug #192 : Remove the focus from the console when console is closed
...
(set current keyFocusWidget to nullptr)
13 years ago
Marc Zinnschlag
b46a2bfa01
Merge remote branch 'werdanith/journalmessage'
13 years ago
Marc Zinnschlag
f2a47d421b
some cleanup
13 years ago
Michael Papageorgiou
82c4bfbf18
Add a notification when the journal is updated
13 years ago
gugus
d4f3430fc6
fix: topics who should not be displayed are not displayed anymore.
13 years ago
gugus
2707391535
fix for questions
13 years ago
gugus
11569819db
compilation fix
13 years ago
gugus
ba4d44eb67
fix for questions.
13 years ago
gugus
7ca0503205
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
gugus
1a832a65f6
Changed a lot of things. Topics can now change durring dialogue without bug.
...
Missing: ability to remove keyword
13 years ago
Michael Papageorgiou
d10b18b0f3
Removed a couple of warnings with nosound
13 years ago
gugus
ff5d4b24fc
journal filter works now
13 years ago
Michael Papageorgiou
f567950e25
Fix for the --nosound crash
13 years ago
Marc Zinnschlag
af39275a63
Merge remote branch 'scrawl/weather'
13 years ago
scrawl
c2329b7027
removed preprocessor constants
13 years ago
gugus
9c85a8c1ce
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
13 years ago
Marc Zinnschlag
ce2cb709c5
fixed getJournalIndex function
13 years ago
gugus
00d3bc9d23
every filters are check during dialogue now. There is a problem with journal.
13 years ago
gugus
7f2ff6f5f1
removed the TODO
13 years ago
gugus
4afe6dd235
death filter
13 years ago
gugus
48e6a42168
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanager.cpp
13 years ago
gugus
34b33b78d2
better filters
13 years ago
Marc Zinnschlag
76b24d9d1a
fixed a compile error
13 years ago
gugus
8740354c80
inventory filter now use player inventory
13 years ago
gugus
019a28093b
better filters
13 years ago
scrawl
3a00fbb950
removed mygui from source tree and use system install instead
13 years ago
Marc Zinnschlag
d9677cb33e
fixed problem with parsing optional string arguments
13 years ago
gugus
100c6a42a5
better default values for filters
13 years ago
Marc Zinnschlag
655f9fe920
Merge remote branch 'k1ll/staticogre'
13 years ago
Marc Zinnschlag
af875896ad
fix for issue #179
13 years ago
Marc Zinnschlag
187b8e58d6
fixed handling of optional instruction/function arguments; removed choice workaround
13 years ago
gugus
f87bd65ae1
Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem
13 years ago
gugus
846196d048
fixed a crash
13 years ago
scrawl
21143f006b
fix several warnings
13 years ago
scrawl
9d4f79bcfc
GCC compile fix
13 years ago