911 commits

Author	SHA1	Message	Date
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	ef1678e47e	Oops, rotation center should be dynamic	2013-03-01 22:32:02 +01:00
scrawl	d8f2d0195a	Got rid of the texture rotation hack by rendering the cursor manually.	2013-03-01 18:45:52 +01:00
scrawl	b7ab12e7cf	Workaround to prevent the map drawing on top of the world button	2013-02-28 21:12:13 +01:00
vorenon	c9a701cfa1	Removed the 3 dots after the load text.	2013-02-28 19:25:18 +01:00
Marc Zinnschlag	ce1310614c	Merge remote-tracking branch 'potatoesmaster/pinned'	2013-02-27 17:37:04 +01:00
Emanuel Guevel	be9d49c510	Do not hide pinned windows during loadings	2013-02-27 16:17:41 +01:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
vorenon	89cba3cf45	Replaced ifs/elseifs with switch	2013-02-26 19:52:51 +01:00
vorenon	13c33c1613	added missing click sound to main menu	2013-02-26 19:37:47 +01:00
vorenon	b1ca719d61	Added click sound to OK button for message boxes	2013-02-26 16:37:59 +01:00
scrawl	d4264353a3	Merge branch 'z-up' into graphics ... Conflicts: apps/openmw/mwrender/localmap.cpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/water.cpp files/materials/water.shader	2013-02-26 14:54:53 +01:00
Marc Zinnschlag	dc445844d2	Merge remote-tracking branch 'scrawl/z-up'	2013-02-26 14:37:50 +01:00
scrawl	b9912a19e0	Z-up conversion: fix player arrow direction on global map	2013-02-26 14:31:30 +01:00
scrawl	284ba58e1e	Z-up conversion: global map, shader fix	2013-02-26 13:52:01 +01:00
scrawl	2e7bc1a368	Z-up conversion: local map, fix tcg	2013-02-26 13:39:10 +01:00
Chris Robinson	da575b181e	Use the correct GMST for the race menu	2013-02-25 13:04:17 -08:00
scrawl	b1fc68d44d	Merge branch 'master' into graphics	2013-02-25 17:36:33 +01:00
scrawl	73d48a95f6	Add message box when the player tries to move when being overencumbered.	2013-02-25 16:31:48 +01:00
scrawl	cacdb33b42	Merge branch 'master' into graphics ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/sky.cpp	2013-02-25 15:12:03 +01:00
scrawl	dfe29db9cb	Fix bug #591: Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)	2013-02-25 06:57:32 +01:00
scrawl	0d6a3367d3	Water shader no longer depends on object shaders being enabled	2013-02-24 10:28:50 +01:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
Sergey Shambir	a3adcf752d	TradeWindow: fixed coding style ... Mentioned here: https://github.com/zinnschlag/openmw/pull/554	2013-02-23 13:51:21 +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	3dc28baa28	Remove "PinToggle" event from layout file	2013-02-20 01:31:10 +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	170a9762ac	Fix travel services not actually costing gold.	2013-02-17 18:30:21 +01:00
Marc Zinnschlag	31bfe62bbc	Merge remote-tracking branch 'scrawl/bug_562' into next	2013-02-17 17:41:19 +01:00
scrawl	d899f33444	Race/Class/Birth dialogs: immediately enable OK buttons since they have a preselected entry now.	2013-02-17 16:00:31 +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	b8c0c94d5f	Merge remote-tracking branch 'wareya/master' into next	2013-02-17 08:58:41 +01:00
Wareya	c98a815581	Remove debug printing from previous commit	2013-02-16 13:37:25 -05:00
Wareya	f0220fb06b	Implement "Rest Until Healed" ... Fixes: https://bugs.openmw.org/issues/563	2013-02-16 13:35:03 -05:00
Marc Zinnschlag	910858c300	Merge remote-tracking branch 'sergeyshambir/guiconvience' into next	2013-02-16 14:50:42 +01:00
scrawl	7604fb51b6	CG no longer listed in the settings if the plugin isn't loaded.	2013-02-14 23:17:21 +01:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Sergey Shambir	7d7a1119da	Fixed book text misalignment, at least in some cases ... https://bugs.openmw.org/issues/284	2013-02-12 11:49:20 +04:00
Sergey Shambir	03803f19b5	BookTextParser: moved to Ogre::UTFString ... Font height and unicode characters glyph width now accounted correctly.	2013-02-12 11:22:19 +04:00
Sergey Shambir	3b64389668	BookTextParser: fixed infinitive loop	2013-02-12 11:14:30 +04:00
Marc Zinnschlag	64d9d9e2ce	Merge remote-tracking branch 'wheybags/master' into next	2013-02-10 17:29:28 +01:00
Tom Mason	c32c31f6d6	break after activating button	2013-02-10 15:41:02 +00: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	59808c3e10	GUI: Birth and Class dialogs now both select 1st item in list at first ... time.	2013-02-10 08:59:38 +04:00
Sergey Shambir	725bfe6372	TradeWindow: balance now changes per time if user holds +/- button ... pressed	2013-02-10 08:50:36 +04:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
scrawl	86d65519e3	Settings window fix	2013-02-05 23:57:30 +01:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00