384 commits

Author	SHA1	Message	Date
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
Nikolay Kasyanov	65fc141b62	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-03-15 20:38:21 +04: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
Nikolay Kasyanov	5328853445	Feature #37 (In Progress) Render Path Grid ... added "togglepathgrid" script command	2012-03-10 18:13:44 +04: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
scrawl	3ea2a9f05d	changeWeather bugfix	2012-03-05 19:13:11 +01:00
Marc Zinnschlag	69f0ec99f1	implemented dialogue scripts	2012-03-05 16:56:14 +01:00
scrawl	ba0365a427	collision shape scale fix	2012-03-02 16:47:39 +01:00
Marc Zinnschlag	739870489a	Merge remote branch 'scrawl/weather' into weather ... Conflicts: apps/openmw/CMakeLists.txt	2012-02-27 15:02:03 +01:00
scrawl	c9ceb74e5c	transition fix	2012-02-27 12:21:00 +01:00
scrawl	8b0ef8f98c	improvements to sun glare	2012-02-26 20:46:09 +01:00
scrawl	932983c2fa	fix toggleSky	2012-02-26 18:21:11 +01:00
scrawl	c1d39bb35f	tweaked cloud color	2012-02-26 15:54:52 +01:00
scrawl	f79bf1f300	fog	2012-02-26 13:13:29 +01:00
scrawl	528cff5a59	implemented ChangeWeather script function	2012-02-26 11:51:02 +01:00
scrawl	a05ba97382	choose a random weather depending on region's weather probabilities	2012-02-25 23:41:02 +01:00
scrawl	d77d5080bd	implemented GetCurrentWeather script function	2012-02-25 21:34:38 +01:00
scrawl	8d5783d75d	- set moon phase using (day%32)/4 (not really correct, but good for now) ... - added all weather patterns from morrowind.ini	2012-02-25 21:06:03 +01:00
scrawl	e31ad90802	moon positions and fading	2012-02-25 16:36:45 +01:00
scrawl	4650672bb1	thunderstorm	2012-02-25 13:46:17 +01:00
scrawl	0ebdce543a	- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise ... - changed WeatherGlobals members to static	2012-02-24 23:26:38 +01:00
scrawl	67c7b965f0	calculate a sun position depending on time of day	2012-02-24 18:30:16 +01:00
scrawl	811c4a41b7	fade in/out for sunrise and sunset	2012-02-24 17:42:31 +01:00
scrawl	aad8f6605e	send a raycast through the physics engine to check if sun is visible	2012-02-24 16:12:43 +01:00
scrawl	af83742e6f	- disable the sky renderer completely in interior cells ... - SkyManager update (initial sun glare effect, no raycast)	2012-02-23 21:44:56 +01:00
scrawl	d9c02ca526	- added isCellExterior / isCellQuasiExterior methods to World ... - interior now have the sun disabled properly (and ambient managed by cell, not sky)	2012-02-23 21:12:06 +01:00
scrawl	90af78e3b8	attempt to fix openmw's lighting (restored the sun, set proper ambient value outside) ... - the fix should remain in this branch since the main branch still has the lighting by caelum	2012-02-23 20:33:34 +01:00
scrawl	a5720e9a4f	set sky colors according to time of day	2012-02-23 19:49:56 +01:00
Marc Zinnschlag	26bd2be1e8	Merge branch 'equipment' into next	2012-02-23 13:02:20 +01:00
Marc Zinnschlag	8f60d5b180	made container store data members private	2012-02-23 13:01:53 +01:00
Marc Zinnschlag	af23cc352e	more cleanup	2012-02-23 12:58:12 +01:00
Marc Zinnschlag	699246e54b	removed insertIntoContainer function from MWWorld::Class hierarchy	2012-02-23 12:53:48 +01:00
Marc Zinnschlag	f39aa2a68d	changed take action to use the new container store interface	2012-02-23 12:38:25 +01:00
Marc Zinnschlag	e13e858c7a	fixed container store iterator; new add function	2012-02-23 12:34:25 +01:00
Marc Zinnschlag	b7ea110632	manually created objects were initialised incompletely	2012-02-23 12:33:50 +01:00
scrawl	ce98397565	adding ini values for 'cloudy' and 'clear'	2012-02-22 20:39:14 +01:00
scrawl	1badb5d04f	some restructurings	2012-02-22 20:12:08 +01:00
scrawl	41a8b22ebd	implemented weather transitions (currently only blends the clouds)	2012-02-22 19:17:37 +01:00
scrawl	4efc5bc1f2	forgot to add file	2012-02-21 22:56:34 +01:00
scrawl	b2de9e8f45	allow setting the clouds opacity	2012-02-21 22:11:41 +01:00
scrawl	c1fb5ce769	added (incomplete) WeatherManager, created by World	2012-02-21 20:22:46 +01:00
Marc Zinnschlag	db205cf8aa	Merge remote branch 'scrawl/next' into test ... Conflicts: libs/openengine	2012-02-20 14:54:08 +01:00
Marc Zinnschlag	e02cba58b1	Merge branch 'master' into next ... Conflicts: apps/openmw/mwclass/light.cpp	2012-02-20 14:34:27 +01:00
Marc Zinnschlag	1beaea0115	forgot to add cone file	2012-02-20 14:14:39 +01:00
Marc Zinnschlag	781b16a00e	removed bCollision variable from World	2012-02-20 14:07:16 +01:00
Marc Zinnschlag	4a16553acc	replaced an include with a forward declaration	2012-02-20 12:44:17 +01:00
Marc Zinnschlag	e3e6b3809f	added container store iterator (a.k.a. the most hilarious iterator I ever had the misfortune to write)	2012-02-20 12:38:34 +01:00
Jason Hooks	38a0d1d1c5	Merging in master	2012-02-19 15:39:12 -05:00
scrawl	f81b615976	implemented script functions FadeIn, FadeOut, FadeTo	2012-02-18 18:25:28 +01:00
scrawl	40e23fe26f	added twf console command	2012-02-18 16:06:03 +01:00
Marc Zinnschlag	a0ac6e5150	cells were sometimes not fully loaded	2012-02-12 12:35:29 +01:00
Marc Zinnschlag	78b6ceabc7	Merge branch 'refdata' into equipment	2012-01-30 12:38:55 +01:00
Marc Zinnschlag	e19cea3e7b	Merge branch 'refdata' into next	2012-01-30 12:38:35 +01:00
Marc Zinnschlag	a4785ffc4f	minor fix	2012-01-30 12:38:13 +01:00
Jason Hooks	2d0e83a2cf	Reversing changes	2012-01-30 00:06:29 -05:00
Jason Hooks	d2b3c1dbac	Collision may be working correctly	2012-01-29 18:13:43 -05:00
Jason Hooks	9c73fa6b6d	Physics sort of fixed	2012-01-29 17:50:51 -05:00
Marc Zinnschlag	81d0d58346	Merge remote branch 'mirc/master' into openengine	2012-01-29 20:25:11 +01:00
Cris Mihalache	daa8fb15ce	Removed all physics-related code from Engine	2012-01-29 20:51:20 +02:00
Cris Mihalache	6d4fa9274e	Moved OpenEngine systems into their appropriate classes	2012-01-29 17:31:18 +02:00
Marc Zinnschlag	0d7f39fcb5	Merge branch 'refdata' into next	2012-01-28 11:46:34 +01:00
Marc Zinnschlag	f2972b1ca0	turned ContainerStore from a template into a simple struct	2012-01-28 11:45:55 +01:00
Marc Zinnschlag	c081160591	replaced container store in ref data with new custom data implementation	2012-01-27 14:55:58 +01:00
Marc Zinnschlag	b0256cea34	replaced movement settings in ref data with new custom data implementation	2012-01-27 13:17:30 +01:00
Marc Zinnschlag	aa87bd4030	replaced creature stats in ref data with new custom data implementation	2012-01-26 11:35:47 +01:00
Marc Zinnschlag	c6761e3470	replaced NPC stats in ref data with new custom data implementation	2012-01-25 16:56:49 +01:00
Marc Zinnschlag	baf9cff21d	added customdata base class (issue #185)	2012-01-24 11:24:05 +01:00
Marc Zinnschlag	4b6cd582a7	removed some redundant (and misplaced) functions	2012-01-24 10:45:40 +01:00
Marc Zinnschlag	26c328e73f	added some more comments to avoid further confusion	2012-01-23 14:55:00 +01:00
Marc Zinnschlag	16bc374921	animation updates were hooked up to the wrong update function	2012-01-23 14:33:06 +01:00
Jason Hooks	e1aba44da6	Switching cells in exterior works	2012-01-22 16:38:10 -05:00
Jason Hooks	ec94ecacaf	Zinis branch merge	2012-01-22 15:02:38 -05:00
Marc Zinnschlag	7439c83623	Added custom copy-constructor, assignment-operator and destructor for RefData ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:22:12 +01:00
Marc Zinnschlag	6a88133178	Split refdata.hpp in a hpp and a cpp file ... Prerequisite for the ContainerStore rewrite, which is a prerequisite for issue #117.	2012-01-22 11:00:40 +01:00
Jason Hooks	a0838369b2	Very basic exterior water	2012-01-21 20:05:08 -05:00
Jason Hooks	84f45b1972	underwater view	2012-01-20 17:59:56 -05:00
Jason Hooks	2aad3a0bd8	Correct water levels	2012-01-19 23:29:07 -05:00
Jason Hooks	ff2bbc9fc5	Transparent water	2012-01-18 22:42:07 -05:00