Emanuel Guevel
43d6392921
Change the way pinnable window are made visible
...
This ensure pinned window are not displayed in main menu, dialogue and
container mode.
2013-02-20 01:00:13 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
scrawl
00db13be32
Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.
2013-02-17 15:56:22 +01:00
Marc Zinnschlag
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
2013-02-16 14:50:42 +01:00
Tom Mason
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
2013-02-10 14:58:46 +00:00
Sergey Shambir
725bfe6372
TradeWindow: balance now changes per time if user holds +/- button
...
pressed
2013-02-10 08:50:36 +04:00
scrawl
608c112f34
Supply the new render window to mygui
2013-02-05 20:48:25 +01:00
Jordan Milne
9b485a86ef
resize the window in a slightly less bad way, fix my check in setUseHardwareCursors to be the right way round
2013-01-13 22:38:22 -04:00
Jordan Milne
b6ec64485c
fix includes for Windows
2013-01-12 17:52:26 -04:00
Jordan Milne
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
2013-01-12 11:57:29 -04:00
scrawl
30136eb449
Update settings UI
2013-01-12 06:36:48 +01:00
Jordan Milne
eeacb04fe2
Fully working hardware cursors (if you compile SDL2 with XCursor support)
2013-01-11 09:32:29 -04:00
Jordan Milne
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
2013-01-11 08:27:59 -04:00
Jordan Milne
1bf36c686c
add ability to check if a window is on the stack (to see if we're in the main menu)
2013-01-09 06:09:47 -04:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
2013-01-03 01:09:03 +01:00
scrawl
86f30992d7
fix message boxes not appearing properly when e.g. trading
2013-01-01 22:00:14 +01:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Tom Mason
299a1f32ed
cleanup
2012-12-26 23:52:16 +00:00
Tom Mason
716fbbbd74
messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory
2012-12-26 22:57:53 +00:00
Marc Zinnschlag
afc2e840ae
renamed namespace TranslationData to Translation
2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
2012-12-26 17:03:37 +01:00
lazydev
74ae479780
Cell names localization fix
2012-12-23 23:23:24 +04:00
scrawl
64210e6efa
Revert "New Game button"
...
This reverts commit c5dd0e19688b388b6e4e978d5ecf07ec14f5085d.
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec89960405726594a50e5a7fa787b075.
2012-12-18 19:09:08 +01:00
scrawl
86671096ec
remove commandline switch for new game
2012-12-16 16:14:49 +01:00
scrawl
c5dd0e1968
New Game button
2012-12-16 16:05:31 +01:00
scrawl
a3bd3a40ca
fix 2 unrelated leaks
2012-12-16 00:47:29 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
dc67a547b0
global map explored overlay
2012-11-16 19:34:09 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
scrawl
b2afb1fd5c
Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/spellbuyingwindow.cpp
apps/openmw/mwgui/trainingwindow.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2012-11-08 23:16:40 +01:00
scrawl
3d7146cd50
don't allow opening a window multiple times, primarily the console
2012-11-08 19:34:54 +01:00
greye
9ab2c16055
store created character classes as dynamic records
2012-11-08 01:22:44 +04:00
greye
a9c1ce412a
applying new interface vol.7, inconsistent
2012-11-06 11:29:18 +04:00
gugus
2841d831a6
Disposition is now updated everyframe
2012-11-05 23:16:37 +01:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
scrawl
38828acac9
transparent overlay
2012-11-04 12:13:04 +01:00
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
gugus
85d9357e3a
Travel GUI
2012-10-06 17:52:46 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
dc33dee22e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
2012-10-01 20:25:23 +02:00
scrawl
ff2c2d2b96
Merge branch 'master' into spellcreation
...
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
2012-10-01 17:54:45 +02:00
Marc Zinnschlag
d1c4559abe
fixed GMST string handling in GUI
2012-10-01 10:03:49 +02:00
greye
2fa4ac177a
initial resolving
2012-10-01 00:23:49 +04:00
scrawl
0c6ad13364
WakeUpPc instruction
2012-09-29 09:41:34 +02:00
gugus
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
2012-09-28 17:09:15 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
