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
|
70ed5770da
|
black journal text
|
2012-03-22 17:32:18 +01:00 |
|
scrawl
|
250fcab7c2
|
moved the mygui resources to a more suitable location
|
2012-03-22 17:11:24 +01:00 |
|
scrawl
|
6827aac42c
|
fix all mygui.log warnings, fix journal
|
2012-03-22 17:02:02 +01:00 |
|
scrawl
|
75d5714fe0
|
TextEdit, TextBoxEdit, DispEdit fix more consistent
|
2012-03-22 16:45:27 +01:00 |
|
scrawl
|
d67ee8b511
|
console fix more consitent
|
2012-03-22 16:18:49 +01:00 |
|
scrawl
|
6b4a35667c
|
fix window titles
|
2012-03-22 16:13:36 +01:00 |
|
scrawl
|
755e05e742
|
fixed ListBox selected item colour
|
2012-03-22 16:04:11 +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 |
|
scrawl
|
3b76f6dcf4
|
fixed console log
|
2012-03-22 13:44:39 +01:00 |
|
scrawl
|
43349eb539
|
fixed console command line
|
2012-03-22 13:34:02 +01:00 |
|
scrawl
|
ceea51fe9f
|
fixed TextEdit, TextBoxEdit, DispositionEdit
|
2012-03-22 13:29:54 +01:00 |
|
scrawl
|
9933de7c6a
|
Edit -> EditBox
|
2012-03-22 12:21:03 +01:00 |
|
Marc Zinnschlag
|
47828f91f0
|
Issue #217: added getWeight function to ContainerStore
|
2012-03-22 09:45:48 +01:00 |
|
scrawl
|
0af8591c03
|
Window_MinMax
|
2012-03-21 21:49:37 +01: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 |
|