scrawl
743ea0c9be
use hardware occlusion query for sun glare effect
2012-03-24 17:59:26 +01:00
scrawl
5fba52c238
Merge branch 'terrain18' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-24 15:14:33 +01:00
scrawl
99b2b6b648
ogre 1.8 fixes
2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
2012-03-24 13:19:17 +01:00
scrawl
f4898539e9
added some code that doesn't do anything yet, waiting for ogre 1.8
2012-03-24 13:06:01 +01:00
Marc Zinnschlag
9ec1e55aaf
Merge remote branch 'scrawl/minimap' into next
2012-03-24 10:31:42 +01:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
a1f80e029e
abstracted some code to be reused for hud
2012-03-23 16:16:31 +01:00
scrawl
789fbb460f
move implementation to .cpp
2012-03-23 15:34:54 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
scrawl
770b0f2106
gui changes
2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
scrawl
8e299bd25b
remove unuseful std::cout
2012-03-23 08:16:32 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +01:00
scrawl
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
2012-03-22 22:31:49 +01:00
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f
MW_MapView skin
2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17
Merge remote branch 'scrawl/mygui' into mygui
2012-03-22 18:46:21 +01:00
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
Marc Zinnschlag
47828f91f0
Issue #217 : added getWeight function to ContainerStore
2012-03-22 09:45:48 +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
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
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