3146 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	157dd81524	removed script instruction, will be in the settings window later	2012-05-21 10:57:49 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
Marc Zinnschlag	ada86cbf32	Merge remote branch 'gus/collisionbug'	2012-05-19 15:02:26 +02:00
scrawl	52e5e14654	use GMST sDefaultCellname for the map window when cell has no region or name.	2012-05-17 23:42:09 +02:00
scrawl	c9aa0ca1f4	don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region	2012-05-17 19:54:09 +02:00
scrawl	375c198ebd	WeatherManager: fix for cells that have no region.	2012-05-17 18:21:05 +02:00
scrawl	0afda15ce9	fix for cells that have no region.	2012-05-17 18:14:33 +02:00
scrawl	ae77e7b0d8	don't try to retrieve land data from non-predefined cells.	2012-05-17 18:11:34 +02:00
Marc Zinnschlag	6b74fec8ed	don't do a half finished cell change, when trying to switch to an interior cell that does not exist	2012-05-17 17:13:41 +02:00
gugus	09ec1da0f6	fix the latest commit: objects activation works again.	2012-05-17 16:12:55 +02:00
gugus	6f87493df6	fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)	2012-05-17 15:46:38 +02:00
Marc Zinnschlag	fdfddc8be7	some todo comment cleanup	2012-05-15 21:34:32 +02:00
Marc Zinnschlag	7e00fea18b	added getEncumbrance function	2012-05-15 21:34:00 +02:00
Marc Zinnschlag	c6493fb133	added getCapacity function	2012-05-15 21:17:00 +02:00
Marc Zinnschlag	2bf12a4839	Merge remote branch 'scrawl/itemstacking'	2012-05-13 17:22:18 +02:00
scrawl	82b9f835b1	make sure iterator is not end() before trying to get the equipped item	2012-05-13 16:54:18 +02:00
scrawl	8c458fc5ce	Merge branch 'master' into gui	2012-05-13 16:20:35 +02:00
scrawl	471f6467ec	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-05-13 16:18:22 +02:00
Marc Zinnschlag	73d19f9185	Merge remote branch 'scrawl/itemstacking'	2012-05-13 16:06:30 +02:00
scrawl	d341d2113c	fixed some issues	2012-05-13 14:58:38 +02:00
scrawl	ddb0a91994	addition to last commit	2012-05-13 12:19:49 +02:00
scrawl	a54e52586b	fix for a potential directx problem	2012-05-13 12:17:07 +02:00
scrawl	ee7e482cba	implemented un-stacking	2012-05-13 11:52:17 +02:00
scrawl	16522ddc59	InventoryStore re-stacking unequipped items	2012-05-12 23:09:03 +02:00
scrawl	9f2595183b	type	2012-05-12 16:30:27 +02:00
scrawl	5b0251b09f	item stacking	2012-05-12 16:17:03 +02:00
scrawl	296dbce298	Merge branch 'master' into graphics	2012-05-12 13:47:56 +02:00
Lukasz Gromanowski	d9e39bd90e	Changed order of plugins.cfg file paths. ... Changed order of plugins.cfg file paths - before when plugins.cfg file was found in global path then it was used as default one. Now the behavoiur is opposite if plugins.cfg file exists in local path then it is used as default one.	2012-05-11 21:32:38 +02:00
scrawl	a99f74702e	workaround for a white square that appears in menubook_next texture	2012-05-11 09:57:43 +02:00
scrawl	83e434e2e9	small fix	2012-05-11 09:35:18 +02:00
scrawl	1f1edea6af	make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar	2012-05-11 08:45:03 +02:00
scrawl	65ccfba191	resize both the left and the right pane of the stats window	2012-05-11 08:15:22 +02:00
scrawl	06d732cca3	Merge branch 'master' into gui	2012-05-11 07:47:54 +02:00
scrawl	c4aae96d94	implemented "goodbye" script function that force-cancels dialogue	2012-05-11 07:18:41 +02:00
Marc Zinnschlag	37095b62c6	removed another include	2012-05-10 12:51:40 +02:00
scrawl	60affb5288	removed include 2	2012-05-10 12:47:15 +02:00
Marc Zinnschlag	e906614170	Merge remote branch 'scrawl/gui'	2012-05-10 12:46:11 +02:00
scrawl	3d9e89c837	removed unnecessary include	2012-05-10 12:44:01 +02:00
Marc Zinnschlag	bee03b5180	Merge remote branch 'scrawl/gui'	2012-05-10 12:08:49 +02:00
scrawl	4ce50c503b	a few tweaks	2012-05-10 11:29:28 +02:00
scrawl	de995e3a69	adjust topic list on window resize	2012-05-10 11:19:22 +02:00
scrawl	8a9e05a96b	display text on the book window	2012-05-10 11:03:27 +02:00
scrawl	d69501b061	change daedric font to .zip resource	2012-05-09 02:16:10 +02:00
scrawl	e5e8663bb4	parse <div> <font> and <p>	2012-05-09 02:11:44 +02:00
scrawl	8e7ab09a25	scroll window image tags working	2012-05-09 01:34:32 +02:00
scrawl	cd351ba3af	simple scroll text parsing (tags are ignored until now)	2012-05-08 00:39:52 +02:00
scrawl	2b584300d6	throw an exception when no default settings file is found, which indicates a packaging error	2012-05-07 23:16:29 +02:00
scrawl	3c69d26571	journal close sound	2012-05-07 19:42:04 +02:00
scrawl	9dd53b32b8	added daedric font for magic scrolls	2012-05-07 02:00:31 +02:00
scrawl	f20d4eeb41	Bug #281 , openmw.font.xml update	2012-05-05 01:44:51 +02:00