696 commits

Author	SHA1	Message	Date
scrawl	f154031e54	last bits of the gui	2012-10-11 18:26:29 +02:00
scrawl	025e820703	abstracted code and use it in enchanting window as well	2012-10-03 15:36:10 +02:00
scrawl	1c0dd3ccc5	some editing code	2012-10-03 15:06:54 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +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
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
scrawl	9b0254a158	small map fix	2012-09-26 23:34:35 +02:00
scrawl	71d04e16da	fix the global map updating when pinned	2012-09-25 21:57:57 +02:00
scrawl	e2b1329620	fix the race selection escape crash	2012-09-25 21:49:34 +02:00
scrawl	b63d205c6e	change the select attribute/skill dialogs to be reusable	2012-09-24 22:09:38 +02:00
scrawl	d393f551ed	edit effect dialog	2012-09-24 08:09:16 +02:00
scrawl	1cb1259e18	fixing some unrelated warnings	2012-09-23 19:36:37 +02:00
scrawl	9d7c35ae48	and go	2012-09-23 00:36:20 +02:00
scrawl	b4db339fd5	everything uses find now	2012-09-22 21:39:05 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	b471bef92a	Merge branch 'master' into next	2012-09-22 20:48:22 +02:00
Marc Zinnschlag	39e21a6103	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-22 18:27:42 +02:00
scrawl	78b2d51cfc	fix a map crash	2012-09-22 16:52:31 +02:00
Marc Zinnschlag	3560690660	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-21 18:27:06 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
scrawl	f49401bb53	center map on the player, dynamic map size	2012-09-21 16:26:04 +02:00
scrawl	1d012d1680	don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.	2012-09-21 15:24:26 +02:00
scrawl	9106e5307c	moved global map from RenderingManager to gui and removed world method	2012-09-21 14:11:01 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
scrawl	a161b34c67	remove useless member, fix map rendering crash	2012-09-20 18:23:27 +02:00
scrawl	98c1dc1151	ShowMap & FillMap commands, merged next	2012-09-20 18:02:37 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	451a9fd6ac	don't update world arrow position in interior	2012-09-20 17:35:30 +02:00
scrawl	e5e3d829d0	player arrow & markers	2012-09-20 17:30:09 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	87a9373a56	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-20 09:01:58 +02:00
scrawl	b9a3f8e8d7	gamma slider	2012-09-19 23:47:42 +02:00
scrawl	be44810623	implemented GetPCSleep	2012-09-19 03:11:23 +02:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	ab698bb401	date time label	2012-09-18 20:53:32 +02:00
scrawl	4d4ba6698a	fix character preview destruction; don't allow empty names in name dialog	2012-09-18 19:00:20 +02:00
scrawl	0ba996f290	dialog layout	2012-09-18 18:29:03 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
scrawl	896428c129	enableRestMenu & enableLevelupMenu	2012-09-15 20:18:41 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	95f3a20e2c	Merge branch 'master' into levelup	2012-09-15 14:25:37 +02:00
scrawl	2793096b50	Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/world.hpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp	2012-09-15 00:57:29 +02:00
scrawl	b76a28f69c	beginnings of the gui	2012-09-14 19:44:00 +02:00
scrawl	35f7216f2f	fixed some things	2012-09-14 17:25:32 +02:00
scrawl	7c59b83419	performance optimization	2012-09-14 17:10:10 +02:00
scrawl	a308d2e38a	fixed exception, fixed armor label obscuring the items	2012-09-14 15:33:24 +02:00