357 commits

Author	SHA1	Message	Date
scrawl	4a6d034591	Merge branch 'master' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp components/esm_store/cell_store.hpp	2012-03-30 14:39:42 +02:00
scrawl	79c2a2e465	implemented toggleWater (twa); formatting again	2012-03-29 18:33:08 +02:00
scrawl	f497813043	formatting, added Water::setHeight	2012-03-29 15:49:24 +02:00
scrawl	39b3afb98f	use camera height instead of player height for underwater check	2012-03-29 05:03:34 +02:00
scrawl	e6303fc3f4	Merge branch 'master' into water ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-28 21:37:20 +02:00
scrawl	43b1f896f4	fix object pickup when player is very close to object	2012-03-27 22:36:02 +02:00
scrawl	8f6d10f229	fix uninitalised stuff	2012-03-27 20:59:58 +02:00
scrawl	53d4be5cf6	object pickup should work everywhere	2012-03-25 20:52:56 +02:00
scrawl	743ea0c9be	use hardware occlusion query for sun glare effect	2012-03-24 17:59:26 +01:00
scrawl	6067053f08	Merge branch 'next' into water ... Conflicts: CMakeLists.txt	2012-03-22 21:41:32 +01:00
scrawl	ab9aa1ba74	Merge branch 'next' into minimap ... Conflicts: files/mygui/openmw_map_window_layout.xml	2012-03-22 19:36:37 +01:00
Marc Zinnschlag	47828f91f0	Issue #217: added getWeight function to ContainerStore	2012-03-22 09:45:48 +01:00
Marc Zinnschlag	3dcfcf46cb	Issue #217: container change tracking	2012-03-21 12:48:05 +01:00
Marc Zinnschlag	a0ee2954bd	Issue #217: moved some functino implementations from ptr.hpp to ptr.cpp	2012-03-21 12:29:07 +01:00
Marc Zinnschlag	0adbe258fd	Issue #217: made Ptr track container; fixed a cmake script bug	2012-03-21 12:20:19 +01:00
scrawl	04c6f23a2b	disabled solstheim weather (we can't travel there anyway) ... also, there was a bug that could cause this weather to show up on morrowind, which is fixed now	2012-03-19 22:54:04 +01:00
gugus	11569819db	compilation fix	2012-03-19 18:01:54 +01:00
Jason Hooks	51fb9e67cd	Merge	2012-03-18 21:31:31 -04:00
gugus	7ca0503205	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 00:20:43 +01:00
scrawl	1840401172	weather transitions (e.g. from clear to cloudy) use timescale	2012-03-17 13:14:31 +01:00
scrawl	3ae69f792a	no light-"jumps" during night	2012-03-17 12:57:52 +01:00
scrawl	5ea2122f79	sun gradually disappears	2012-03-16 20:39:58 +01:00
scrawl	d18b3271b1	transition tweak 2	2012-03-16 20:32:41 +01:00
scrawl	460b584934	transition tweaks	2012-03-16 19:49:01 +01:00
scrawl	a67cc8e73b	more fixes	2012-03-16 19:02:33 +01:00
gugus	10321ff51a	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-16 17:58:23 +01:00
scrawl	c885ec1bd1	Merge branch 'master' into minimap	2012-03-16 17:10:27 +01:00
scrawl	91d2031eb7	first attempt at map window	2012-03-16 17:09:31 +01:00
Marc Zinnschlag	5b378e820d	warning level adjustments and some related fixes	2012-03-15 16:01:41 +01:00
Marc Zinnschlag	c616d005e8	fixed a spelling mistake	2012-03-15 14:31:16 +01:00
scrawl	2edd7e59f4	some fixes and facilities for saving the fog of war to disk	2012-03-14 20:44:06 +01:00
Michael Papageorgiou	947288e13a	Merge master and rewrite around the new detection function	2012-03-14 00:38:44 +02:00
scrawl	f46d9b094b	fix weather sounds sometimes playing in interiors	2012-03-13 17:25:07 +01:00
Michael Papageorgiou	6dddf8a3d5	Pickup sounds for armors	2012-03-13 18:05:38 +02:00
scrawl	771f920c2c	Merge branch 'master' of https://github.com/zinnschlag/openmw into minimap	2012-03-13 15:59:09 +01:00
Marc Zinnschlag	c314cddb1c	added getEquipmentSkill function to Class hierarchy	2012-03-13 14:27:13 +01:00
Marc Zinnschlag	ea336214de	more inventory sanity checks	2012-03-13 14:04:19 +01:00
Marc Zinnschlag	4b73116b9d	added getEquipmentSlots function to MWWorld::Class hierarchy	2012-03-13 13:50:11 +01:00
Marc Zinnschlag	635b7ec6cb	slot system	2012-03-13 13:31:11 +01:00
Marc Zinnschlag	222b5b741e	Merge branch 'master' into equipment	2012-03-13 12:14:47 +01:00
scrawl	fa68be2b19	set map window cell name	2012-03-10 16:05:12 +01:00
scrawl	5b38b17baf	local map rendering (nothing to see yet, as it is not displayed in GUI)	2012-03-10 15:28:18 +01:00
Marc Zinnschlag	79158b9325	NPCs are using InventoryStore instead of ContainerStore from now on	2012-03-10 12:49:54 +01:00
Marc Zinnschlag	84c8cd3720	added InventoryStore class (doesn't do anything yet)	2012-03-10 12:49:27 +01:00
Marc Zinnschlag	5562653578	provisionally fill up containers on cell load	2012-03-10 12:36:29 +01:00
Marc Zinnschlag	06e0706b35	added fill and clear functions to container store	2012-03-10 12:11:07 +01:00
scrawl	2196e1321b	added weather sounds	2012-03-09 18:30:03 +01:00
gugus	39415f0b4a	fix compilation bug with Visual C++	2012-03-07 17:35:10 +01:00
gugus	4990ba48ed	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-07 09:47:46 +01:00
Marc Zinnschlag	25f5bdf7aa	Merge remote branch 'scrawl/weather'	2012-03-05 22:45:52 +01:00