PLkolek
8f4506f5b6
Implemented drowning.
...
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
Emanuel Guevel
d054366460
Permit to force hiding GUI windows
2013-08-06 12:34:35 +02:00
Emanuel Guevel
8f8362d2c4
Expose sneak indicator widget through WindowManager
2013-08-03 03:03:29 +02:00
Marc Zinnschlag
ca94d1a2fb
Merge remote-tracking branch 'swick/inventorypos'
...
Conflicts:
apps/openmw/mwgui/inventorywindow.cpp
2013-07-31 22:16:56 +02:00
Sebastian Wick
7ed763262f
GUI mode dependent position
2013-07-31 21:40:29 +02:00
Marc Zinnschlag
3642562959
Merge remote-tracking branch 'scrawl/master'
2013-07-30 08:11:40 +02:00
scrawl
3961c276b8
Added enemy health meter
2013-07-30 06:00:20 +02:00
Sebastian Wick
40d3efc671
use cancel methid
2013-07-29 18:35:23 +02:00
Sebastian Wick
7b40e57ba1
Allow the 'Activate' key to close the countdialog window; cleanups
2013-07-29 18:27:00 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
scrawl
8407e2b3aa
Fixes the console sometimes receiving text after it was closed
2013-07-14 23:54:28 +02:00
scrawl
91f6d87126
Fix an uninitialized variable
2013-07-07 16:57:46 +02:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
Sebastian Wick
b43f41c2bd
use a mygui controller for scrollbar repeat
2013-07-05 19:17:00 +02:00
Sebastian Wick
e3d8bdbafe
autorepeat scrollbar
2013-07-02 17:29:47 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
scrawl
4fd7891d2c
Fix a message box issue
2013-06-16 20:26:27 +02:00
scrawl
03682184c6
Enable SDL_TEXTINPUT events only when a text input widget currently has key focus
2013-06-16 18:06:55 +02:00
scrawl
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
2013-06-15 15:33:47 +02:00
scrawl
0880805559
Minor cleanup
2013-06-13 12:13:40 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
scrawl
daab4f55a3
Use Morrowind's fonts
2013-06-06 22:26:06 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Marc Zinnschlag
e14cb6853f
Merge remote-tracking branch 'scrawl/containerui'
2013-05-11 19:23:02 +02:00
scrawl
0c4a963132
Container UI rewrite
2013-05-11 18:38:27 +02:00
kpp
24d619d6b4
Changes the logic of WindowManager::messageBox()
...
Fixes removeItem
Fixes addItem
2013-05-10 14:06:25 +04:00
scrawl
c6edb0288a
Remove unused file
2013-05-06 15:30:23 +02:00
scrawl
78e6dab9d2
Dialogue history rewrite WIP
2013-05-04 14:15:47 +02:00
scrawl
1f58edb9db
Merge branch 'master' of https://github.com/zinnschlag/openmw into journal
2013-05-03 18:17:27 +02:00
Glorf
57f22c77c0
Bugfix #732 part 1
2013-05-03 12:44:27 +02:00
scrawl
2a42556aa5
Merge branch 'master' into HEAD
2013-04-30 14:54:10 +02:00
Marc Zinnschlag
93868c8bca
Merge remote-tracking branch 'scrawl/master'
2013-04-29 18:08:25 +02:00
Glorf
6222b3f52a
Bugfix #744
2013-04-29 17:19:20 +02:00
scrawl
6c5ea1ea7a
Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes
2013-04-29 12:05:10 +02:00
Nathan Jeffords
7db6447a00
dropped the I infront of the journal view model interfaces
2013-04-24 21:53:25 -07:00
Nathan Jeffords
36a6806faf
drop the leading 'I' from the book page control interfaces
2013-04-24 21:44:29 -07:00
Nathan Jeffords
718af692c9
reworked journal to match bethesda's implemenation
2013-04-24 20:20:01 -07:00
Nathan Jeffords
55ca037411
Created a MyGUI widget to present a page of formatted text.
2013-04-24 20:20:00 -07:00
Nathan Jeffords
8dad04eef1
hid JournalWindow behind IJournalWindow interface, and put its entire
...
implementation, class definition and all, into journalwindow.cpp
2013-04-24 20:20:00 -07:00
Britt Mathis
7eee86ab66
No more using namespace
2013-04-17 18:56:48 -04:00
Britt Mathis
60fadaeaf0
Cleaned up includes in implementation files
2013-04-16 20:16:22 -04:00
Britt Mathis
f7383905b7
Finally eliminated calls to MWBase::WindowManager in constructors
2013-04-10 14:46:21 -04:00
Britt Mathis
ce9bc6d9ba
MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions
2013-04-10 00:32:05 -04:00
scrawl
43cdbd033d
Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips
2013-04-03 21:17:31 +02:00
scrawl
05a5cb3ae4
Improved responsiveness of the inventory window when resizing.
2013-04-03 00:27:29 +02:00
scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
scrawl
51204f098e
Added soulgem dialog; made interactive message boxes not close the previous UI
2013-03-30 15:51:07 +01:00
scrawl
a2ca679beb
Added PC repair feature
2013-03-23 08:16:46 +01:00
scrawl
20774f8f81
Added merchant repair feature
2013-03-22 14:13:10 +01:00
Glorf
a07c910d0b
Feature #535 : Console object selection improvements
2013-03-18 21:33:12 +01:00
scrawl
4c588cbab6
Levelup dialog is now dynamic; added level descriptions
2013-03-12 17:18:47 +01:00
Sebastian Wick
0ae48c1f83
fix for Bug #509
2013-03-09 20:40:59 +01:00
scrawl
e34685b8a3
Fix manually changed mouse cursor
2013-03-07 12:46:26 +01:00
Marc Zinnschlag
dc3edc6024
Merge branch 'vartype'
2013-03-05 10:59:08 +01:00
Marc Zinnschlag
ba4907fbaf
use new Variant type for GMSTs
2013-03-05 08:02:27 +01:00
scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:51:58 +01:00
Marc Zinnschlag
3e97943e06
Merge remote-tracking branch 'scrawl/includes'
2013-03-03 15:37:13 +01:00
scrawl
9a84f6744f
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
2013-03-03 13:11:02 +01:00
scrawl
cf87708c1f
Magic effect icons for spells
2013-03-03 12:01:19 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
2013-03-01 18:45:52 +01:00
Emanuel Guevel
be9d49c510
Do not hide pinned windows during loadings
2013-02-27 16:17:41 +01:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
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 c5dd0e1968
2012-12-18 19:09:27 +01:00
scrawl
1c73a3f2fb
Revert "remove commandline switch for new game"
...
This reverts commit 86671096ec
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
