2211 commits

Author	SHA1	Message	Date
Chris Robinson	e4c5aac966	Keep track of the animation layers a given object list is animating on ... This only tracks layers they explicitly animate on. They may animate on other layers as well, if nothing else is animating on them.	2013-04-23 02:48:11 -07:00
Chris Robinson	e378176937	Don't update controllers that have already been updated	2013-04-23 00:15:31 -07:00
Chris Robinson	8782ae6976	Separate some Animation fields into a separate AnimLayer class	2013-04-22 23:52:28 -07:00
Chris Robinson	c3ce49798a	Fix animation velocity calculation	2013-04-22 21:34:39 -07:00
Chris Robinson	7279e015e9	Search the textkeys to check if an animation group exists	2013-04-22 20:59:55 -07:00
Chris Robinson	a2fc43c7df	Use reset to check that the animation exists and has the right markers	2013-04-22 20:41:54 -07:00
Chris Robinson	bb64efc18e	Improve looping behavior	2013-04-22 05:08:52 -07:00
Chris Robinson	cc70c6263b	Use the NodeTargetValue for the NonAccum root	2013-04-22 04:10:46 -07:00
Chris Robinson	9485a4aa6d	Look through the whole animation stack to find the "velocity"	2013-04-22 01:40:41 -07:00
Chris Robinson	a7776e124c	Only set mNonAccumRoot from mSkelBase	2013-04-22 00:22:31 -07:00
Chris Robinson	a3511c62cf	Don't store textkeys in user object bindings ... It's a bit unwieldy to have them stored in the 'skeleton master' instead of the skeleton instance. And although the text keys are extracted for each created instance now, this shouldn't be much worse than the multimap copying going on before. Plus, proper serialization can help for future optimizations.	2013-04-22 00:01:30 -07:00
Chris Robinson	2345b5e8b3	Avoid storing text keys for each animation	2013-04-21 22:56:40 -07:00
Chris Robinson	7d59340ed6	Don't clip out the group name from the textkeys	2013-04-21 22:13:49 -07:00
Chris Robinson	6c85d6763a	Pass "loop stop" to the character controller	2013-04-21 18:38:25 -07:00
Chris Robinson	d7c9df16f8	Store the current animation group	2013-04-21 18:32:34 -07:00
Chris Robinson	835ff8eb1e	Avoid creating an AnimationValue per ObjectList	2013-04-20 17:13:27 -07:00
Chris Robinson	4122b0b55f	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-20 00:25:00 -07:00
Marc Zinnschlag	f13b0c884f	hotfix for CharacterPreview destructor	2013-04-19 14:41:26 +02:00
Chris Robinson	50bb92beb3	Use a method to set the visibility flags and render queue.	2013-04-19 02:01:50 -07:00
Chris Robinson	6d59325bff	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-17 23:21:17 -07:00
scrawl	c519fc360d	Move away from fixed record names for body parts	2013-04-18 00:19:34 +02:00
scrawl	0341a9e778	Fix a gcc 4.8 warning	2013-04-17 20:57:22 +02:00
scrawl	547f77031d	Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again	2013-04-17 17:06:30 +02:00
Chris Robinson	4ce98e9bd6	Store iterators for start and stop keys	2013-04-15 20:37:10 -07:00
Chris Robinson	1b1f9f7921	Allow multiple ObjectLists to be created for Animations. ... addObjectList may not currently be called outside of the related constructor.	2013-04-15 18:55:28 -07:00
Chris Robinson	69084139aa	Use an array of objectlists, instead of one base objectlist and an array of 'animation sources'	2013-04-14 17:58:21 -07:00
Chris Robinson	f9dee25fd1	Store the base skeleton entity in MWRender::Animation	2013-04-14 16:56:35 -07:00
Chris Robinson	caff28e20a	Move NIFSkeletonLoader to a separate file	2013-04-10 19:58:17 -07:00
Chris Robinson	50d8353a8d	Fix a hack so arms dont show in first-person	2013-04-09 16:51:04 -07:00
Chris Robinson	9d29921913	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-09 15:12:19 -07:00
Chris Robinson	a700c50e84	Add a first-person view mode to NpcAnimation ... And use it instead of showing/hiding the player.	2013-04-09 15:10:14 -07:00
Marc Zinnschlag	a2ab43be7e	Merge remote-tracking branch 'scrawl/master'	2013-04-09 21:22:38 +02:00
scrawl	0e7d555cdf	Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.	2013-04-09 20:31:00 +02:00
Tom Mason	6ca2b1af74	fix for turning animations playing when in vanity mode	2013-04-09 19:24:41 +01:00
Chris Robinson	029d565727	Avoid calling setVisible for character previews	2013-04-09 09:23:07 -07:00
Chris Robinson	9f9d978b0f	Use an enum to specify the NPC's view mode (normal, head only)	2013-04-09 09:07:05 -07:00
Chris Robinson	08d43fe217	Make the getHeadNode method more general	2013-04-08 05:48:52 -07:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
Chris Robinson	7baca30a1d	Only get the non-accum root's keyframe when updating positions ... The actual animation pose is now handled by the controllers, based on the current animation time.	2013-04-07 16:21:45 -07:00
Chris Robinson	261ea1fe5e	Implement a KeyframeController	2013-04-07 14:56:23 -07:00
Chris Robinson	f69a8259e1	Update animation source controller targets	2013-04-07 13:51:04 -07:00
Chris Robinson	7494f90301	Remove an unneeded function	2013-04-07 13:02:46 -07:00
Chris Robinson	2362e920f3	Use an unconnected object list for animation sources ... We'll want the controllers, as the plan is to use their keyframe controllers to animate the actual skeleton used for the meshes.	2013-04-07 12:41:27 -07:00
Chris Robinson	80a1abd48a	Clear the old text keys when setting new animation sources	2013-04-07 11:09:55 -07:00
scrawl	755a80a522	Fix camera shaking when near the pitch limit.	2013-04-07 15:52:43 +02:00
Chris Robinson	be419bc891	Handle NiCamera nodes	2013-04-07 02:28:15 -07:00
Chris Robinson	878b4c15c5	Set visibility flags and the render queue group for particles	2013-04-07 02:08:33 -07:00
Chris Robinson	2db72ae607	Rename EntityList to ObjectList	2013-04-07 01:52:35 -07:00
Chris Robinson	59f1d4b047	Add support for NiUVController on meshes	2013-04-06 09:44:10 -07:00
Chris Robinson	0631b28646	Prepare for supporting controller objects	2013-04-05 10:13:54 -07:00
Chris Robinson	af2a38db38	Fix looping anims that dont have "loop start"	2013-04-05 08:27:26 -07:00
Chris Robinson	4d14fe0d95	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-04 22:06:27 -07:00
scrawl	2e7d5377f4	Fix crash when moving npcs to an inactive cell	2013-04-04 16:51:22 +02:00
Chris Robinson	77ba0fbe73	Prepare for creating particles ... This adds a vector of ParticleSystems to the EntityList, and modifies corresponding code to handle it. It also loads the ParticleFX plugin so particles can be created (although they aren't yet).	2013-04-04 05:10:52 -07:00
scrawl	ebaf80d539	Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.	2013-04-03 23:55:57 +02:00
Chris Robinson	63af72c315	Avoid converting to and from quaternions	2013-03-30 17:31:16 -07:00
scrawl	5e7e9fd26a	Properly calculate light activation range	2013-03-29 20:21:37 +01:00
Marc Zinnschlag	e7684c4677	some random cleanup	2013-03-29 09:04:02 +01:00
Chris Robinson	c5f0556451	Handle light linear/quadratic settings	2013-03-28 20:57:33 -07:00
Marc Zinnschlag	08f6d04960	constness fixes	2013-03-18 08:29:40 +01:00
Glorf	6165cd2c6b	Moons fallbacks partially implemented	2013-03-17 14:22:30 +01:00
scrawl	485b6c855a	Fix NPC race height not being applied	2013-03-15 16:44:35 +01:00
Glorf	521bebd2f4	Fallback system rewritten, added light fallbacks	2013-03-15 10:17:30 +01:00
scrawl	bcdab2aeab	Fix wrong padding breaking local map for cells where the bounds center is far from the origin	2013-03-11 19:32:39 +01:00
scrawl	d7c4a622cf	Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack	2013-03-08 23:46:25 +01:00
scrawl	285b4bf726	Allow zooming camera in vanity or preview mode with the mousewheel	2013-03-08 00:12:56 +01:00
Marc Zinnschlag	7e100c36b5	Merge remote-tracking branch 'gus/AI'	2013-03-06 19:05:55 +01:00
gus	5938e19362	Clean up	2013-03-06 17:31:57 +00:00
scrawl	66d2d3522f	Race selection preview: render only the head, and focus the camera on its node	2013-03-06 18:03:47 +01:00
gus	d3bf3812a4	changing rotation order (fix some misoriented objects)	2013-03-05 20:16:57 +00:00
gus	8b6f0e0770	Correct orientation sign	2013-03-05 18:28:57 +00:00
scrawl	fe7b2732d8	Avoid manually updating render targets from within frameRenderingQueued	2013-03-05 14:24:29 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
scrawl	ca707aa65f	Transparency should be evaluated per subentity, not per NIF	2013-03-04 16:57:00 +01:00
scrawl	cab5315a8e	Disable mipmaps generation	2013-03-04 16:28:20 +01:00
scrawl	f1d35b73b8	Cleanup	2013-03-03 19:52:20 +01:00
scrawl	c9fefc7f5d	Simpler, more lightweight underwater effect, changed colors to match vanilla better	2013-03-03 19:28:11 +01:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
scrawl	002830e13b	Make sure render textures are inactive when in a cell without water	2013-03-03 15:11:45 +01:00
scrawl	867b22ce19	Fix a terrain glitch	2013-03-03 15:11:19 +01:00
gus	e1882dce32	correcting a bug: player orientation wasn't stored correctly, and objects orientation wasn't properly retrived.	2013-03-03 13:02:41 +00:00
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
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00
Chris Robinson	e6b547b9ba	Merge remote-tracking branch 'zini/master' into transparency-fixes	2013-03-01 13:32:30 -08:00
Chris Robinson	238a8feb18	Fix transparency checks	2013-03-01 13:27:25 -08:00
scrawl	1d988676fe	Local map: the obtained bounding box wasn't exactly accurate, getWorldBoundingBox seems to solve this.	2013-02-28 22:56:29 +01:00
Chris Robinson	1168f15361	Don't disable depth writes when blending is enabled	2013-02-28 12:17:58 -08:00
scrawl	3efbb5e728	Don't try to render a map in empty cells	2013-02-28 20:27:35 +01:00
Chris Robinson	bfe80bb8dc	Avoid duplicating skeletons due to casing issues ... Manually created resource names are apparently always case sensitive, causing some skeletons to get loaded multiple times.	2013-02-27 12:33:36 -08:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
scrawl	9b0ac4e299	NPCs / creatures can now emit ripples	2013-02-27 09:20:42 +01:00
Chris Robinson	ceafcc2ebb	Support float samples with ffmpeg ... Requires the AL_EXT_FLOAT32 extension in OpenAL	2013-02-26 10:19:33 -08: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	cc9b72b9b1	Removing some leftovers of mwRoot node	2013-02-26 14:01:10 +01:00
scrawl	341f9b96e2	Local map: restore zHigh	2013-02-26 13:53:23 +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
scrawl	3ef952172d	Z-up conversion: water, sky	2013-02-26 10:38:48 +01:00
scrawl	3cb3ec91c0	Z-up conversion: camera	2013-02-26 09:12:35 +01:00
scrawl	a5451eb9d9	Z-up conversion: terrain, objects	2013-02-26 08:30:06 +01:00
Chris Robinson	a576e9e430	Set the race selection character preview in a valid (idle) pose.	2013-02-25 16:40:08 -08:00
scrawl	8aff033a0c	Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog	2013-02-25 18:29:11 +01:00
scrawl	b1fc68d44d	Merge branch 'master' into graphics	2013-02-25 17:36:33 +01:00
scrawl	355390429e	Fix World::isUnderwater to use dynamic waterlevel	2013-02-25 17:27:50 +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
Chris Robinson	74b8095fc7	Use default parameters where appropriate	2013-02-24 14:43:20 -08:00
Chris Robinson	5267d17408	Revert "forgot to destroy child scene nodes" ... This reverts commit f1a3309392. Unneeded. The caller already calls this which destroys the children recursively	2013-02-24 14:14:08 -08:00
ChrisKCat	9e7b559b09	Merge pull request #6 from scrawl/lights ... For light objects without an AttachLight bone, attach the light to the c...	2013-02-24 14:12:53 -08:00
scrawl	f1a3309392	forgot to destroy child scene nodes	2013-02-24 19:03:25 +01:00
scrawl	1ae2d3c6ab	For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.	2013-02-24 19:00:06 +01:00
greye	6a8c532244	fix and unify object cell change update in mwrender	2013-02-24 15:04:56 +04:00
Chris Robinson	8e59ea4941	Use a separate method to handle animation events	2013-02-23 14:39:01 -08:00
Chris Robinson	d77d035d3a	Handle the "sound" events in runAnimation	2013-02-23 14:15:11 -08:00
Chris Robinson	d208422ca7	Add a method to update an Animation's Ptr object	2013-02-23 10:12:36 -08:00
Chris Robinson	a2eaec7878	Avoiding holding the InventoryStore in the NpcAnimation class	2013-02-23 08:03:52 -08:00
Chris Robinson	0d0e75fe0b	Don't set animation sources for models that don't have a skeleton	2013-02-23 07:36:11 -08:00
Chris Robinson	0148db8ccf	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp	2013-02-23 05:59:35 -08:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
Chris Robinson	e6da9dfae5	Specify the animation key to stop playing at	2013-02-23 05:15:10 -08:00
greye	ac7095537f	remove insertMesh() call on object cell change	2013-02-23 16:50:37 +04:00
greye	9659b4a95e	update NpcAnimation inventory reference on cell change	2013-02-23 16:45:55 +04:00
Chris Robinson	b8f5813609	Set all animation sources at once	2013-02-23 03:34:03 -08:00
scrawl	01102f9c73	Don't emit if there wasn't enough movement	2013-02-23 05:53:20 +01:00
scrawl	5b099393fa	Fix time factor	2013-02-23 04:43:51 +01:00
scrawl	f17ea109ca	Fix light positions	2013-02-23 04:06:05 +01:00
Chris Robinson	b12c6a4c16	Fix character preview	2013-02-22 11:16:00 -08:00
Chris Robinson	ecbf1568a1	Fix NPC part attachment	2013-02-22 10:15:29 -08:00
Chris Robinson	9dee2a72cd	Use a separate method to calculate animation velocity	2013-02-22 09:22:06 -08:00
Chris Robinson	7ec73c29f2	Do not return the player's Animation object for non-players	2013-02-22 01:27:26 -08:00
Chris Robinson	617158afcd	Ensure updated skeleton bone placement matches in world space ... Objects attached to actors (shirts, robes, etc) do not require the same node hierarchy as the character root. So to ensure proper placement, we need to set the bone target's derived transformation using the source bone's derived transformation (which in turn means we need to work up from the root, to ensure the bone's parents are properly placed).	2013-02-20 02:41:46 -08:00
Chris Robinson	8196694c08	Avoid applying the animation when resetting it	2013-02-19 06:04:25 -08:00
Chris Robinson	f8349a04bf	Use the looping portion of the animation to calculate the velocity	2013-02-19 05:26:58 -08:00
Chris Robinson	1399a06c76	Update animation looping when setting the same state	2013-02-19 04:01:33 -08:00
scrawl	427152c518	Disabled ripples until we can properly trigger them from the new character controller.	2013-02-19 03:15:31 +01:00
scrawl	6cceb04adf	When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.	2013-02-19 03:08:00 +01:00
scrawl	32b837ebd4	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-19 00:15:54 +01:00
scrawl	42883ec64b	cleanup	2013-02-18 02:33:53 +01:00
scrawl	791d16bbdb	Use infinite AAB for sky meshes to fix them from disappearing from underwater refraction, while still taking advantage of CPU culling for other meshes	2013-02-17 18:12:38 +01:00
scrawl	7ffcfa3622	Water and clouds no longer depend on timescale.	2013-02-17 16:23:55 +01:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed ... This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
scrawl	6a49ea9b4f	Cleaning out some old bits	2013-02-13 18:39:36 +01:00
Chris Robinson	6a9755778e	Merge remote-tracking branch 'zini/next' into animation2	2013-02-12 18:14:46 -08:00
scrawl	de90b911c9	Near clip plane corrections	2013-02-12 20:56:00 +01:00
scrawl	d213ff680f	Disabled terrain LOD	2013-02-12 20:55:45 +01:00
Marc Zinnschlag	5e3529783d	Merge remote-tracking branch 'ace/win-fixes' into next	2013-02-12 15:42:45 +01:00
Alexander "Ace" Olofsson	bbb845824d	Added typedef for ssize_t in windows and fixed a use of __PRETTY_FUNCTION__	2013-02-12 13:59:24 +01:00
Chris Robinson	4ee5857bae	Filter accumulation axis for mLastPosition as needed	2013-02-09 19:09:56 -08:00
Chris Robinson	8d6f017f17	Remove an unneeded Animation field	2013-02-09 13:25:39 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Mark Siewert	55bd9eef66	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-09 13:03:35 +01:00
Chris Robinson	923d0d6eb4	Fix up some header includes	2013-02-06 21:47:09 -08:00
Chris Robinson	18b7008409	Better fix some scaling issues	2013-02-05 18:25:09 -08:00
Chris Robinson	535cd8360f	Load extra animations for NPCs	2013-02-05 18:09:43 -08:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Chris Robinson	c839502743	Setup base_anim.nif as an initial skeleton source for biped creatures	2013-02-05 17:16:45 -08:00
Chris Robinson	054ef3113a	Check existing skeleton sources if the current one has no animation root	2013-02-05 17:15:40 -08:00
Chris Robinson	16933e3926	Scale the accumulation root translation	2013-02-05 16:59:20 -08:00
Chris Robinson	600fe06f00	Use a vector of skeletons to handle animation sources	2013-02-05 16:29:51 -08:00
scrawl	608c112f34	Supply the new render window to mygui	2013-02-05 20:48:25 +01:00
scrawl	31f760ccce	Fixing issues from last commit: restored input and occlusion queries	2013-02-05 20:26:13 +01:00
scrawl	c4d518132f	With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.	2013-02-05 19:22:08 +01:00
scrawl	499f3ac0d1	Slightly better ripple normal blending. Not physically accurate at all, but looks good.	2013-02-05 16:40:41 +01:00
scrawl	3772cd9257	Refraction can be disabled separately now	2013-02-05 14:29:46 +01:00
Chris Robinson	786cb6e928	Merge remote-tracking branch 'zini/master' into animation2	2013-02-05 02:57:02 -08:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
scrawl	a29919d02d	restored global map	2013-02-05 00:39:56 +01:00
scrawl	35b5fdab5d	Merge branch 'terrainfix' into graphics	2013-02-05 00:28:59 +01:00
scrawl	09180666b2	Merge branch 'master' of git://github.com/zinnschlag/openmw into terrainfix	2013-02-05 00:21:42 +01:00
scrawl	58cf182db2	better place for syncing	2013-02-05 00:21:29 +01:00
scrawl	bb1f23875d	Merge branch 'terrainfix' into graphics	2013-02-04 23:16:11 +01:00
scrawl	596628d339	Fix terrain derived data update (bug 534, bug 544)	2013-02-04 23:13:01 +01:00
scrawl	0f37c24d5f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-04 21:55:41 +01:00
scrawl	bf037b7d29	Removed problematic ModVertexAlpha method, now done in shader	2013-02-04 18:03:03 +01:00
scrawl	fa07288b15	tweaked map light color	2013-02-03 20:29:50 +01:00
scrawl	5cc8af0f14	fix map positions	2013-02-03 20:06:03 +01:00
scrawl	a44dfcd2ac	Now that refraction is separated out, we don't have to worry about rendering order. Should fix transparency blending issues around water (eg waterfalls) for good.	2013-02-03 19:28:31 +01:00
scrawl	979a874220	Fixed the custom near clip planes	2013-02-03 19:01:59 +01:00
scrawl	5334934612	Listen to render window updates and properly activate/deactivate occlusion queries pre/post update.	2013-02-03 18:03:09 +01:00
scrawl	15e51b76de	Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth	2013-02-03 15:46:23 +01:00
Chris Robinson	23acf4b130	Don't break right away when the animation time remaining is 0	2013-02-03 01:38:42 -08:00
Chris Robinson	60a75cb5ee	Make sure to keep the character preview animation updated	2013-02-03 00:54:50 -08:00
Chris Robinson	c23a96d606	Run an aniamtion update after "playing" the inventory idle ... This is so all the NPC parts get updated correctly.	2013-02-02 06:08:03 -08:00
Chris Robinson	fc7590694d	Revert "Revert "Use a child scene node for the accumulation root"" ... This reverts commit 376dfed15b. I was wrong. It's needed at least for NPCs since they're attaching multiple animated skeletons to an object, and they all need to be offset correctly. Would be nice to use a Node, Bone, or TagPoint instead of a hefty SceneNode, though.	2013-02-02 05:43:37 -08:00
Chris Robinson	7f87c1873b	Use an array to store the entity parts	2013-02-02 02:53:22 -08:00
scrawl	a461b282c1	water ripples (experimental)	2013-02-01 23:43:23 +01:00
Chris Robinson	376dfed15b	Revert "Use a child scene node for the accumulation root" ... This reverts commit d6f923f274. We don't need it for any of the NIFs we're currently handling. As long as there's no NIF files that would break it, we should require a stationary root if an animation wants to accumulate. If we must, a better idea may be to inject an extra bone into the skeleton instance and make that the accumulation root.	2013-02-01 08:50:32 -08:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Chris Robinson	d6f923f274	Use a child scene node for the accumulation root	2013-01-30 22:28:18 -08:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC ... However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	5c3a7f7d52	Avoid handling animation states ... We don't need them anymore	2013-01-30 07:34:07 -08:00
Chris Robinson	360f7bfac8	Apply animations to bones manually ... Couple reasons for this: * This paves the way for allowing animations specified in other skeletons to be applied to the character (NPCs and certain creatures can have multiple animation sources, but Ogre is incredibly strict when it comes to sharing animations between skeletons). * It will allow for entities to be animated based on the character's skeleton, without having to duplicate the mesh for each skeleton it can be used on. This doesn't impact Ogre's ability to efficiently deform skinned meshes, nor does it get in the way of hardware skinning.	2013-01-30 07:04:18 -08:00
Chris Robinson	600d3bf9eb	Make sure the player node's visibility cascades	2013-01-30 02:38:50 -08:00
Chris Robinson	99efe4e494	Remove an unnecessary class member	2013-01-29 01:02:55 -08:00
Chris Robinson	879359f39d	Set the animation state loop flag as appropriate	2013-01-29 00:50:52 -08:00
Chris Robinson	92d0c55f32	Add a flag to specify if an animation should be playing	2013-01-29 00:43:42 -08:00
Chris Robinson	7df4d0d19f	Remove an unnecessary cast	2013-01-28 21:41:51 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances ... This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Chris Robinson	05f8b8c283	Specify the text key to reset animations to	2013-01-22 00:31:45 -08:00
Chris Robinson	37fe1bd3f0	Handle looping in the Animation object	2013-01-21 22:51:13 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Chris Robinson	e1e76bde76	Combine a loop into another where it's used	2013-01-20 15:39:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Chris Robinson	85ca1e993f	Properly check if an animation exists before playing it	2013-01-19 21:55:04 -08:00
Chris Robinson	0b68953f0d	Scale animation speed using the direction length ... The direction length doesn't currently give a good speed, but it's something.	2013-01-18 21:40:47 -08:00
Chris Robinson	1cdd64cd9b	Return the animation movement from the character controller. ... Consequently, dead actors don't move anymore. The doPhysics call apparently isn't moving them.	2013-01-18 17:05:58 -08:00
Chris Robinson	9123f4f2af	Return the movement vector from runAnimation	2013-01-18 16:21:29 -08:00
Chris Robinson	c7684cb979	Pass the key time to markerEvent	2013-01-18 14:50:55 -08:00
Chris Robinson	3e9b0a333c	Allow specifying the accumulation for animations ... Animations that move a character may do so either visually or physically. An axis' accumuluation value specifies whether the movement is visual (0) or physical (1). Idle animations, for instance, typically don't physically move a character, while death animations may physically move them along the X and Y planes, but not along Z (the vertical movement is purely visual).	2013-01-18 14:25:32 -08:00
Chris Robinson	00879ab20e	Fix player rendering	2013-01-17 15:48:09 -08:00
Chris Robinson	fef6284f15	Only reset the animation time if a new state was set	2013-01-17 15:47:25 -08:00
Chris Robinson	fc0f9e2159	The animation state tracks the animation time for us	2013-01-17 14:49:42 -08:00
Chris Robinson	7cce44290e	Handle the animation queue in mwmechanics	2013-01-17 13:18:40 -08:00
Chris Robinson	82d549e22f	Don't update the animation if time is the same	2013-01-16 21:39:14 -08:00
Chris Robinson	7ee389f3b2	Handle animation skipping in the character controller	2013-01-16 21:25:50 -08:00
Chris Robinson	852aa214cc	Store the available animation names in the character controller	2013-01-16 21:16:22 -08:00
Chris Robinson	4dd01b81c6	Update mTime when updating or reseting the animation, and refactor the animation loop	2013-01-16 20:14:49 -08:00
Chris Robinson	d2f5a886c7	Handle playgroup and skipanim through mwmechanics	2013-01-16 17:53:18 -08:00
Chris Robinson	46fc61a4c1	Run animations from the character controller	2013-01-16 16:31:09 -08:00
Chris Robinson	3c32385e17	Avoid trying to animate things that don't have animations	2013-01-16 15:00:06 -08:00
Chris Robinson	94b93227d3	Treat activators as actors for rendering and mechanics ... Kinda hacky, but it's the only way to get animated activators (flags, silt striders, etc) to work properly.	2013-01-16 14:37:32 -08:00
Chris Robinson	d2fc3c7b33	Add a method to tell the character controller of new text keys	2013-01-16 13:09:21 -08:00
Chris Robinson	0a2f92f679	Keep track of the current text key in the animation	2013-01-16 11:57:08 -08:00
Chris Robinson	f46587c383	Store an character controller in the animation	2013-01-16 11:01:08 -08:00
Chris Robinson	63e685ea39	Add a method to get the Animation from a Ptr	2013-01-16 09:59:19 -08:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
scrawl	df602553d1	Reworked MWRender::Water to be more OOP-ish and possibly allow other reflection types.	2013-01-16 09:13:36 +01:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Jordan Milne	10a3caa504	more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine	2013-01-13 23:38:46 -04:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	2c3719a6f5	Disabling PSSM feature to make sure we can fit the max. amount of terrain textures in Morrowind.esm in a single pass.	2013-01-12 07:02:12 +01:00
scrawl	30136eb449	Update settings UI	2013-01-12 06:36:48 +01:00
Chris Robinson	97f8c73d91	Remove some useless parameters ... SceneNode::setVisibility merely passes the value to its attached object, of which there are none at the point it would be called. Additionally, the method is always called with enabled=true anyway.	2013-01-10 11:09:33 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	e8ac3976b5	Fix some subentity assumptions	2013-01-10 06:35:06 -08:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
scrawl	b8c6f6640b	Fixing water <-> waterfall blending issues (Sort of... the second part will follow later)	2013-01-09 21:56:26 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
scrawl	bc73c5b1ec	enable directional lighting for character previews	2013-01-09 20:08:59 +01:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Chris Robinson	be74859f05	Avoid some unnecessary copying when calling addPartGroup	2013-01-09 08:03:28 -08:00
Chris Robinson	9fedaf18d6	Make some methods private	2013-01-09 07:55:55 -08:00
Chris Robinson	625a538f03	Combine part selection into a single loop	2013-01-09 07:43:10 -08:00
Chris Robinson	1e38e381a4	Use text keys for each animation	2013-01-09 03:30:55 -08:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them ... I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Jordan Milne	857bb42297	Create a separate scenemanager for each CharacterPreview instance	2013-01-09 01:44:15 -04:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Marc Zinnschlag	c6ff58d5b5	Merge remote-tracking branch 'scrawl/videoplayback' ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2013-01-08 11:17:19 +01:00
Chris Robinson	2a9dc5ad94	Ensure mCurGroup always has valid iterators, and only get the animation state when animation keys exist	2013-01-07 21:00:21 -08:00
Chris Robinson	d8dbd5e206	Store text key iterators for the start and stop times	2013-01-07 05:56:03 -08:00
Chris Robinson	d3e949f5c6	Make the animation text keys lower case to help lookup	2013-01-07 05:23:44 -08:00
Chris Robinson	05dfafa777	Avoid an unnecessary lookup when moving the scene node	2013-01-07 05:09:15 -08:00
Chris Robinson	5f668976a8	Improve resetting the animation position	2013-01-07 04:48:59 -08:00
scrawl	c2b75e28e9	Merge branch 'videoplayback' of github.com:scrawl/openmw into videoplayback	2013-01-07 13:20:50 +01:00
scrawl	282601d6e9	support the allowSkipping extra parameter for playBink command.	2013-01-07 13:19:52 +01:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Chris Robinson	648e3331f5	Don't try to move objects that aren't in a cell	2013-01-06 23:20:20 -08:00
Chris Robinson	5b3a20ef69	Update the object position as the animation moves	2013-01-06 21:18:48 -08:00
Chris Robinson	910619eb21	Store the NonAccum animation root from the skeleton instance ... Currently this is assumed to be the node with the animation text keys.	2013-01-06 17:31:53 -08:00
Chris Robinson	b96a979719	Store an MWWorld::Ptr with the Animation	2013-01-06 17:05:48 -08:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	2b1fe7dc44	Add part info for weapons and shields	2013-01-06 05:39:39 -08:00
Chris Robinson	976b042cca	Use a list to reduce some repeating code	2013-01-06 02:14:19 -08:00
Chris Robinson	99769879e3	Fix some createEntities calls	2013-01-06 00:32:38 -08:00
Chris Robinson	efca5ded47	Clean up some header includes to reduce nesting	2013-01-05 21:12:08 -08:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	818a24cdd6	Hold on to the AnimationState being used for animating	2013-01-05 00:03:14 -08:00
Chris Robinson	6e84d4bcdd	Add a helper method to load entity objects	2013-01-04 23:19:48 -08:00
scrawl	ade4ec0453	fix texture edge bleeding due to wrong addressing mode	2012-12-28 19:01:47 +01:00
Chris Robinson	2f8daec379	Allow pausing only certain types of sounds	2012-12-18 04:19:35 -08:00
Chris Robinson	a5356e194e	Allow specifying a type for the playTrack method	2012-12-18 01:35:20 -08:00
Chris Robinson	67485d3454	Store the AVStream in the decoder for easy referencing	2012-12-17 07:15:53 -08:00
Chris Robinson	4373218746	Fix audio stream check	2012-12-17 06:56:30 -08:00
Chris Robinson	58ab3407b7	Constify a couple fields	2012-12-17 04:17:06 -08:00
Chris Robinson	9e842a0bbb	Fix for trying to play videos when not supported	2012-12-17 00:41:04 -08:00
Chris Robinson	26660110e5	Allow building the video player without ffmpeg (playVideo will always throw an exception)	2012-12-17 00:20:56 -08:00
Chris Robinson	06fd66e99d	Move some fields to the class they're used in	2012-12-16 11:49:46 -08:00
Chris Robinson	c92cde2be9	Properly flush packet queues when at EOF ... Note: the previous flush method was renamed to clear. Flushing a queue allows consumers to retrieve queued packets, but not expect any more to come in.	2012-12-16 05:50:20 -08:00
Chris Robinson	6bc526b74d	Avoid another loop for decoding audio	2012-12-16 05:30:38 -08:00
Chris Robinson	254a623319	Remove a redundant check	2012-12-16 03:09:24 -08:00
Chris Robinson	dd20db5dc2	Remove the stream indices from the VideoState	2012-12-16 03:05:44 -08:00
Chris Robinson	3f6d36c712	Avoid double-setting the material texture	2012-12-16 02:19:19 -08:00
Chris Robinson	0edc87825d	Move audio_clock to the decoder where it's used	2012-12-16 01:17:58 -08:00
Chris Robinson	4561c22e2b	More fixes for the audio clock ... The audio_clock for the decoder represents the end of the current packet, so it needs to be adjusted back to match the position that's actually going to be read next.	2012-12-16 00:07:56 -08:00
Chris Robinson	c869444dcf	Don't leak the IO context if avformat_open_input fails	2012-12-15 11:31:50 -08:00
scrawl	63e86555b6	use sample_aspect_ratio if available	2012-12-15 19:40:59 +01:00
scrawl	5ed04ae53e	added black bars	2012-12-15 19:23:03 +01:00
Chris Robinson	e6d27cd6d0	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-15 09:15:47 -08:00
Chris Robinson	9b3cf5c159	Use a looping thread to trigger refreshes	2012-12-15 09:14:58 -08:00
Chris Robinson	fa1ad381da	Make sure packets are cleaned up properly	2012-12-15 08:42:54 -08:00
scrawl	7477345481	fixed video material	2012-12-15 17:10:21 +01:00
Chris Robinson	db23c8152e	Only duplicate AVPackets as needed ... Packets that don't have a destruct method are using static memory, which will only be valid until the next av_read_frame call. Otherwise, it's already dynamically allocated and will remain valid.	2012-12-15 07:47:03 -08:00
Chris Robinson	6008cf0d15	Remove unneeded video_current_pts field	2012-12-15 05:02:01 -08:00
Chris Robinson	da44141b95	Avoid creating extra texture unit states on the video material	2012-12-15 04:17:28 -08:00
Chris Robinson	d50698d7d1	Clean up the rectangle and scene node used for displaying the video	2012-12-15 04:01:52 -08:00
Chris Robinson	eb0e8d9e37	Simplify PacketQueue::get	2012-12-15 02:50:59 -08:00
Chris Robinson	b41a77648e	Avoid re-reading the source sample to duplicate, to avoid pointer aliasing	2012-12-15 02:33:59 -08:00
Chris Robinson	62a995d492	Calculate audio sync once per read	2012-12-15 00:18:42 -08:00
Chris Robinson	cbdf6ad595	Move more stuff to where it should be, and improve cleanup	2012-12-14 09:07:59 -08:00
Chris Robinson	71ff90aaee	Don't use sub-frame timing for the video clock	2012-12-14 08:42:37 -08:00
Chris Robinson	582efcdb9b	Always try to resync if the clock difference is large	2012-12-14 07:40:19 -08:00
Chris Robinson	f97eaec7ab	Consolidate some code	2012-12-14 07:29:58 -08:00
Chris Robinson	d66d8a3118	Don't assume we can write beyond the end of the sample buffer	2012-12-14 06:43:51 -08:00
Chris Robinson	7332ffb0f8	Let the wanted sample size go down to 0	2012-12-14 06:02:34 -08:00
Chris Robinson	05c6483257	Fix external clock	2012-12-14 04:35:57 -08:00
Chris Robinson	2f37d31108	Move some definitions into the source file they're used in	2012-12-14 04:12:34 -08:00
Chris Robinson	a6e627001a	Avoid a for(;;) construct	2012-12-14 03:23:04 -08:00
Chris Robinson	4d6c05f6cc	Tighten audio skew allowance	2012-12-14 03:19:32 -08:00
Chris Robinson	8db5d10f10	Avoid showing a video picture if we're late ... Ideally we should skip decoding, or at least YUV->RGB conversion, too.	2012-12-14 03:11:59 -08:00
Chris Robinson	157cb10f56	Fix a 16-bit audio assumption	2012-12-14 02:39:46 -08:00
Chris Robinson	c2b711d195	Move some more methods to the class they're part of	2012-12-14 02:36:29 -08:00
Chris Robinson	26a09ee7ba	Move some methods into their respective class	2012-12-14 01:38:00 -08:00
Chris Robinson	5221298a7f	Move a couple packet queue methods into the struct	2012-12-14 01:14:14 -08:00
Chris Robinson	90294c589b	Use a volatile bool for the refresh	2012-12-13 18:24:57 -08:00
Chris Robinson	f555dc60eb	Reduce some indentation	2012-12-13 18:12:17 -08:00
Chris Robinson	6cedd64509	Fix audio sync correction sizes	2012-12-13 18:05:27 -08:00
Chris Robinson	e291d0943d	Merge remote-tracking branch 'scrawl/videoplayback' into videoplayback	2012-12-13 17:53:50 -08:00
Chris Robinson	606fb982a8	Update to use avcodec_decode_audio4	2012-12-13 17:53:22 -08:00
scrawl	82564e07c7	fix crash when video file doesn't exist	2012-12-14 01:44:00 +01:00
scrawl	27cd9ff732	Revert "Use the decoded frame pts when available" ... This reverts commit cab68df257.	2012-12-14 01:03:49 +01:00
scrawl	9d6f656822	fixed ogre resource functions	2012-12-14 00:10:54 +01:00
Chris Robinson	43481ad117	Use the external clock by default	2012-12-13 06:11:32 -08:00
Chris Robinson	0a5ab977b7	Use the decoder's sample offset for calculating the stream offset	2012-12-13 05:04:53 -08:00
Chris Robinson	cab68df257	Use the decoded frame pts when available	2012-12-13 04:25:41 -08:00
Chris Robinson	1ea1407707	Support quad, 5.1, and 7.1 with OpenAL and ffmpeg ... The other decoders don't guarantee any channel ordering, which makes them useless.	2012-12-13 04:10:19 -08:00
Chris Robinson	600494eed8	More cleanup of unused code	2012-12-13 03:37:04 -08:00
Chris Robinson	f7ff8b3374	A bit more cleanup	2012-12-13 03:13:44 -08:00
Chris Robinson	7e8b844b2e	Clean up some unused code	2012-12-13 03:05:37 -08:00
Chris Robinson	d2fbae9760	Init and deinit the VideoState synchronously, and re-enable audio playback	2012-12-13 02:52:37 -08:00
Chris Robinson	1ffaf6625a	Remove SDL for playing movie audio and prepare for using an audio track ... This breaks audio playback on movies	2012-12-13 01:42:20 -08:00
Chris Robinson	1fb9eef27b	Detach the thread used for frame timing	2012-12-12 22:02:33 -08:00
scrawl	7fd9e1d212	Merge branch 'videoplayback' of https://github.com/ChrisKCat/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/videoplayer.cpp	2012-12-12 22:24:38 +01:00
scrawl	18d8c767bd	fix a bunch of warnings, improved error handling, initialize texture to black	2012-12-12 15:15:55 +01:00
Chris Robinson	2c1eceb9f0	Add methods to pause and stop all playing sounds (and music)	2012-12-12 02:33:12 -08:00
Chris Robinson	e82c4afd50	close SDL when closing the video, not after the video loop is finished	2012-12-12 00:36:52 -08:00
Chris Robinson	a62d5bbfe4	Sleep using the absolute time, so the thread creation doesn't add to the wait	2012-12-11 23:54:41 -08:00
Chris Robinson	2efdafecd9	Indentation fixes	2012-12-11 20:11:48 -08:00
Chris Robinson	277248cdcb	Fix some "comparison between signed and unsigned" warnings	2012-12-11 19:43:07 -08:00
Chris Robinson	3519934f27	Add a missing return value	2012-12-11 19:36:04 -08:00
Chris Robinson	9e2d4f8b7c	Avoid potential NULL dereference	2012-12-11 19:32:10 -08:00
scrawl	fe384a1600	pause 3d rendering while the video plays	2012-12-12 01:30:34 +01:00
scrawl	faad64b254	Esc cancels the video	2012-12-12 01:13:53 +01:00
scrawl	0ce5ade6d8	DataStreamPtr fix, indentation fixes	2012-12-11 23:06:06 +01:00
scrawl	c49966dd29	started over	2012-12-11 22:49:31 +01:00
scrawl	5f676f9c6b	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp	2012-12-11 22:28:23 +01:00
scrawl	3106db0379	commented out debug output	2012-12-03 17:41:38 +01:00
scrawl	bc90c75176	more clean up, video played with correct speed, videos without sound working too (mw_credits.bik)	2012-12-03 17:33:02 +01:00
scrawl	a77d910aaf	audio codec is opened, some cleanup	2012-12-03 16:44:41 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
Mark Siewert	896ab44d1e	- Add some updated files missing from last commit. ... - Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.	2012-11-25 17:19:29 +01:00
Mark Siewert	8ea9f00e6f	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.	2012-11-25 14:12:44 +01:00
scrawl	064cb80c0a	fix wait dialog fading	2012-11-23 20:48:53 +01:00
scrawl	c8562d8442	toggleCollisionBoxes actually does something useful now	2012-11-20 02:20:54 +01:00
scrawl	f5355e3e92	512x512 map, slightly faster	2012-11-16 22:26:00 +01:00
scrawl	dc67a547b0	global map explored overlay	2012-11-16 19:34:09 +01:00
scrawl	aefde3f5bc	Merge branch 'master' into globalmap	2012-11-15 13:21:24 +01:00
scrawl	7c22690116	Merge branch 'next' into globalmap	2012-11-10 21:19:10 +01:00
greye	50867e8d87	fix gender selection update, main model visibility and couple of crashes	2012-11-10 19:57:50 +04:00
greye	235b565bb7	update main character model	2012-11-10 11:51:48 +04:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
Marc Zinnschlag	6d5333be05	some code cleanup	2012-11-06 13:08:25 +01:00
greye	e74b2c060d	disable createRecord(), Land constness hack, various fixes with Store<T> interface	2012-11-06 13:14:03 +04:00
greye	932a9dc6f9	applying new interface vol.8, inconsistent	2012-11-06 11:53:00 +04:00
emoose	5c1b3fc043	Fixed: scene: adjust rotation/scale when creating objects	2012-11-05 20:45:04 +00:00
emoose	e8e3c211a4	Changed: MWRender::player: make camera rotation functions public; world: fix/clean scaleObject and rotateObject; rendering: add scaleObject code, fix rotateObject so it stores correct rotation	2012-11-05 19:56:20 +00:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00
scrawl	b7aa7e4cef	pause all animations	2012-11-04 11:57:51 +01:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
greye	9f923e7963	fix crashing if /home/greye/.cache not exist	2012-10-25 15:14:34 +04:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
Mark Siewert	1f961d575e	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp components/esm/loadland.hpp components/esm_store/reclists.hpp	2012-10-07 20:35:54 +02:00
Mark Siewert	28d4d7ea3f	Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. ... - Remove check for 255 master/plugin files.	2012-10-07 20:00:55 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
scrawl	dc33dee22e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/miscextensions.cpp	2012-10-01 20:25:23 +02:00
scrawl	fa358ab196	change the inventory preview to "inventoryhandtohand" animation pose	2012-10-01 18:04:21 +02:00
Marc Zinnschlag	35d7b5e5b0	Merge remote-tracking branch 'greye/record_saving'	2012-10-01 09:50:20 +02:00
Marc Zinnschlag	29633bd02f	Merge remote-tracking branch 'greye/master'	2012-10-01 09:46:20 +02:00
greye	f907a6a86f	updateListener() every frame	2012-10-01 11:24:44 +04:00
Chris Robinson	6942fa97da	Specify a proper up vector for the listener	2012-09-30 17:23:05 -07:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
Marc Zinnschlag	20a263738a	Merge remote-tracking branch 'chris/animation'	2012-09-29 12:39:56 +02:00
Chris Robinson	41f80908d9	Simplify getting the stop time when playing all animation groups	2012-09-29 01:10:49 -07:00
Chris Robinson	cd8515396a	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
scrawl	044ab3d2b6	fix error in framelistener with tcg enabled	2012-09-28 17:02:18 +02:00
scrawl	359824d614	oops	2012-09-25 21:49:34 +02:00
scrawl	4453459378	re-use the texture across preview instances	2012-09-25 21:49:34 +02:00
scrawl	e2b1329620	fix the race selection escape crash	2012-09-25 21:49:34 +02:00
scrawl	05eb307bfb	added video timing	2012-09-25 02:54:29 +02:00
scrawl	73c69e8eda	video playback	2012-09-25 02:35:50 +02:00
Marc Zinnschlag	5bdc7bcacf	Merge branch 'master' into next	2012-09-24 10:14:09 +02:00
scrawl	02e7b3df4f	oops	2012-09-24 01:07:33 +02:00
scrawl	f8a18d58a6	re-use the texture across preview instances	2012-09-24 01:06:17 +02:00
scrawl	dd5c083124	fix the race selection escape crash	2012-09-24 00:42:05 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	78b2d51cfc	fix a map crash	2012-09-22 16:52:31 +02:00
scrawl	47d9fae89f	don't use cache	2012-09-21 20:35:50 +02:00
scrawl	f49401bb53	center map on the player, dynamic map size	2012-09-21 16:26:04 +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
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
scrawl	a161b34c67	remove useless member, fix map rendering crash	2012-09-20 18:23:27 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	5f014f7411	oops, left in a testing assertion	2012-09-20 14:04:29 +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	d9f6072f02	gamma correct rendering & adjustment setting	2012-09-19 23:25:07 +02:00
scrawl	4d4ba6698a	fix character preview destruction; don't allow empty names in name dialog	2012-09-18 19:00:20 +02:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
scrawl	3e794a6087	remove useless member and removed a warning	2012-09-15 01:02:07 +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
Marc Zinnschlag	b7c9285b24	added support for out of world rendering	2012-09-14 21:12:16 +02:00
scrawl	35f7216f2f	fixed some things	2012-09-14 17:25:32 +02:00
scrawl	1f7e044fad	removed some debug stuff	2012-09-14 14:41:19 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	5155339cb6	character preview working	2012-09-13 14:56:50 +02:00
scrawl	d90af9c524	Merge branch 'master' into characterpreview	2012-09-13 14:22:17 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
scrawl	2f0b47fc38	test	2012-09-13 00:21:58 +02:00
scrawl	c3966a7c5a	oops, I used a float texture for water reflection. this change should give a little performance boost.	2012-09-11 22:45:41 +02:00
scrawl	a8d9aa98b1	some fixes	2012-09-11 19:18:26 +02:00
Jason Hooks	c5b25ef70b	Very basic actor physics (no set scale/rotate functions)	2012-09-10 20:29:24 -04:00
Jason Hooks	23777033fd	Starting to implement new PhysicActor	2012-09-05 17:44:11 -04:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
Jason Hooks	0697c7f7f4	Finally merged in master	2012-09-01 17:28:12 -04:00
Artem Kotsynyak	e9b2f4ee74	fix equipment visibility update	2012-08-28 22:59:44 +04:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
scrawl	9af0b48ad6	show/hide crosshair correctly	2012-08-27 19:18:55 +02:00
greye	e6c3e0744e	tvm update and fix	2012-08-19 10:37:51 +04:00
greye	5b2b378f25	tvm script instruction	2012-08-18 18:05:10 +04:00
Marc Zinnschlag	d1656b2f5d	Merge remote-tracking branch 'greye/player_control' ... Conflicts: apps/openmw/mwrender/player.cpp	2012-08-18 13:38:54 +02:00
greye	b6954a4e8d	use the same height on non-1st person modes	2012-08-17 22:08:16 +04:00
scrawl	8817a9634c	don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)	2012-08-17 16:55:21 +02:00
Marc Zinnschlag	1da56e2832	removed some unused variables	2012-08-17 15:37:14 +02:00
greye	0e6e141fd4	camera control related script instructions	2012-08-17 15:20:57 +04:00
greye	60fb1e8df6	fix sky in preview mode movement	2012-08-17 15:19:44 +04:00
greye	6961830efb	using real player eye direction when moving	2012-08-17 15:19:44 +04:00
greye	e8fc942bef	reverse Z-axis rotation to make doors happy	2012-08-17 15:19:44 +04:00
greye	a453a7f035	camera adjustment, fix view mode on start	2012-08-17 15:19:44 +04:00
scrawl	34f796c38e	removed the far clip distance hack which is not needed anymore	2012-08-17 15:19:44 +04:00
scrawl	b97b3d7b71	fix sky position when reflection is enabled, fix delay in sky reflection	2012-08-17 15:19:44 +04:00
greye	575244bd35	fix SkaManager issue	2012-08-17 15:19:44 +04:00
greye	783e81afc3	fix 1st/preview/1st change; 1st invisible model	2012-08-17 15:19:43 +04:00
greye	392e6efcb5	initial player rendering	2012-08-17 15:19:43 +04:00
greye	6f87c0c36d	preview mode, advanced vanity support	2012-08-17 15:19:43 +04:00
greye	fe1a9ac3c5	poor camera with some fixes	2012-08-17 15:19:43 +04:00
greye	db94018865	far better camera movement	2012-08-17 15:19:43 +04:00
greye	a7aeda9a3b	initial vanity mode support	2012-08-17 15:19:43 +04:00
greye	c46eeaa100	initial 3d-person camera support	2012-08-17 15:19:43 +04:00
Marc Zinnschlag	c4bf6214db	Merge remote branch 'scrawl/master'	2012-08-12 18:11:36 +02:00
Marc Zinnschlag	88e70cb5bd	Merge branch 'decouple'	2012-08-12 18:11:17 +02:00
Marc Zinnschlag	6534c2a55a	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
scrawl	b6f427bf5e	fix OpenMW not exiting when the window is closed (alt f4 etc)	2012-08-12 17:20:46 +02:00
Marc Zinnschlag	484cce12a8	Issue #107: removed redundant getStore function from window manager	2012-08-12 14:36:46 +02:00
Marc Zinnschlag	0231533d05	Issue #107: InputManager is accessed only through the interface class from now on	2012-08-11 17:53:39 +02:00
greye	f7f8ac0a73	fix move/rotateObject code	2012-08-11 18:28:37 +04:00
greye	355ca649c2	camera flip control rewritten	2012-08-11 14:54:33 +04:00
greye	45306e4bc3	fixed rotation adjustment	2012-08-11 13:23:54 +04:00
greye	5018db3332	removed some redundant code, added some comments	2012-08-11 12:13:16 +04:00
Jason Hooks	083e3537b4	post merge	2012-08-09 17:21:59 -04:00
greye	38b06aee6c	resolving conflicts	2012-08-09 21:49:00 +04:00
Marc Zinnschlag	aca08eb4c2	Merge branch 'decouple' into player_control ... Conflicts: apps/openmw/mwsound/soundmanagerimp.hpp	2012-08-09 16:12:10 +02:00
greye	b5bc7bc424	SoundManager dependency on camera pos/dir	2012-08-09 17:01:03 +04:00
greye	181d45661f	fix rotation angles	2012-08-09 13:43:52 +04:00
greye	df60f4bf92	stub for soundmanager, adjust rotation mode	2012-08-09 13:27:32 +04:00
greye	a2d87d5f5b	added camera flip control, fixed input rotation axis	2012-08-09 10:24:18 +04:00
greye	ec9cf4d3c6	rotateObject() added, input system rewritten	2012-08-09 00:15:52 +04:00
greye	ee97a204f2	fix npc animation key update	2012-08-06 15:26:37 +04:00
Marc Zinnschlag	f5ee5a5414	Merge remote branch 'edmondo/master'	2012-08-05 00:03:16 +02:00
Marc Zinnschlag	0c5f886683	Merge remote branch 'greye/player_control'	2012-08-04 21:55:13 +02:00
Jason Hooks	cacf0bd10d	Basic collision with npcs	2012-08-04 15:43:33 -04:00
Edmondo Tommasina	11d0761528	terrainmaterial.cpp: fix std::runtime_error compile error	2012-08-03 22:42:28 +02:00
greye	ff62770657	World::isUnderwater(), World::isSwimming()	2012-08-03 14:42:09 +04:00
gugus	e9aac4512b	Build fix for Windows ... Fixes a number of places where uint was used and not defined. This commit was originally authored by gus. It rebased by Michael Mc Donnell to take recent commit fixes into account.	2012-08-01 11:47:36 -04:00
scrawl	15a16aeba1	Fixed DirectX HLSL shaders and re-enabled them in the gui	2012-08-01 04:11:16 +02:00
greye	0e3f70413e	a very little comments	2012-07-31 16:52:21 +04:00
greye	d6150b7482	high-level implementation, unstable	2012-07-30 23:28:14 +04:00
scrawl	6077965d27	fix the directx startup issue on windows	2012-07-26 23:09:46 +02:00
scrawl	06bd2cd919	Merge branch 'master' into shadersystem	2012-07-25 23:54:22 +02:00
Chris Robinson	9f0c1eeb7b	Support playgroup mode 0	2012-07-24 14:54:12 -07:00
Chris Robinson	13ab2baef0	Use a struct to hold the current animation times and remaining loop count	2012-07-24 14:42:01 -07:00
Chris Robinson	fd1e3f6ec5	Add support for playgroup mode 2	2012-07-24 14:14:32 -07:00
Chris Robinson	20121f3b0a	Remove some unused stuff	2012-07-24 13:56:28 -07:00
Chris Robinson	9a7a629d0f	Add support for playing animation groups	2012-07-24 13:51:48 -07:00
Chris Robinson	f953d7f8c0	Store text keys from base NIF animations	2012-07-23 17:27:35 -07:00
Chris Robinson	36be1536d9	Return text keys from NIFs when creating entities	2012-07-23 17:20:47 -07:00
scrawl	8c8228a15c	fix terrain num lights setting	2012-07-24 00:08:53 +02:00
Chris Robinson	44975854e5	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-07-23 13:46:05 -07:00
Chris Robinson	f67983bbee	Don't assume one sub-entity for the night sky entities	2012-07-23 13:37:05 -07:00
scrawl	02a52c0ff1	fixed some more settings bugs	2012-07-23 21:39:22 +02:00
scrawl	a70f93b024	fix "Crash when running openmw with --start="XYZ", remove HLSL for windows	2012-07-23 20:12:42 +02:00
scrawl	ab35bfa32c	fixed a sky issue	2012-07-23 18:19:34 +02:00
scrawl	cfa0519721	Merge branch 'master' into nif-cleanup	2012-07-23 15:37:08 +02:00
scrawl	1fef086088	Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" ... This reverts commit 546b640022, reversing changes made to fcaa8aae06.	2012-07-23 15:36:12 +02:00
scrawl	f8d6a36196	Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp	2012-07-23 15:35:31 +02:00
scrawl	2eca27bba9	fix horizon color of the sky reflection	2012-07-23 14:21:40 +02:00
scrawl	1dbfd60305	Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup	2012-07-23 13:48:12 +02:00
scrawl	afe7c41729	removed some unused code	2012-07-23 13:47:51 +02:00
Chris Robinson	77446a0d58	Fix skipAnim, only skip one animation update	2012-07-21 17:39:57 -07:00
Chris Robinson	e81fc42daa	Remove the beast-race special cases from updateParts ... The special handling should happen at a much lower level, and prevent the objects from being equipped in the first place.	2012-07-21 17:12:41 -07:00
Chris Robinson	c5b9098517	Remove an unused field from EntityList	2012-07-21 17:09:16 -07:00
scrawl	546b640022	Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup	2012-07-21 23:50:56 +02:00
Chris Robinson	81ce8dbe12	Combine animation handling into the base class	2012-07-21 14:41:26 -07:00
Chris Robinson	fcaa8aae06	Don't skip animation state updates for NPCs	2012-07-21 11:26:09 -07:00
scrawl	acc5c3bbbf	some fixes	2012-07-20 17:08:15 +02:00
scrawl	014396e80c	remove the plugins.cfg files, do not enforce CG plugin	2012-07-20 16:44:03 +02:00
scrawl	21728020f6	fixed the water on local map	2012-07-20 14:45:42 +02:00
Chris Robinson	2db80a1504	Rename a couple methods to match their scripting counterparts	2012-07-20 00:53:12 -07:00
Chris Robinson	66860825cf	Remove some unused and unneeded bits from the Animation class	2012-07-20 00:36:52 -07:00
Chris Robinson	8b5b74f9ee	Add a quick hack to let "playgroup all" work on creatures and NPCs	2012-07-19 22:34:26 -07:00
scrawl	f5ffea4d4b	new button, water timescale	2012-07-19 23:30:41 +02:00
scrawl	e077814a8c	water	2012-07-19 22:23:07 +02:00
Chris Robinson	a86ed46ec4	Use the race ID specified in the ref base's record instead of the race record ... The latter is localized and doesn't match with international versions.	2012-07-19 11:00:26 -07:00
scrawl	739455e6f8	new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc	2012-07-19 16:23:30 +02:00
Chris Robinson	6caa39629d	Reimplement the skirt part	2012-07-18 22:32:26 -07:00
Chris Robinson	b505d4ace0	Fix feet and entity part detachment	2012-07-18 21:39:50 -07:00
Chris Robinson	4af1bce659	Restore and fix some missing parts	2012-07-18 20:14:23 -07:00
Chris Robinson	d9b64b77ec	Attach skinned parts to the scene node instead of the named bone	2012-07-18 18:38:55 -07:00
Chris Robinson	db948969c9	Attach NPC parts to the proper bone	2012-07-18 11:14:13 -07:00
Chris Robinson	04e496a6ca	Store the entity lists for NPC parts	2012-07-18 10:26:25 -07:00
Chris Robinson	6611b0b317	Use an array instead of a bunch of nearly-identical if blocks	2012-07-18 10:09:16 -07:00
Chris Robinson	02d39080c8	Destroy entities when they're done with.	2012-07-18 00:17:39 -07:00
Chris Robinson	4109d0d923	Destroy entities removed from the NPC	2012-07-17 22:47:56 -07:00
Chris Robinson	92546ca18d	Move the last bits of code to createEntities	2012-07-17 20:23:09 -07:00
Chris Robinson	94f3e7a6c0	Store the entity list in the object	2012-07-17 16:00:03 -07:00
Chris Robinson	a590db2cf4	Create entities when loading NIFs for the NPC base	2012-07-17 15:43:40 -07:00
Chris Robinson	3efd2030e2	Create entities when loading NIFs for creatures	2012-07-17 14:11:07 -07:00
Chris Robinson	3dedac5cb1	Create mesh entities for objects when loading the NIF	2012-07-17 13:40:03 -07:00
Chris Robinson	c6cc82a51a	Handle multiple entities per NPC part	2012-07-17 12:20:52 -07:00
Chris Robinson	89cfe778f0	Support multiple entities for the NPC base	2012-07-17 11:38:50 -07:00
Chris Robinson	0a4a141f2e	Support multiple meshes for creatures	2012-07-17 11:23:34 -07:00
Chris Robinson	6047dc6a0c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp	2012-07-17 10:57:15 -07:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Marc Zinnschlag	0d3a7d482e	Merge remote branch 'modred11/master'	2012-07-17 10:21:46 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
Chris Robinson	a539e98274	Handle all meshes when inserting objects into the scene	2012-07-16 10:48:48 -07:00
scrawl	778e59ee37	terrain as it was before, with about 4x less code	2012-07-15 08:21:43 +02:00
scrawl	29f91753f7	correction	2012-07-14 18:44:03 +02:00
scrawl	93c641efa7	terrain albedo	2012-07-14 18:25:43 +02:00
scrawl	16c2ea3a75	terrain colourmap	2012-07-14 11:13:38 +02:00
Chris Robinson	939d0d2fc5	Return a list of meshes and the skeleton from NIFLoader::load	2012-07-13 20:01:15 -07:00
Carl Maxwell	e4d046f69c	Prepending m to the name of every member variable. ... I made a bunch of changes in apps/openmw/mwrender/animation.cpp because the scope brackets didn't line up in a bunch of places npcanimations.cpp & creatureanimations.cpp were the same kind of thing	2012-07-13 03:51:58 -07:00
scrawl	d2fbb11475	temp commit	2012-07-13 11:26:36 +02:00
scrawl	7731e9a6fa	finished cleaning up sky	2012-07-13 09:13:12 +02:00
scrawl	b8384162b6	merge	2012-07-13 06:16:55 +02:00
Chris Robinson	ecdd4ee23f	Load NiMorphData and NiKeyframeData using proper key lists	2012-07-12 20:56:47 -07:00
Chris Robinson	386ac56bda	Remove the NIF loader and code to manually transform the vertices ... This currently breaks just about everything. They should come back as it's all reimplemented, though.	2012-07-12 20:12:18 -07:00
scrawl	ad7383be43	sky	2012-07-11 09:08:55 +02:00
scrawl	e0a99f104b	settings tab "shadows"	2012-07-11 04:28:45 +02:00
scrawl	485adc8bdc	shader mode button in settingswindow	2012-07-11 03:19:51 +02:00
scrawl	865bfc6f47	sync mrt_output setting	2012-07-11 02:31:03 +02:00
scrawl	3537af051d	removed the old shader helper	2012-07-10 00:17:52 +02:00
scrawl	5d1e6b6bf6	remove cg profile check	2012-07-10 00:09:47 +02:00
scrawl	1a9f59d5d4	shadows	2012-07-10 00:07:33 +02:00
scrawl	07fd9986ef	accidently removed the map.	2012-07-09 20:14:07 +02:00
scrawl	b803d0e949	converted shadow caster shader	2012-07-09 19:46:36 +02:00
scrawl	81d30ff63a	temp commit	2012-07-09 19:20:41 +02:00
scrawl	a095572205	fixed some textures, started with sky	2012-07-06 10:31:48 +02:00
scrawl	33c48b9481	update	2012-07-06 04:28:08 +02:00
scrawl	4ea6530772	hello world.	2012-07-04 00:26:57 +02:00
scrawl	a1e48b0feb	builds now	2012-07-03 22:48:16 +02:00
Marc Zinnschlag	c85aaafac2	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
Marc Zinnschlag	87667ab57e	Issue #107: Ptr related include cleanup	2012-07-03 13:55:53 +02:00
Marc Zinnschlag	5a7b95bf7a	Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp	2012-07-03 13:15:20 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
Marc Zinnschlag	7fcd41c69d	Issue #107: Detemplateised CellStore; some include cleanup	2012-06-29 18:54:23 +02:00
Marc Zinnschlag	76174098c7	Issue #107: CellStore moved from ESMS to MWWorld	2012-06-29 16:48:50 +02:00
scrawl	63ce143a04	fix triangle / batch counts with compositors	2012-06-22 12:56:04 +02:00
Mark Siewert	bef4bef5d2	- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied. ... - Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first. - Support deleting parent entries from the list.	2012-06-10 11:14:46 +02:00
scrawl	447158e9d6	shutdown crash fix	2012-06-09 19:15:11 +02:00
scrawl	42e44ac1b5	fixed some leaks	2012-06-06 21:08:20 +02:00
scrawl	c85c794c86	fixed some cppcheck issues	2012-06-06 20:29:30 +02:00
scrawl	36d26e0681	set the camera orientation after using teleport doors	2012-05-30 15:52:39 +02:00
scrawl	1b561ce91f	Merge branch 'master' into next	2012-05-29 06:56:23 +02:00
scrawl	69e6bc6588	add water settings to settings window	2012-05-29 06:45:44 +02:00
scrawl	5d03e86613	added field of view and texture filtering to settings window	2012-05-29 04:54:54 +02:00
scrawl	14f4f09f83	proper resolution switching (reposition GUI & adjust mouse clipping region)	2012-05-28 09:19:25 +02:00
scrawl	3daf1ebc3f	small map tweak	2012-05-28 05:03:50 +02:00
scrawl	19c428e86c	delete fix	2012-05-28 02:04:00 +02:00
scrawl	8f667580bb	ogre 1.8 final release compability fixes	2012-05-27 23:12:45 +02:00
scrawl	f6a6684685	when the resolution changes, adjust camera aspect ratio and recreate compositors	2012-05-27 21:39:18 +02:00
scrawl	a7e6a142f9	blend fog of war into adjacent cells	2012-05-27 00:39:33 +02:00
scrawl	656a8f1be9	working menu transparency slider	2012-05-23 01:32:36 +02:00
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	8a0c859c16	Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI	2012-05-18 22:27:48 +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	933a40de14	better floating object label positioning.	2012-05-14 21:37:43 +02:00
gugus	9dd65dce30	Finished merging.	2012-05-11 11:52:07 +02:00
scrawl	ee883446b5	Merge branch 'master' into graphics	2012-05-04 07:38:11 +02:00
scrawl	02dad448fe	make the wireframe mode not affect sky	2012-05-03 05:38:43 +02:00
scrawl	9e6531a6c6	fix for dark corners bug on some cards	2012-04-30 21:22:26 +02:00
scrawl	4655ec94f0	Merge branch 'master' into physicsaedra2 & fix warnings ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-30 18:46:51 +02:00
scrawl	aaa81397ed	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-30 18:24:05 +02:00
scrawl	50d79a8815	Merge branch 'next' into tooltips	2012-04-29 17:30:34 +02:00
scrawl	9cf6f27f96	small fix	2012-04-29 03:38:00 +02:00
scrawl	11ebae3be2	toggleCompositors command useful for debugging	2012-04-29 03:33:10 +02:00
Marc Zinnschlag	d1d21c8a0e	compile fix	2012-04-28 21:21:40 +02:00
scrawl	4ce83badc9	flickering lights	2012-04-28 20:42:53 +02:00
scrawl	1b5bfc52a1	Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwclass/apparatus.cpp apps/openmw/mwclass/book.cpp apps/openmw/mwclass/container.cpp apps/openmw/mwclass/ingredient.cpp apps/openmw/mwclass/misc.cpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/potion.cpp apps/openmw/mwclass/repair.cpp apps/openmw/mwgui/window_manager.cpp	2012-04-24 02:02:03 +02:00
scrawl	e443455612	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2012-04-24 00:54:35 +02:00
Marc Zinnschlag	7ac9523e0c	Merge branch 'master' into next	2012-04-23 15:32:02 +02:00
Marc Zinnschlag	35f478071e	Issue #255: deleted the old environment class and using the new one instead	2012-04-23 15:27:03 +02:00
Marc Zinnschlag	cc86998281	removing some cout spam	2012-04-21 10:12:59 +02:00
scrawl	7400b7f313	fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water	2012-04-19 23:25:58 +02:00
scrawl	c6da3872b4	light improvements	2012-04-19 20:59:57 +02:00
scrawl	fb0e649191	minor fix	2012-04-19 01:10:55 +02:00
scrawl	aa4a1b675f	fixed the sky reflection issue	2012-04-19 01:08:26 +02:00
scrawl	046ef39c4a	use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0)	2012-04-18 01:10:00 +02:00
scrawl	51a76eda92	Merge branch 'master' into graphics	2012-04-18 01:09:55 +02:00
Jason Hooks	1ce759af06	Merging in master	2012-04-17 18:12:05 -04:00
scrawl	1de1b3e40e	Merge branch 'master' into tooltips	2012-04-17 15:57:08 +02:00
scrawl	a11c4da16c	vertex colour tweak	2012-04-17 14:22:03 +02:00
Marc Zinnschlag	14ddcc1204	Merge remote branch 'jhooks/clothingarmor'	2012-04-17 00:26:39 +02:00
Jason Hooks	950378ff65	Khajiit male foot fix	2012-04-16 17:25:55 -04:00
scrawl	13b67faf2f	adding more safety checks	2012-04-16 20:39:41 +02:00
Marc Zinnschlag	7483c78b4a	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-16 14:06:27 +02:00
scrawl	d1e298c2e1	Merge branch 'master' into tooltips	2012-04-16 13:15:50 +02:00
Jason Hooks	0c9c253778	Fix for some types of boots	2012-04-15 22:49:17 -04:00
scrawl	0a223196e8	Merge branch 'master' into tooltips	2012-04-15 22:23:16 +02:00
scrawl	268b7cd6fc	replaced typename checks	2012-04-15 22:05:33 +02:00
Marc Zinnschlag	afa859a6a6	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-15 22:06:05 +02:00
Jason Hooks	65c9cf565c	Skirt and robe part blanking	2012-04-15 15:16:48 -04:00
scrawl	688e79e6d1	Merge branch 'master' into tooltips	2012-04-15 21:14:39 +02:00
Jason Hooks	bc8bb9c57e	Reserve; skirts	2012-04-15 14:22:55 -04:00
scrawl	ab4e03f05f	Merge branch 'master' into tooltips	2012-04-15 17:11:14 +02:00
scrawl	d37bc9cba8	basic mouse-over info for in-game objects	2012-04-15 17:10:08 +02:00
Jason Hooks	85ac658cac	Adding tons of skin body parts	2012-04-14 22:52:05 -04:00
Jason Hooks	5e1ac0cca1	Gloves, Gauntlets, Boots, Shoes	2012-04-14 20:32:46 -04:00
Jason Hooks	940a90e3ba	Pauldrons	2012-04-14 19:21:14 -04:00
Jason Hooks	e5becb1f50	Group add function;Greaves	2012-04-14 18:58:52 -04:00
Jason Hooks	5d4ad4cd81	Shirts and Cuirasses	2012-04-14 16:44:46 -04:00
scrawl	4b0099fb5b	npc visibility flags fix	2012-04-14 16:10:47 +02:00
scrawl	fa5a1432c9	map lighting tweak, default settings tweak	2012-04-14 15:58:58 +02:00
scrawl	e05faa184f	Merge branch 'terrainshader' into graphics	2012-04-14 15:10:35 +02:00
scrawl	e04d127f30	terrain shader fixes	2012-04-14 15:10:26 +02:00
Jason Hooks	7551926afd	Adding helmets	2012-04-13 23:25:15 -04:00
Alexander "Ace" Olofsson	0c6862e3e6	Undefining some windows defines	2012-04-13 15:09:38 +02:00
scrawl	a33ae35e94	some fixes	2012-04-13 13:28:31 +02:00
Jason Hooks	e869433b07	Add or replace individual parts	2012-04-12 22:16:02 -04:00
Jason Hooks	1f566fc93a	Another remove function	2012-04-12 20:59:30 -04:00
Jason Hooks	a885f3e942	Remove part function	2012-04-12 20:40:11 -04:00
scrawl	fb78e853d4	removed 2 unneeded lines	2012-04-12 19:18:38 +02:00
scrawl	e2ec889d10	fixed a warning "implicit cast to float3"	2012-04-12 17:40:26 +02:00
scrawl	a96ad7fb82	restored toggleWater	2012-04-12 16:46:56 +02:00
Jason Hooks	7fce57f335	Getting started with a new branch	2012-04-11 20:16:22 -04:00
scrawl	2a4fcf42a3	basic shadows	2012-04-11 18:53:13 +02:00
Jason Hooks	c0f52fef48	one more change	2012-04-09 00:51:10 -04:00
Jason Hooks	80afcb2eac	small change	2012-04-08 20:44:44 -04:00
Jason Hooks	74deb5588d	Post merge	2012-04-08 20:41:49 -04:00
scrawl	1df7be7fee	- fixes to texture filtering setting ... - add a sensible warning to settings-default.cfg, since there have been some confusions with it	2012-04-09 00:10:42 +02:00
Jason Hooks	6bdfdf379b	Trying iterators	2012-04-08 17:27:56 -04:00
scrawl	a5c6207fe7	add setting to disable the underwater effect	2012-04-08 17:44:00 +02:00
scrawl	113bbfa253	removed the now unneccesary SG for transparent objects	2012-04-08 14:37:36 +02:00
Jason Hooks	ebab98a8a0	Restructuring things	2012-04-07 22:02:20 -04:00
scrawl	c748252d33	weather fix again	2012-04-07 22:55:25 +02:00
scrawl	96911ada95	restored render queue of transparent objects, they are now part of the mrt textures ... this fixes some issues with transparent objects not visible in the refraction	2012-04-07 22:37:15 +02:00
scrawl	c49d5dd40b	another sky tweak	2012-04-06 19:23:19 +02:00
scrawl	c0f991ac0a	underwater depth effect	2012-04-06 18:51:30 +02:00
scrawl	456eb95209	reversed sun and moon paths (sunrise at east)	2012-04-06 18:22:37 +02:00
scrawl	8316a4c2ec	add mrt dummy output to sky shaders	2012-04-06 17:21:56 +02:00
scrawl	c169f9e171	underwater tweaks	2012-04-06 16:11:08 +02:00
scrawl	2976625b00	better underwater	2012-04-06 15:51:57 +02:00
scrawl	ec3fe1ef00	no sun glare in the reflection	2012-04-06 15:17:54 +02:00
scrawl	393530e671	more or less fixed the sky for normal viewing angles, still disappears at a certain height though	2012-04-06 15:05:17 +02:00
scrawl	a41eee9a72	specular lighting	2012-04-06 14:07:52 +02:00
scrawl	8bfc81f398	Merge branch 'master' into water	2012-04-05 20:09:38 +02:00
scrawl	622fb568cf	removed MRT setting and figure it out automatically	2012-04-05 19:27:54 +02:00
scrawl	b8a470efcd	put transparent objects in a seperate render queue, in order to not mess up the mrt textures	2012-04-05 19:07:21 +02:00
Marc Zinnschlag	000cfad82d	Merge remote branch 'scrawl/gamesettings'	2012-04-05 18:07:47 +02:00
scrawl	88c50c5171	Merge branch 'master' into water	2012-04-05 15:38:46 +02:00
scrawl	1b89a9e203	various fixes	2012-04-05 15:30:55 +02:00
Dmitry Marakasov	84b475130a	Add missing include	2012-04-05 15:03:28 +02:00
scrawl	e1bde415f5	typo	2012-04-05 14:22:44 +02:00
scrawl	43fd0352f4	removed unneeded lines	2012-04-05 14:21:57 +02:00
scrawl	f49131e1b8	renamed setting, automatically disable MRT when unsupported	2012-04-05 13:09:59 +02:00
scrawl	f6342cfd60	fixed viewport background color, fixed indentation of some old functions	2012-04-05 11:52:06 +02:00
scrawl	5664d879a5	fixed some sky objects	2012-04-05 11:40:56 +02:00
scrawl	ab8b74dcac	forgot adding a file	2012-04-05 08:58:21 +02:00
Jason Hooks	ca4de0606e	Some planning	2012-04-04 23:23:24 -04:00
scrawl	3f05aba76d	got MRT working, some minor quirks to solve (black viewport background)	2012-04-05 01:21:36 +02:00
Marc Zinnschlag	6fd3d5c776	Merge remote branch 'lgro/master'	2012-04-04 23:19:30 +02:00
Lukasz Gromanowski	cd2789b15a	Revert "Issue #225: Correction to commit ae98904." ... This reverts commit 0e5c90d3e7.	2012-04-04 21:05:19 +02:00
scrawl	eb67afe552	added MRT output to terrain material	2012-04-04 20:18:08 +02:00
scrawl	6442d49e16	render queue groups, sky fix	2012-04-04 18:53:40 +02:00
scrawl	cc4076d42a	basic noise	2012-04-03 21:16:43 +02:00
scrawl	fe63f2b2aa	first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)	2012-04-03 19:10:02 +02:00
Marc Zinnschlag	cc9696cc2c	Merge remote branch 'scrawl/minimap'	2012-04-03 18:26:20 +02:00
scrawl	6481cf87fc	cleanup resources	2012-04-03 17:07:16 +02:00
scrawl	052cc47ee9	fixed waterAdded	2012-04-03 16:53:33 +02:00
scrawl	b3a186e729	simple water without shaders that uses original MW textures	2012-04-03 16:37:54 +02:00
scrawl	c1693a0c63	Merge branch 'minimap' into water	2012-04-03 15:37:11 +02:00
scrawl	51e33cc090	fixed map of some interiors	2012-04-03 15:34:13 +02:00
scrawl	8aea311797	added visibility flags for everything	2012-04-03 15:13:47 +02:00
scrawl	fd45208196	re-added code for reflection & refraction rendering	2012-04-03 14:23:23 +02:00
scrawl	d393f2dd4b	Merge branch 'master' into water	2012-04-03 14:06:14 +02:00
Jason Hooks	57299571d5	Preparing for clothes/armor	2012-04-02 22:08:46 -04:00
Marc Zinnschlag	26371a82a5	Merge remote branch 'scrawl/crashfix'	2012-04-02 23:53:07 +02:00
Lukasz Gromanowski	0e5c90d3e7	Issue #225: Correction to commit ae98904. ... Changed pointer to LandData struct to simple member variable.	2012-04-02 23:50:53 +02:00
scrawl	d4a2bdfa3d	fix crash when hardware occlusion queries unsupporetd	2012-04-02 20:46:42 +02:00
scrawl	bd9e165e3f	Merge branch 'master' into water	2012-04-02 19:44:25 +02:00
scrawl	16481b0594	Merge branch 'master' into minimap	2012-04-02 19:38:36 +02:00
scrawl	342464530d	rotated map working	2012-04-02 19:37:24 +02:00
scrawl	ff15f28787	options for texture filtering and mipmaps	2012-04-02 18:01:49 +02:00
scrawl	39ee9e9ab8	setting for field of view	2012-04-02 17:51:51 +02:00
scrawl	5f2a674d93	fixed a typo	2012-04-02 16:14:39 +02:00
scrawl	fd662f937a	add settings for viewing distance and fog	2012-04-02 15:51:48 +02:00
scrawl	e5cc9adbb0	added settings for rendering distance of small objects	2012-04-02 15:30:29 +02:00
scrawl	2b4b941192	Merge branch 'master' into gamesettings	2012-04-02 15:21:10 +02:00
scrawl	e0631dd9be	Merge branch 'master' into minimap ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-02 14:38:02 +02:00
scrawl	b380e71832	fixed underwater wireframe mode	2012-04-02 14:32:21 +02:00
scrawl	1445ae992d	adding a setting to disable static geometry	2012-04-02 14:24:16 +02:00
Marc Zinnschlag	6022d3ab13	Merge remote branch 'corristo/pgrd-rendering' ... reduced cout spam. Conflicts: apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/renderingmanager.cpp components/bsa/bsa_archive.cpp libs/openengine/bullet/physic.hpp	2012-04-02 12:04:47 +02:00
Marc Zinnschlag	cdd0182912	Merge remote branch 'scrawl/occlusionquery' ... Reduced cout spam Conflicts: apps/openmw/mwrender/occlusionquery.cpp	2012-04-02 11:33:16 +02:00
Lukasz Gromanowski	ae989040e5	Issue #225: Fix for memleak when loading terrain.	2012-04-01 21:29:49 +02:00
scrawl	0a5757791c	Merge branch 'master' into minimap	2012-04-01 20:17:07 +02:00
scrawl	c2a82c3d89	Merge branch 'master' into gamesettings	2012-04-01 20:06:18 +02:00
scrawl	7b3adb27a3	backend changes, terrain num lights setting	2012-04-01 18:48:37 +02:00
Nikolay Kasyanov	30d6c880ff	Feature #37 (In Progress) Render Path Grid ... tuned sized a bit	2012-04-01 17:51:37 +04:00
Nikolay Kasyanov	cab412c225	Feature #37 (In Progress) Render Path Grid ... optimisation, now it takes only two batches per cell.	2012-04-01 17:27:18 +04:00
scrawl	9a261a02aa	changed the cloud movement direction like suggested on the forum	2012-04-01 15:14:43 +02:00
scrawl	ee754eda6c	don't create sky until entering an exterior cell	2012-04-01 15:07:41 +02:00
scrawl	80456778be	fix for pickup up transparent objects, workaround for doors	2012-04-01 14:22:04 +02:00
Marc Zinnschlag	40310f3663	Merge remote branch 'scrawl/occlusionquery'	2012-03-31 22:09:47 +02:00
Marc Zinnschlag	b5b40e2623	Merge remote branch 'lgro/master'	2012-03-31 21:45:15 +02:00
Lukasz Gromanowski	bdc4c79b4e	Fix for segfault when doing 'coc "seyda neen"'. ... This is a fix for segfault: ==8683== Process terminating with default action of signal 11 (SIGSEGV) ==8683== Access not within mapped region at address 0x0 ==8683== at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503) ==8683== by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134) ==8683== by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168) ==8683== by 0x629AD6: MWWorld::World::update(float) (world.cpp:705) ==8683== by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157) ==8683== by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0) ==8683== by 0x68A669: OMW::Engine::go() (engine.cpp:408) ==8683== by 0x51CECB: main (main.cpp:254) ==8683== If you believe this happened as a result of a stack ==8683== overflow in your program's main thread (unlikely but ==8683== possible), you can try to increase the size of the ==8683== main thread stack using the --main-stacksize= flag. ==8683== The main thread stack size used in this run was 8388608. when doing 'coc "seyda neen"' when animations are enabled (Animation::animate member variable is set to 1).	2012-03-31 21:34:40 +02:00
Alexander "Ace" Olofsson	4ef921c43f	Prevent internal classes from being marked dllimport	2012-03-31 20:50:22 +02:00
scrawl	13efe68fc3	disabled some debug output	2012-03-31 20:28:07 +02:00
scrawl	cfb194f1d1	fix 6	2012-03-31 20:18:20 +02:00
scrawl	5f78f6c723	change queue	2012-03-31 20:10:34 +02:00
scrawl	b018d00fd3	fix 5	2012-03-31 20:05:23 +02:00
scrawl	c9067249dd	fix 4	2012-03-31 19:16:14 +02:00
scrawl	c08a2b2942	fix 3	2012-03-31 19:12:02 +02:00
scrawl	909abb480d	fix 2	2012-03-31 19:09:36 +02:00
scrawl	f8d45eae52	fix #1	2012-03-31 19:08:05 +02:00
Nikolay Kasyanov	5e829362cb	Feature #37 (In Progress) Render Path Grid ... more similar to vanilla path grid rendering	2012-03-31 16:22:55 +04:00
Nikolay Kasyanov	006e1cde85	some updates after terrain merge	2012-03-31 14:56:54 +04:00
Nikolay Kasyanov	523648dbb1	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/debugging.cpp	2012-03-31 14:56:18 +04:00
Nikolay Kasyanov	057c2f2e2a	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-03-31 13:42:13 +04:00
scrawl	fc5cd703bb	maps are now rendered with correct rotation, however for interiors the arrow is wrong	2012-03-30 16:34:36 +02:00
scrawl	a4576f043d	fixed the physics debug rendering now activates/deactivates properly	2012-03-30 16:02:41 +02:00
Marc Zinnschlag	557e97bab4	fixed a terrain-related Redemption crash	2012-03-30 15:52:09 +02:00
Marc Zinnschlag	2d2af4b28a	Merge remote branch 'scrawl/terrain18' into terrain ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp components/esm_store/cell_store.hpp	2012-03-30 15:38:14 +02:00
scrawl	521b9eec6c	Merge branch 'master' into minimap ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/world.cpp	2012-03-30 15:31:07 +02:00
scrawl	30d27fa83f	Merge branch 'master' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-30 15:00:04 +02:00
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
Nikolay Kasyanov	b21a6291f7	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwscript/miscextensions.cpp apps/openmw/mwworld/world.hpp	2012-03-30 02:50:30 +04:00
Marc Zinnschlag	647c0e4df3	Merge remote branch 'scrawl/renderingdistance'	2012-03-29 21:27:25 +02:00
Marc Zinnschlag	eec135c040	Merge remote branch 'scrawl/water'	2012-03-29 21:20:16 +02:00
scrawl	8d224f009f	toggleFogOfWar script command	2012-03-29 19:45:19 +02:00
scrawl	0c2317ce9d	player arrow works again	2012-03-29 19:20:09 +02:00
scrawl	79c2a2e465	implemented toggleWater (twa); formatting again	2012-03-29 18:33:08 +02:00
scrawl	01ecf3e0be	attempt at rotation (BROKEN)	2012-03-29 18:16:11 +02:00
scrawl	35f40b99ad	remove the bounding box hack, not needed because calculation is correct now	2012-03-29 18:10:01 +02:00
scrawl	0332a8df96	Merge branch 'renderingdistance' into minimap	2012-03-29 18:09:24 +02:00
Marc Zinnschlag	10b4c1d904	silenced a warning	2012-03-29 18:04:52 +02:00
scrawl	e22ae7c840	bounds fix (again)	2012-03-29 17:30:13 +02:00
scrawl	19c801f538	disabled rendering distance for now	2012-03-29 16:56:30 +02:00
scrawl	f45c650975	bounds fix	2012-03-29 16:47:59 +02:00
scrawl	f497813043	formatting, added Water::setHeight	2012-03-29 15:49:24 +02:00
Nikolay Kasyanov	c3357c4396	Merge branch 'master' into pgrd-rendering ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwscript/docs/vmformat.txt	2012-03-29 13:27:13 +04:00
scrawl	39b3afb98f	use camera height instead of player height for underwater check	2012-03-29 05:03:34 +02:00
scrawl	e5a19209a4	remove the timeout stuff	2012-03-29 00:05:48 +02:00
scrawl	cb72e812f9	Merge branch 'master' into renderingdistance	2012-03-28 21:47:26 +02:00
scrawl	47c3e92db1	removed the unused ray scene query	2012-03-28 21:42:41 +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	6bea08157e	Merge branch 'master' into terrain18	2012-03-28 21:30:15 +02:00
scrawl	cc7d3af701	Merge branch 'terrain18' into occlusionquery	2012-03-28 21:03:55 +02:00
scrawl	72ff7ec030	Merge branch 'next' into occlusionquery ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-03-27 23:46:48 +02:00
scrawl	8f6d10f229	fix uninitalised stuff	2012-03-27 20:59:58 +02:00
Jacob Essex	ec21ff21cc	Removed memory leak, allocated more on the stack	2012-03-27 13:58:12 +01:00
scrawl	e398c51f8a	remove unneeded render queue workaround	2012-03-27 13:13:28 +02:00
Marc Zinnschlag	9863195f09	Merge remote branch 'lgro/valgrind' into next	2012-03-27 11:14:09 +02:00
Jacob Essex	b76b62e5e4	Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore	2012-03-27 09:20:22 +01:00
scrawl	bb09c2189a	lower rendering distance for small objects (reduce batch count)	2012-03-27 00:45:25 +02:00
Lukasz Gromanowski	be94da1527	Issue #225: Initialize class members in constructor.	2012-03-27 00:34:06 +02:00
Lukasz Gromanowski	6d6ed909bf	Issue #225: Deallocate memory used by actors animations.	2012-03-27 00:31:15 +02:00
scrawl	bf421d2873	use vector instead of array	2012-03-27 00:18:09 +02:00
scrawl	bb3f3ce1db	bugfix	2012-03-26 21:52:38 +02:00
scrawl	28dfba55e0	delete fix	2012-03-26 20:29:07 +02:00
Lukasz Gromanowski	5185a28b60	Issue #225: Initialize all class members in constructor.	2012-03-26 19:09:55 +02:00
scrawl	4ee03cd61f	handle timeout	2012-03-26 00:31:03 +02:00
scrawl	98a33a7fc6	fix	2012-03-25 23:28:51 +02:00
scrawl	382fa6ac68	fixes	2012-03-25 22:53:00 +02:00
scrawl	53d4be5cf6	object pickup should work everywhere	2012-03-25 20:52:56 +02:00
Jason Hooks	18a139cd66	adding up and down move buttons	2012-03-24 22:03:08 -04:00
scrawl	9d30a139cc	added api	2012-03-24 20:41:23 +01:00
scrawl	e212a32350	bugfix	2012-03-24 18:38:58 +01:00
scrawl	743ea0c9be	use hardware occlusion query for sun glare effect	2012-03-24 17:59:26 +01:00
scrawl	5fba52c238	Merge branch 'terrain18' into occlusionquery ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-24 15:14:33 +01:00
scrawl	99b2b6b648	ogre 1.8 fixes	2012-03-24 14:46:48 +01:00
scrawl	f2a7acb102	Merge branch 'next' into terrain ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp	2012-03-24 13:19:17 +01:00
scrawl	f4898539e9	added some code that doesn't do anything yet, waiting for ogre 1.8	2012-03-24 13:06:01 +01:00
Marc Zinnschlag	9ec1e55aaf	Merge remote branch 'scrawl/minimap' into next	2012-03-24 10:31:42 +01:00
scrawl	a6259a1b0d	bugfixes	2012-03-23 17:37:56 +01:00
scrawl	06fa310e29	player arrow rotated correctly	2012-03-23 15:00:48 +01:00
scrawl	b8f962a68d	Merge branch 'next' into shaders	2012-03-23 10:26:20 +01:00
scrawl	9c3e1f48f0	player arrow	2012-03-23 09:00:00 +01:00
scrawl	2dd329938a	automatically zoom in on the player while moving	2012-03-23 08:16:04 +01:00
scrawl	9076401892	Merge branch 'next' into terrain ... Conflicts: CMakeLists.txt apps/openmw/CMakeLists.txt	2012-03-22 22:31:49 +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
Jason Hooks	fe9e6a732c	Some cleanup	2012-03-18 22:32:46 -04:00
Jason Hooks	51fb9e67cd	Merge	2012-03-18 21:31:31 -04:00
scrawl	1907e21207	removed preprocessor constants	2012-03-18 20:44:56 +01:00
scrawl	c2329b7027	removed preprocessor constants	2012-03-18 20:32:50 +01:00
scrawl	5e939e4818	map window now works for interiors	2012-03-17 13:59:51 +01:00
scrawl	3e4cf64a77	Merge branch 'master' into shaders	2012-03-16 20:46:18 +01:00
scrawl	5ea2122f79	sun gradually disappears	2012-03-16 20:39:58 +01:00
scrawl	a67cc8e73b	more fixes	2012-03-16 19:02:33 +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
scrawl	877cb2aca7	much better looking moons	2012-03-15 20:35:23 +01:00
scrawl	e354203c21	stars rotation	2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson	e8eea03b4c	Fixed a few more non-virtual destructor warnings	2012-03-15 17:40:42 +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
scrawl	2edd7e59f4	some fixes and facilities for saving the fog of war to disk	2012-03-14 20:44:06 +01:00
scrawl	5a46d58da5	fully working fog of war	2012-03-14 17:44:19 +01:00
scrawl	583a25f634	fog of war rendering (incomplete)	2012-03-14 14:51:58 +01:00
Nikolay Kasyanov	a8e25bc32c	Feature #37 (In Progress) Render Path Grid ... improved path grid point mesh (closer to vanilla MW)	2012-03-14 15:03:04 +04:00
Marc Zinnschlag	81abd97753	Merge remote branch 'scrawl/weather'	2012-03-14 09:40:22 +01:00
Nikolay Kasyanov	3a705baa29	Feature #37 (In Progress) Render Path Grid ... added simple pathgrid edges	2012-03-14 03:06:56 +04:00
scrawl	e8267c7363	adjusted fog distance, prevents objects suddenly popping up on cell load	2012-03-13 22:14:35 +01:00
scrawl	8421fd2670	fixed a visual issue with the stars	2012-03-13 19:57:33 +01:00
scrawl	118250171d	Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders ... Conflicts: apps/openmw/mwrender/objects.cpp	2012-03-13 17:31:10 +01:00
Nikolay Kasyanov	f292a5a7ca	Feature #37 (In Progress) Render Path Grid ... now using mwRoot instead of ogre's root, so no more messing with coordinates.	2012-03-12 02:37:07 +04:00
Nikolay Kasyanov	4659076129	Feature #37 (In Progress) Render Path Grid ... workaround for strange ESMStore bug	2012-03-10 20:45:55 +04:00
Nikolay Kasyanov	11f957a64d	Feature #37 (In Progress) Render Path Grid ... cubes for path grid points strange crash when trying to get path grids from Debugging	2012-03-10 20:03:00 +04: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
scrawl	8be661c802	Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next ... Conflicts: CMakeLists.txt	2012-03-07 13:29:59 +01:00
Marc Zinnschlag	3d1cbcd4e7	Merge remote branch 'jhooks/animperform'	2012-03-07 09:20:29 +01:00
Jason Hooks	39ff8d6a01	Compile error retry	2012-03-06 18:28:41 -05:00
Jason Hooks	9848b67174	Fixing errors	2012-03-05 17:46:29 -05:00
Marc Zinnschlag	25f5bdf7aa	Merge remote branch 'scrawl/weather'	2012-03-05 22:45:52 +01:00
scrawl	42a7375a0b	adjusted the batch region size, this was the cause for lights going on/off bug	2012-03-04 23:26:35 +01:00
scrawl	ff8f95fcca	fix batch lighting, removed the "bumping number of lights" hack	2012-03-04 23:18:40 +01:00
scrawl	8910b0d471	use shaders for all NIF materials. this has numerous advantages: ... - vertex colours are now working as they should (and they have a huge impact on the look) - the lighting is per pixel and looks a lot better - by using shaders, we can use more lights at a time (fixed function has max of 8)	2012-03-04 20:59:23 +01:00
Jacob Essex	eca91d17bb	Indentation tweaks and code cleanup	2012-03-04 11:46:33 +00:00
Jacob Essex	941a22034f	Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-03-04 11:30:37 +00:00
Jacob Essex	bcd2371baa	Code cleanup: Removed unneeded Ogre namespace	2012-03-04 11:21:47 +00:00
Jason Hooks	a81ecb5f65	Bug 210 fix	2012-03-03 18:26:11 -05:00
scrawl	a8939bc318	disabled the composite map, improves loading time a lot	2012-03-04 00:08:56 +01:00
scrawl	d74b78a302	very minor performance improvement	2012-03-03 12:26:08 +01:00
scrawl	b882c03adc	fixed terrain regions without vertexcolours, tweaked maxPixelError	2012-03-02 23:36:48 +01:00
Jacob Essex	3c934e3e44	Fixed a bug with fog not being applied to initially created terrain when starting in exteriors.	2012-03-02 22:31:17 +00:00
Jacob Essex	07a2e5a5be	Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values)	2012-03-02 21:20:12 +00:00
Jacob Essex	0f705eaca5	Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone.	2012-03-02 21:03:53 +00:00
Jacob Essex	3ecc427b96	Implemented slightly better texture splatting	2012-03-02 20:27:20 +00:00
scrawl	461ec9f3d6	fix regarding last commit	2012-03-02 18:50:55 +01:00
scrawl	0d4e3b8e75	remove alpha channel from colour map	2012-03-02 18:33:05 +01:00
scrawl	2bea4c4724	fixed the global colour map, apparently Ogre::Terrain was corrupting it ... somehow, now we are just bypassing Ogre::Terrain for the colour map and passing it directly to the material, which makes more sense performance-wise anyway	2012-03-02 15:29:12 +01:00
scrawl	04c141ddd5	Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-03-02 13:49:57 +01:00
Jacob Essex	8dd6e75ae1	Vertex colours now uses the Ogre::Terrain colour map	2012-03-02 11:56:51 +00:00
Marc Zinnschlag	be70d197e5	Merge branch 'next' ... Conflicts: .gitignore cmake/FindOGRE.cmake	2012-03-02 12:11:44 +01:00
scrawl	562cc7aa30	fixed 2 assertions that caused crashes	2012-03-01 15:03:43 +01:00
scrawl	fddf7b4dd0	terrain material now supports point lights	2012-03-01 14:35:39 +01:00
Jacob Essex	611f336d07	Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours	2012-02-29 23:38:21 +00:00
Jacob Essex	6924348696	Fixed some texture splatting issues with loading empty terrain cells	2012-02-29 23:33:54 +00:00
Jacob Essex	1d0ae9c8d1	Start of a basic implementation of fake vertex colours	2012-02-29 23:05:22 +00:00
scrawl	bac7f23604	Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next ... Conflicts: apps/openmw/mwrender/terrain.cpp	2012-02-29 19:38:34 +01:00
scrawl	e04ef38a5c	Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next	2012-02-29 11:01:03 +01:00
Marc Zinnschlag	3c5f8a4a23	void pointer workaround	2012-02-29 10:13:25 +01:00
scrawl	be5555956c	improved composite map, now adapts to the ambient/diffuse light	2012-02-28 22:04:44 +01:00
scrawl	f2c3616638	Merge branch 'next' into terrain_next ... Conflicts: CMakeLists.txt apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp cmake/FindOGRE.cmake	2012-02-28 21:49:45 +01:00
scrawl	c8aab3a562	fix sun angle	2012-02-28 20:28:46 +01:00
Jacob Essex	13e3955916	Merge branch 'terrain' of github.com:Yacoby/openmw into terrain	2012-02-28 16:22:19 +00:00
scrawl	f55905609f	fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system	2012-02-28 17:18:07 +01:00
scrawl	abcf25ead2	terrain shader performance improvement (tested on opengl only, please test on directx)	2012-02-28 16:41:05 +01:00
scrawl	5b5e8ba4fd	fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times)	2012-02-28 16:20:57 +01:00
scrawl	b3db4f1c27	slightly improved moon fading	2012-02-28 15:20:46 +01:00
scrawl	dbd2d390fd	terrain material fixes: ... - disable normal and parallax mapping - disable specular mapping and specular	2012-02-27 21:12:16 +01:00
scrawl	f34b2c73c5	committing the terrain material generator from ogre 1.7.4, it seems to ... be almost impossible to make a derived class of TerrainMaterialGeneratorA because of the many classes it contains and the inter-relationships between them; just adding the whole source makes it a lot easier to modify if we decide to update this source from OGRE upstream at any point (which seems unlikely), we can take the diff from this commit on to see the changes we did to the material generator	2012-02-27 19:44:52 +01:00
Jason Hooks	36e9322830	a few changes2	2012-02-26 21:43:04 -05:00
Jason Hooks	8d7a5f469b	a few changes	2012-02-26 21:27:54 -05:00
Marc Zinnschlag	053a2996d2	fix for non-standard erase function	2012-02-26 23:31:16 +01:00
Alexander "Ace" Olofsson	be8690e333	Fix for debug crash on windows	2012-02-26 22:45:17 +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	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	9560904d8a	visibility fixes	2012-02-24 18:47:09 +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
Jason Hooks	08f3ecf935	Slightly better performance on animation2	2012-02-24 01:30:17 -05:00
Jason Hooks	fb51b281b2	Slightly better performance on animation	2012-02-24 01:16:30 -05: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
scrawl	41a8b22ebd	implemented weather transitions (currently only blends the clouds)	2012-02-22 19:17:37 +01:00
scrawl	b2de9e8f45	allow setting the clouds opacity	2012-02-21 22:11:41 +01:00
scrawl	83753dc384	tweaked the cloud animation speed	2012-02-21 17:42:43 +01:00
scrawl	91ffacbb6d	added moon phases	2012-02-21 17:38:15 +01:00
scrawl	10ca67c0a5	fixed the sky elements positioning delay (nodes are now children of the camera node)	2012-02-21 16:49:28 +01:00
scrawl	2d8b0a4ac0	merged the sky manager implementation with its interface	2012-02-21 16:15:38 +01:00
scrawl	694a537b57	- removed caelum sources, resources, build scripts	2012-02-21 00:14:20 +01:00
scrawl	04d7db2860	moved the SkyManager implementation to a new source file (sky_impl.cpp) for convenience	2012-02-20 23:53:17 +01:00
scrawl	6aac3d4b77	- removed caelum (we can get it from the git history, if needed) ... - added code for moon rendering (they are not visible by default)	2012-02-20 23:41:22 +01:00
scrawl	090c0586a0	leak fix	2012-02-20 22:20:34 +01:00
scrawl	6d37f53fa2	- abstracted the sun creation code into a CelestialBody class to be reused for the moons ... - fixed render queue problem	2012-02-20 22:15:13 +01:00
scrawl	ad0f9f4bcf	fixed the sun rendering (rendered without depth check)	2012-02-20 21:32:12 +01:00
scrawl	3b3218d907	fixed 3 gcc warnings in sky.cpp	2012-02-20 18:45:04 +01:00
scrawl	8b5da06fce	Merge branch 'next' into weather ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-02-20 18:33:13 +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	7eae24bb45	some fixes	2012-02-20 14:02:24 +01:00
scrawl	c884f70a61	added sun rendering (unfinished)	2012-02-20 00:52:44 +01:00
Jason Hooks	7e1e746201	More changes	2012-02-19 17:59:50 -05:00
scrawl	705d85e7d1	Merge branch 'next' into weather ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-02-19 23:27:26 +01:00
scrawl	60856b46e6	moved the renderer update call from OMW::Engine to RenderingManager	2012-02-19 23:22:29 +01:00
scrawl	1d9f0f4813	added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)	2012-02-19 23:09:14 +01:00
Jason Hooks	38a0d1d1c5	Merging in master	2012-02-19 15:39:12 -05:00
Jason Hooks	e58f2f5363	Eliminating unnecessary data from skeletons and shape saving	2012-02-19 02:01:15 -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
Lukasz Gromanowski	8829d46bda	Clean up compilation warnings. ... Clan up compilation warnings like "variable ... set but not used" introduced in some older and recent commits. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 15:45:08 +01:00
Jacob Essex	286701e3a5	Removed the flawed shading, updated textures, removed the need for a unused base texture	2012-02-11 20:54:29 +00:00
Marc Zinnschlag	bb7730a708	Merge branch 'lightfix'	2012-02-10 14:55:52 +01:00
gugus	597e670eef	corrected the light problem	2012-02-10 14:51:49 +01:00
Jacob Essex	9cc3af34e5	Removed composite maps, fixes to texture sizes and unloading	2012-02-07 12:41:08 +00:00
Marc Zinnschlag	784c6fe0ff	some cleanup	2012-02-06 10:41:13 +01:00
Marc Zinnschlag	e1600d9a2a	fixed movable object cleanup for ordinary objects	2012-02-06 10:29:18 +01:00
Cris Mihalache	daa8fb15ce	Removed all physics-related code from Engine	2012-01-29 20:51:20 +02:00
Jason Hooks	1da519a914	Some cleanup	2012-01-29 00:42:55 -05:00
Jason Hooks	6de0847b86	Slightly better performance on animation	2012-01-25 01:21:30 -05:00
Yacoby	46b8d3a83e	Merge pull request #1 from corristo/terrain	2012-01-24 05:41:24 -08:00
Jacob Essex	5e3e6f9165	Fixed some minor bugs, a cells terrain can now be rendered as 4 Ogre::Terrain objects, possibly giving a speed increase	2012-01-24 13:29:31 +00:00
Marc Zinnschlag	4b6cd582a7	removed some redundant (and misplaced) functions	2012-01-24 10:45:40 +01:00
Jacob Essex	cd0df082df	Textures are now blended between cells and the texture blending functions are now more abstract	2012-01-23 17:19:54 +00:00
Marc Zinnschlag	16bc374921	animation updates were hooked up to the wrong update function	2012-01-23 14:33:06 +01:00
Jason Hooks	3a1d7b7864	Huge Water	2012-01-22 19:24:35 -05: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
Nikolay Kasyanov	1b1ce48502	Now terrain manager donesn't try to load terrain for interiors	2012-01-22 20:20:12 +04:00
Jason Hooks	a0838369b2	Very basic exterior water	2012-01-21 20:05:08 -05:00
Jacob Essex	637302fc87	Added blended textures to the terrain	2012-01-21 17:59:12 +00:00
Jacob Essex	18108c02a7	Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered	2012-01-21 16:59:08 +00: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
Jason Hooks	bcf3e45ff6	Proper buffer designation	2012-01-18 22:00:03 -05:00
Marc Zinnschlag	9b910dda94	clean up	2012-01-17 15:10:53 +01:00
Jason Hooks	8798f7dd40	Bringing in some of Azathoth's work	2012-01-14 18:34:14 -05:00
Jason Hooks	e35aee0f89	Disjointed free part fix	2012-01-13 02:19:28 -05:00
Jason Hooks	41769f202c	Huge Performance Increase	2012-01-13 00:48:52 -05:00
Jason Hooks	d1793bc4bd	Animation files in the correct directory	2012-01-12 20:09:55 -05:00
Jason Hooks	0712bba49b	Changing a few things around with handleshapes	2012-01-12 16:03:07 -05:00
Jason Hooks	5e1cc07ee8	Fixed ancestor ghost crash	2012-01-10 02:00:04 -05:00
Jason Hooks	7fde576dd9	actor physics again	2012-01-07 23:21:19 -05:00
Jason Hooks	a615369189	Warning and different physics	2012-01-06 22:52:15 -05:00
Jason Hooks	295eb27c2d	Better Text Indices; Better file output	2012-01-06 18:23:41 -05:00
Jason Hooks	859ac1153e	Basic Text Indices Working	2012-01-06 02:27:10 -05:00
Jason Hooks	0715f9b6ab	Preparing to use text indices	2012-01-06 00:55:02 -05:00
Jason Hooks	595d0b1192	Cleanup; warnings	2012-01-05 21:45:17 -05:00
Jason Hooks	c2fa82326d	Animation with physics attempt	2012-01-04 23:48:25 -05:00
Jason Hooks	45c57721ff	Turning off hardware skinning2	2012-01-04 20:30:06 -05:00
Jason Hooks	1d2e77d947	Turning off hardware skinning	2012-01-04 19:47:06 -05:00
Jason Hooks	762727308e	Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)	2012-01-02 23:06:10 -05:00
Jason Hooks	a4c6d948d4	Disabling normal updates	2012-01-01 20:51:26 -05:00
Jason Hooks	289b8f667e	Various npc heights	2012-01-01 17:28:46 -05:00
Jason Hooks	f7d26b2695	Scaling for wood elves	2012-01-01 00:05:21 -05:00
Jason Hooks	497d994525	female argonian fix	2011-12-31 02:41:26 -05:00
Jason Hooks	42e7ff9b13	Introducing loops; SkipAnim; Skeleton reset bug fixed	2011-12-28 21:52:05 -05:00
Jason Hooks	c8cca06b40	unlocking change and stop change	2011-12-28 17:34:47 -05:00
Jason Hooks	8c3127367a	Npc Optimization	2011-12-27 22:35:22 -05:00
Jason Hooks	cef2f5e927	Trying to get code to conform with older c++	2011-12-27 19:19:45 -05:00
Jason Hooks	c399f4f210	Fixing a few things	2011-12-27 17:12:47 -05:00
Jason Hooks	1a90f4241b	Npc Animation Working	2011-12-27 00:25:52 -05:00
Jason Hooks	a6b88b48ec	A different way	2011-12-27 00:20:14 -05:00
Jason Hooks	653d999ac4	Animation creatures	2011-12-26 19:23:46 -05:00
Jason Hooks	88c427543b	Deleting animations; Empty Functions/Planning	2011-12-25 22:37:26 -05:00
Jason Hooks	7eee54bcd7	More physics and managing of Animation objects	2011-12-25 01:52:57 -05:00
Jason Hooks	1b835d6702	Cell changing fixes	2011-12-24 21:53:12 -05:00
Jason Hooks	7cf3fc8991	handleAnimationTransforms	2011-12-18 03:18:26 -05:00
Jason Hooks	6d10c76b06	Unique Identifiers for Creatures and NPC Free Parts	2011-12-17 01:29:08 -05:00
Jason Hooks	93a4060346	Switching handleShapes to use sets instead of maps	2011-12-15 00:41:44 -05:00
Jason Hooks	d51dfebde1	NPCs fully rendered	2011-12-15 00:33:10 -05:00
Jason Hooks	47112ad7f9	Changing a lot of things	2011-12-13 23:49:03 -05:00
Jason Hooks	509009e5c1	Putting the actors in a list	2011-12-11 23:42:39 -05:00
Jason Hooks	0902a3db89	Filled out NpcAnimation and CreatureAnimation classes	2011-12-11 22:40:00 -05:00
Jason Hooks	39338f4be1	NPC bounded parts	2011-12-09 15:20:35 -05:00
Jason Hooks	5c48d8fc1e	more stuff	2011-12-09 03:02:09 -05:00
Jason Hooks	ee98a2af1a	Empty npcs	2011-12-09 00:08:30 -05:00
Jason Hooks	7bd911b401	Problems with handles	2011-11-24 23:13:34 -05:00
Jason Hooks	16ff2a7a1b	Changing to Actors;NPCAnimation;CreatureAnimation	2011-11-24 01:48:54 -05:00
Jason Hooks	0d3338f867	Some naming changes	2011-11-22 02:39:28 -05:00
Marc Zinnschlag	0f4adc39b3	added animation-related script instructions	2011-11-21 14:08:44 +01:00
Marc Zinnschlag	51d5c7cd59	Merge remote branch 'jhooks/mwrender' into mwrender ... Conflicts: apps/openmw/engine.cpp - fixed code that did not compile - removed tons of tabs - more clean up	2011-11-21 12:52:28 +01:00
Jason Hooks	7385948056	Yet another crash fix	2011-11-19 20:22:56 -05:00
Jason Hooks	7319f7a8c6	Many bugs fixed related to changing cells	2011-11-19 01:01:19 -05:00
Jason Hooks	4dc59dfbdd	Scenenode flip	2011-11-17 17:10:27 -05:00
Jason Hooks	a0947cd432	Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed	2011-11-16 21:15:49 -05:00
Jason Hooks	9b94074472	addObject	2011-11-16 16:22:13 -05:00
Jason Hooks	db57f0a1a5	more corrections	2011-11-13 18:19:29 -05:00
Jason Hooks	bc58ef28cd	Made corrections	2011-11-12 15:58:22 -05:00
Jason Hooks	0b3bb2719f	Fixing some errors	2011-11-12 00:19:22 -05:00
Jason Hooks	62d8d1add2	more recommended changes	2011-11-11 14:37:42 -05:00
Jason Hooks	f4e7bd6dfd	Made some recommended changes	2011-11-11 00:20:53 -05:00
Jason Hooks	a7652bcb0c	Yacoby's changes on Objects	2011-11-09 13:53:29 -05:00
Jason Hooks	c25b49d2b6	refdata change	2011-11-08 22:59:39 -05:00
Jason Hooks	469086747e	Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed	2011-11-07 23:35:39 -05:00
Jacob Essex	9aac625000	Changes to move the mutable ESM::Position data to RefData	2011-11-08 00:08:00 +00:00
Jason Hooks	c11b3a57c1	Made buildStaticGeometry function	2011-11-05 14:57:33 -04:00
Jason Hooks	8edcd4d15b	removing tabs	2011-11-04 21:57:39 -04:00
Jason Hooks	6c80e75deb	More Objects functionality	2011-11-04 21:48:52 -04:00
Jason Hooks	e041006063	Adding light and fog functions	2011-11-03 23:47:15 -04:00
Jason Hooks	edf85b26f9	Insert Mesh, Insert Light, insertBegin improved	2011-11-03 19:40:37 -04:00
Jason Hooks	9ac627c931	Commenting out assert	2011-11-02 22:45:58 -04:00
Jason Hooks	d49a02abe5	new insertBegin()	2011-11-02 22:41:48 -04:00
Jason Hooks	c2181d2091	Dealing with scenenodes	2011-11-02 00:13:33 -04:00
Jason Hooks	3d43a4cd33	Made recommended changes	2011-11-01 13:46:57 -04:00
Jason Hooks	f1bc5b0ab6	Objects started, RenderingInterface	2011-10-31 23:59:16 -04:00
Jason Hooks	3761271c59	Empty creature, objects, npc	2011-10-31 00:04:06 -04:00
Jason Hooks	1083db5582	Hiding debugging	2011-10-30 00:25:29 -04:00
Jason Hooks	c3a492bf74	Debugging file renamed	2011-10-25 14:06:44 -04:00
Jason Hooks	d4f63443e6	Hiding the rendering manager; crash eliminated	2011-10-24 22:11:36 -04:00
Jason Hooks	6efc61b9df	Removal of MWScene; Object listing fixed	2011-10-24 13:42:36 -04:00
Jason Hooks	30ba9b74da	Simple Debugging class	2011-10-22 00:15:15 -04:00
Jason Hooks	47593f3641	Removing old files	2011-10-20 19:35:49 -04:00
Jason Hooks	fcf404d27b	GetFacedHandle in Physics. RenderingManager constructor code added	2011-10-20 18:15:30 -04:00
Jason Hooks	3315de8b4a	Naming convention change	2011-10-20 15:02:19 -04:00
Jason Hooks	d0f922ec5d	Moved SkyManager creation	2011-10-20 13:55:56 -04:00
Jason Hooks	0992f1e903	Applying Gus's Windows fix	2011-10-18 21:02:42 -04:00
Jason Hooks	9126bb27b6	empty functions	2011-10-18 19:50:19 -04:00
Marc Zinnschlag	40853e292f	various bits of clean up	2011-09-04 09:48:50 +02:00
Marc Zinnschlag	0a2979caf2	more cleanup	2011-08-27 10:45:09 +02:00
Marc Zinnschlag	f8029aaa9e	more cleanup; fixes for player handling during physics (unrelated to the actual refactoring bugs); fixed minor bug in character initialisation	2011-08-27 10:30:38 +02:00
Sebastian Wick	29b8a5374b	get rid of the warnings	2011-08-19 17:03:47 +02:00
Sebastian Wick	b7dbfb849a	moved skyManager into RenderingManager	2011-08-08 21:11:30 +02:00
Sebastian Wick	54724d7e7f	start RenderingManager	2011-08-07 16:40:01 +02:00
Sebastian Wick	4b846a54f1	PhysicsSystem	2011-08-01 15:55:36 +02:00
Sebastian Wick	6baf904f0f	mStore fixed; glibc detected in shutdown process	2011-08-01 04:53:06 +02:00
Sebastian Wick	e7057bed29	moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals	2011-07-31 17:07:11 +02:00
Marc Zinnschlag	8446619ac4	Merge branch 'components_namespaces' into next ... Conflicts: apps/openmw/mwrender/interior.cpp components/bsa/bsa_archive.cpp	2011-06-19 20:22:29 +02:00
Lukasz Gromanowski	e9ff9a446b	Mantis: #18 - Move components from global namespace into their own namespace. ... Moving classes from components/nifogre into NifOgre namespace. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2011-06-19 19:14:14 +02:00
Marc Zinnschlag	bc92b7b1fa	Merge branch 'directories' into next ... Conflicts: components/files/multidircollection.hpp components/nifogre/ogre_nif_loader.hpp	2011-06-15 22:40:24 +02:00
Marc Zinnschlag	0f2df4e2b8	more cleanup	2011-06-15 22:33:31 +02:00
Marc Zinnschlag	7d2956329a	some cleanup	2011-05-30 14:27:04 +02:00
Marc Zinnschlag	bed45a936e	fixed cell change crash	2011-05-30 14:21:55 +02:00
Jason Hooks	51b74c2f05	starting	2011-05-23 19:01:36 -04:00
Jason Hooks	b945ce61a5	Merge remote branch 'upstream/master'	2011-05-23 15:01:47 -04:00
gugus	c7fb27e801	Clean up wasn't done properly when deleting a Cell.	2011-05-23 20:22:12 +02:00
gugus	faaa08d6d0	removed this stupide methode to generate unique ID.	2011-05-23 19:47:27 +02:00
gugus	4546ca3863	static Objects goes inside the static geometry	2011-05-23 19:39:10 +02:00
gugus	cd79df1d8b	Merge branch 'static' of git@github.com:zinnschlag/openmw.git into optimisation ... Conflicts: apps/openmw/mwrender/exterior.cpp	2011-05-23 19:27:40 +02:00
Marc Zinnschlag	7192bc4f89	added static flag	2011-05-23 19:12:28 +02:00
gugus	41d283a3aa	very experimental: static geometry.	2011-05-23 15:00:01 +02:00
Marc Zinnschlag	f52e6bd5ef	made toggle-type script instructions more verbose	2011-04-26 21:38:21 +02:00
Jason Hooks	92509d3b70	Trying to animate creatures	2011-04-13 20:35:44 -04:00
Jan-Peter Nilsson	a94de76801	Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)	2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson	2e2d490c78	Remove unused variable (compiler warning)	2011-04-03 13:20:18 +02:00
Marc Zinnschlag	c571148bef	Merge branch 'collision'	2011-03-23 22:57:56 +01:00
gugus	3ad2b9986e	fix actors not beeing deleted. Need the latest OEngine.	2011-03-23 19:16:51 +01:00
Marc Zinnschlag	7144657cfc	Merge branch 'script'	2011-03-23 17:07:05 +01:00
gugus	773b7635a4	decrease the range of the raycast, and modifie the gravity/speed of the player.	2011-03-22 21:30:46 +01:00
Marc Zinnschlag	0866e4d4fe	fix: NPCs were not added to physics system	2011-03-22 20:31:33 +01:00
gugus	7a28c9f3aa	fix the door bug	2011-03-22 20:15:19 +01:00
gugus	0cc94c81d4	Merge remote branch 'upstream/collision' into collision	2011-03-22 14:14:56 +01:00
Marc Zinnschlag	7b5d24c853	fixed a bug in phyiscs update code	2011-03-22 13:48:31 +01:00
gugus	3dddcbd958	fix a camera problem and increase player speed	2011-03-22 13:01:23 +01:00
Marc Zinnschlag	91ea36509d	gus' fly mode fix; manually applied	2011-03-21 14:08:56 +01:00
Marc Zinnschlag	8788dcebcf	Merge remote branch 'gus/collisions' into collision	2011-03-20 22:38:42 +01:00
gugus	8aeefd2af8	fix the fall bug when using ToggleCollision. Require lastest change with OEngine.	2011-03-20 21:52:31 +01:00
Marc Zinnschlag	647e88003e	build and activation fix	2011-03-19 19:54:37 +01:00
gugus	21c224af25	add gravity change to the ToggleCollisionMode function.	2011-03-18 13:32:42 +01:00
gugus	102f1ee5dc	filled the toggleCollisionMode function. It needs the lastest change in OEngine	2011-03-18 13:23:26 +01:00
gugus	98b27813b7	change raycasting	2011-03-17 10:54:38 +01:00
Marc Zinnschlag	72a84356e2	added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)	2011-03-16 09:09:45 +01:00
Marc Zinnschlag	eb93ef68f1	fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class	2011-03-13 22:33:55 +01:00
gugus	00de2e6d98	correct some stuff with the physic implementation	2011-03-09 19:09:11 +01:00
gugus	40193253b0	fix some time bug	2011-03-09 18:29:57 +01:00
Marc Zinnschlag	1e9dc4b435	de-Windownizing and some build-fixes	2011-02-26 16:37:47 +01:00
gugus	33f22fd68b	fix camera bug	2011-02-23 12:28:13 +01:00
gugus	903f39cb50	change the rayCasting system. It use bullet now. NOT TESTED!	2011-02-22 20:52:05 +01:00
gugus	d3c1640723	add physic support	2011-02-22 14:11:53 +01:00
gugus	84dce2eb36	add physic and solve a problem with window.h macro min/max	2011-02-19 19:18:03 +01:00
gugus	746cf3a45a	add physic.	2011-02-19 11:36:57 +01:00
Marc Zinnschlag	9807e7dadc	simplified actor-related physics interface to mwscene	2011-02-11 09:24:59 +01:00