8105 commits

Author	SHA1	Message	Date
scrawl	cf14d1748c	Use the extended animation priority for Hit animations	2015-07-15 16:33:10 +02:00
scrawl	50db6ed396	Use the extended animation priority for weapon animations	2015-07-15 14:40:36 +02:00
scrawl	e93a578f23	Extend the animation priority system to one priority value per bone group / distinct blend mask	2015-07-15 14:18:31 +02:00
scrawl	335ef97cf5	Rename Animation::Group to Animation::BlendMask ... The old naming is problematic, because the term group was being used for another feature (text key groups) already.	2015-07-15 13:49:16 +02:00
scrawl	de6dc21552	Create hardware cursors in advance (Fixes #2660)	2015-07-13 23:36:25 +02:00
scrawl	dca4704b4b	Print exceptions in CharacterCreation::spawnDialog	2015-07-13 18:40:05 +02:00
scrawl	f1b52c964a	Select the current resolution in resolution list on game start (Fixes #2768)	2015-07-13 18:00:41 +02:00
Marc Zinnschlag	d22f8703e5	Merge remote-tracking branch 'dteviot/refactoringAiWander'	2015-07-13 09:09:01 +02:00
dteviot	ddeabcdfbe	Removed unused field that was giving compiler warning.	2015-07-12 17:15:41 +12:00
dteviot	e294cd95cd	extracted function playIdleDialogueRandomly()	2015-07-12 17:15:14 +12:00
dteviot	22059d68f6	Remove duplicated code.	2015-07-12 17:14:48 +12:00
dteviot	0b089a5564	extracted function evadeObstacles()	2015-07-12 16:38:36 +12:00
dteviot	1ef78b1e56	extracted playGreetingIfPlayerGetsTooClose()	2015-07-12 16:37:31 +12:00
dteviot	df421fce92	extracted function setPathToAnAllowedNode()	2015-07-12 16:35:15 +12:00
dteviot	b508846a64	Renamed mStoredAvailableNodes to mPopulateAvailableNodes. ... Don't call getAllowedNodes() needlessly.	2015-07-12 16:32:48 +12:00
Marc Zinnschlag	dacb93c57f	Merge remote-tracking branch 'scrawl/coverity_scan'	2015-07-11 11:53:43 +02:00
scrawl	24ae1d5ace	Fix some issues found by coverity	2015-07-11 03:34:08 +02:00
scrawl	667c80fb2a	Add brackets around a correct expression to fix coverity warning	2015-07-11 03:34:08 +02:00
scrawl	ebdd5dc993	Fix code that I forgot to uncomment (thanks coverity)	2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson	12f413ba9b	Don't instantiate specialized templates ... This fixes the VS2012 build issue	2015-07-10 20:21:55 +02:00
Marc Zinnschlag	ba9a9d16bb	Merge remote-tracking branch 'scrawl/master'	2015-07-10 09:06:04 +02:00
Marc Zinnschlag	08d2b196bd	Merge remote-tracking branch 'ace/explicit-instantiation'	2015-07-10 08:58:53 +02:00
scrawl	f12619b86a	Implement fStromWindSpeed (Fixes #2764)	2015-07-10 02:34:00 +02:00
Alexander "Ace" Olofsson	b3b55a5842	Explicitly instantiate MWWorld::Store	2015-07-09 19:22:04 +02:00
Alexander "Ace" Olofsson	b1cc74dd9a	Explicity instantiate MWMechanics::Stat	2015-07-09 14:41:37 +02:00
dteviot	f1774ee7c3	Fixed compile failing on OSX and Linux.	2015-07-08 19:34:33 +12:00
dteviot	52cf8541f5	End point tolerance restored to 64 units. ... Corrected problem pointed out by Scrawl. Destination needs tolerance of 64 to avoid overcrowding.	2015-07-08 18:41:03 +12:00
Alexander "Ace" Olofsson	3655ef16af	Explicitly instantiate ESM::StatState	2015-07-07 19:19:37 +02:00
dteviot	40a925ad37	Merge branch 'Bug1317MakeExtraWaypoints' into Bug2726	2015-07-07 18:16:15 +12:00
Marc Zinnschlag	e89614a35d	Merge remote-tracking branch 'origin/master'	2015-07-06 13:10:04 +02:00
Marc Zinnschlag	88f1220a77	Merge remote-tracking branch 'dteviot/Bug2726'	2015-07-06 13:07:40 +02:00
scrawl	49c07de773	Merge pull request #643 from ace13/win-build-fix ... Fix build error and a pair of warnings	2015-07-05 22:24:24 +02:00
Alexander "Ace" Olofsson	aaaee74a4d	Fix the comments	2015-07-05 21:56:04 +02:00
scrawl	531bca1273	Add a threshold for changing aicombat targets (Fixes #2755)	2015-07-05 18:09:13 +02:00
Marc Zinnschlag	432384d280	Merge remote-tracking branch 'scrawl/aicombat'	2015-07-05 14:47:20 +02:00
dteviot	1239667cb4	AiWander uses points between PathGrid points (Fixes #1317) ... When there is only on PathGrid point within a NPC's wander distance, expand possible wander destinations by using positions between PathGrid points.	2015-07-05 18:21:35 +12:00
dteviot	eb2aa965b9	Extracted function SetCurrentNodeToClosestAllowedNode()	2015-07-05 18:17:18 +12:00
dteviot	76f20b8b20	fix 'WIN32_LEAN_AND_MEAN' macro redefinition warning.	2015-07-05 18:10:02 +12:00
dteviot	0095737c40	Use correct type of variable. Remove unnecessary casts.	2015-07-05 18:09:14 +12:00
dteviot	f942db2b27	Simplified code.	2015-07-05 18:08:09 +12:00
dteviot	9a02a85a24	Pulled duplicate code into function.	2015-07-05 18:07:14 +12:00
scrawl	c90841d649	Fix head tracking for NPCs	2015-07-04 21:00:01 +02:00
dteviot	fae93e3d82	Bugfix: was not resetting mStuckCount.	2015-07-04 19:00:27 +12:00
dteviot	46a654286b	Remove fix for #1317 ... Expanding the AiWander distance for path grid nodes causes bigger problems than it solved.	2015-07-04 18:57:56 +12:00
dteviot	164994f3d3	Made PathFinder::buildPath() private. ... Now all paths are built by calling PathFinder::buildSyncedPath(). Also removed useless comment.	2015-07-04 18:47:26 +12:00
scrawl	6bcea21e14	Use fCombatDelayCreature, fCombatDelayNpc for random delays between aicombat attacks (Bug #1876)	2015-07-04 05:19:05 +02:00
scrawl	a7bd050928	Accurate attack timings in AiCombat	2015-07-03 05:58:12 +02:00
scrawl	741e5db862	Fix for non-bipedal creatures that use weapons, e.g. rieklings	2015-07-03 05:37:18 +02:00
scrawl	82740c1645	Remove completely broken code	2015-07-03 02:29:42 +02:00
scrawl	d07b176b36	Take into account hit recovery, knockdown and other animations for AiCombat attack timing	2015-07-03 02:18:35 +02:00
scrawl	520a832a9a	Remove an already resolved todo comment	2015-07-02 22:24:23 +02:00
scrawl	6724585777	Light magic effect ... Notable change compared to the old (Ogre) effect: uses the ambient instead of diffuse term (Fixes #2364)	2015-07-02 20:46:34 +02:00
scrawl	bf9c62fa42	Fix for some coverity scan defects	2015-07-02 20:46:34 +02:00
scrawl	dcb8fbc69c	Accurate handling of fog depth/density (Fixes #2752)	2015-07-02 20:46:34 +02:00
scrawl	6691891bee	Include cleanup	2015-07-02 19:16:44 +02:00
scrawl	a1432b0255	Move attackingOrSpell flag to the CharacterController	2015-07-02 19:14:28 +02:00
scrawl	519fb9482a	Minor cleanup	2015-07-02 18:45:11 +02:00
Alexander "Ace" Olofsson	5d24091364	Fix build error and a pair of warnings ... The error was about casting between osg::Callback* and osg::NodeCallback* The warnings are both about virtual classes with non-virtual destructors	2015-07-01 15:06:38 +02:00
scrawl	20d03c7e39	Refuse loading save games of unknown format	2015-06-30 17:41:44 +02:00
scrawl	a081d402c5	Use the format field instead of version field	2015-06-30 17:26:33 +02:00
scrawl	4637750601	Savegame loading optimization	2015-06-30 16:47:41 +02:00
scrawl	4eaaa5e855	Increment save file version and mark it as used, will be used in next commit	2015-06-30 16:47:40 +02:00
scrawl	ca21e9ecb1	Fix magic hit VFX showing when casting on a static object	2015-06-30 03:14:49 +02:00
scrawl	4b2391c60f	Ignore effect meshes in getScreenBounds	2015-06-30 02:51:32 +02:00
scrawl	d5a47cfafe	Include cleanup	2015-06-30 01:41:03 +02:00
scrawl	017c9f7ac9	Fading for weather particle effects	2015-06-29 20:19:46 +02:00
scrawl	cd2e6d4436	Move the __STDC_CONSTANT_MACROS define to cmakelists	2015-06-28 05:53:03 +02:00
scrawl	1956e2c988	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt	2015-06-28 00:38:39 +02:00
scrawl	59db9664ba	Pass the CharacterController to AiPackage::execute	2015-06-26 17:47:04 +02:00
scrawl	a44be148d8	Fix door collisions	2015-06-26 06:40:28 +02:00
scrawl	882e359008	Move attackStrength to the CharacterController, where it should have been to begin with ... Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.	2015-06-26 05:15:07 +02:00
scrawl	beb1086260	Fix attackStrength being unset for creatures with no weapons	2015-06-26 04:21:10 +02:00
scrawl	5bc6513e2d	Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime	2015-06-26 02:32:41 +02:00
scrawl	4ef6aa6b7f	Fix weather particles disappearing	2015-06-26 02:30:39 +02:00
scrawl	ea0339d471	Make the string argument to BetaComment optional	2015-06-25 21:45:59 +02:00
scrawl	8a3889a81e	Rain fading	2015-06-25 17:38:12 +02:00
scrawl	3a21f05f6e	Rain effect	2015-06-25 17:23:01 +02:00
scrawl	6f34a0501a	Attempting to make a potion with no effects removes the ingredients (Fixes #2722)	2015-06-24 05:17:45 +02:00
scrawl	33a3dabc31	An alchemy effect listed more than once in the same ingredient should not automatically create a potion of that effect (Bug #2722)	2015-06-24 05:17:45 +02:00
scrawl	d7695f2560	Remove unused NpcAnimation visibilityFlags	2015-06-22 21:14:44 +02:00
scrawl	d5b73f2a55	Move HeadAnimationTime to the implementation file	2015-06-22 21:12:15 +02:00
scrawl	24bfb44b13	Move head tracking from NpcAnimation to Animation (Bug #2720)	2015-06-22 21:06:27 +02:00
scrawl	a5670b5133	Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/main.cpp apps/openmw/mwworld/player.hpp	2015-06-22 20:09:02 +02:00
Marc Zinnschlag	83961e9109	Merge remote-tracking branch 'dteviot/FixRunningInCircles'	2015-06-22 15:20:58 +02:00
scrawl	2ce269c0fc	Werewolf stats compatibility with old save files	2015-06-21 18:45:49 +02:00
scrawl	d6a7255391	Loading/saving for player's original skills/attributes (prior to becoming a werewolf)	2015-06-21 17:36:49 +02:00
scrawl	44582fe3b3	Don't use separate werewolf skills/attributes for non-player werewolves ... Still need to deal with save files.	2015-06-21 17:28:18 +02:00
dteviot	c65e7a31e7	Aquatic creatures no longer try to get onto land. ... AiWander for aquatic creatures no longer uses path grid points as they're usually on land.	2015-06-21 16:23:40 +12:00
scrawl	ad6764fa6a	Fix bug #2715	2015-06-20 17:08:46 +02:00
scrawl	efad4efe19	Star fading (Bug #2693)	2015-06-19 20:55:04 +02:00
scrawl	74260a9a44	Tweak moon sizes	2015-06-19 20:30:04 +02:00
scrawl	f5c50aa581	Disable FreezeOnCull for effect particles	2015-06-19 18:38:44 +02:00
scrawl	1ed4e33815	Fading for mooncircle texture	2015-06-19 18:19:52 +02:00
scrawl	38d90f47a6	Moon fading fix (Bug #2713)	2015-06-19 18:15:23 +02:00
scrawl	2b53e5d965	Fix for explosion effects playing when the game is paused	2015-06-19 03:32:48 +02:00
scrawl	e0dfc1425e	Correct moon blending	2015-06-19 02:51:01 +02:00
scrawl	0c4ebee6b3	Cloud opacity & cross-fading	2015-06-19 01:03:12 +02:00
scrawl	fb94395628	Fix atmosphere lighting	2015-06-18 23:15:13 +02:00
scrawl	c719b7038e	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-18 15:00:21 +02:00
scrawl	04010b8a1a	Set OnPcHitMe even for missed hits	2015-06-18 15:00:04 +02:00