mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 19:26:38 +00:00
Code Issues Releases Wiki Activity
2266 commits 115 branches 76 tags 128 MiB
Commit graph

1330 commits

Author SHA1 Message Date
scrawl
d1508f5a59 List -> ListBox 2012-03-22 15:28:06 +01:00
scrawl
560e702973 fixed scroll bars 2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce fix class name typo 2012-03-22 15:10:29 +01:00
scrawl
161d519206 fixed the dialogue history topic selection 2012-03-22 15:01:37 +01:00
scrawl
9b31b6272f fixed the mouse cursors and fixed MWAttribute & MWSkill 2012-03-21 16:07:56 +01:00
scrawl
64212c0ee6 replaced all the StaticImage and StaticText in code 2012-03-21 14:54:02 +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
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
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
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
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
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
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
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
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +01: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
gugus
8740354c80 inventory filter now use player inventory 2012-03-18 17:03:54 +01: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