mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:19:54 +00:00
Code Issues Releases Wiki Activity
16730 commits 38 branches 54 tags 122 MiB
Commit graph

1935 commits

Author SHA1 Message Date
Marc Zinnschlag
a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 2015-08-23 12:11:30 +02:00
Marc Zinnschlag
50ec8b10f5 Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-22 10:37:43 +02:00
dteviot
5dd0ad6841 Fixed rest of travis errors. 2015-08-21 22:41:31 +12:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
dteviot
85bc41dedb replaced FLT_MAX with numeric_limits. 2015-08-21 19:34:28 +12:00
dteviot
3b231b85bb removed incorrect optimization. 
Now it fixes #2871
 2015-08-21 06:55:54 +12:00
Marc Zinnschlag
08325d14ca Merge remote-tracking branch 'dteviot/Bug2871' 2015-08-20 20:42:35 +02:00
Marc Zinnschlag
5cb0353b5c Merge remote-tracking branch 'jeffreyhaines/npcsdontscream' 2015-08-20 20:28:36 +02:00
dteviot
c0d3804b4f Correctly handle disjoint pathgrid (Fixes #2871) 
Bugfix:
When
1. Cell has multiple subgrids  (i.e. path grid is disjoint)
2. Distance between destination and pathgrid point 0 is less than distance to points of subgrid closest to start point
Then getClosestReachablePoint() returns pathgrid point 0 as the end point.
This is invalid, this end point cannot be reached from the start point.
 2015-08-20 21:50:58 +12:00
dteviot
0ee7407101 extracted common sub-expressions. 2015-08-20 18:17:02 +12:00
dteviot
ff5ef7055e extracted function CreatureStats::isParalyzed() 2015-08-20 18:12:37 +12:00
Marc Zinnschlag
9918b57341 Merge remote-tracking branch 'origin/master' 2015-08-19 16:03:01 +02:00
Jeffrey Haines
e1baf1ea48 NPCs scream when they die 2015-08-19 09:51:04 -04:00
scrawl
232dfdc07e Make an error message slightly more helpful 2015-08-19 01:24:54 +02:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
dca08b0b42 Remove a firing assert (Fixes #2871) 2015-08-18 14:51:32 +02:00
Marc Zinnschlag
3992125b61 Merge remote-tracking branch 'scrawl/master' 2015-08-17 14:05:51 +02:00
Marc Zinnschlag
dc72b24f4e Merge remote-tracking branch 'dteviot/PathfindingRefactorDraft' 2015-08-17 14:04:56 +02:00
Jordan Ayers
be7bd9529d Classes shouldn't use MWBase::Environment to access their own members. 2015-08-16 16:56:44 -05:00
dteviot
4d9d8a060d Pathing bugfix. 
When path contains one one point from path grid, point is no longer being discarded.
 2015-08-16 18:56:28 +12:00
dteviot
942a987d52 centralize the world/cell coordinate conversion logic. 2015-08-16 18:55:02 +12:00
dteviot
5049c9ab6a removed unnecessary tests. 2015-08-16 17:41:33 +12:00
scrawl
8241976368 Don't attempt to play non-existing hit animations (Fixes #2856) 2015-08-15 23:27:37 +02:00
scrawl
d76fb2d266 Apply disintegrate only to weapons and armor (Fixes #2853) 2015-08-14 13:38:39 +02:00
Marc Zinnschlag
5aeabe22f0 Merge remote-tracking branch 'dteviot/PathfindingRefactor' 2015-08-14 10:13:04 +02:00
scrawl
1e18a73b1c Don't play magic effect sounds & visual effects for unsuitable targets (Fixes #2811) 2015-08-13 17:08:21 +02:00
scrawl
211deeb63e Don't attempt to lock or unlock unsuitable objects (Fixes #2826) 2015-08-13 17:08:21 +02:00
dteviot
55e3aaaa35 made variable const. 2015-08-10 20:30:43 +12:00
dteviot
e42a2478dc Removed tests that are not necessary. 2015-08-09 17:58:40 +12:00
dteviot
2b9e22f593 extracted function stopAttack(). 2015-08-09 14:29:38 +12:00
dteviot
0884a3796f extracted function isTargetMagicallyHidden(). 2015-08-09 14:20:55 +12:00
dteviot
038851420d Removed unneeded temp variables. 
Corrected case of function names.
 2015-08-09 14:18:55 +12:00
dteviot
50ddcd1953 more attack logic moved into AiCombatStorage. 2015-08-09 14:10:08 +12:00
dteviot
0735e3e06e move start attack logic to AiCombatStorage. 
Basically, copied from mrchenko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
 2015-08-09 14:08:42 +12:00
dteviot
1676bf917e CombatMove logic moved into AiCombatStorage. 
Basically, copied from mrcheko's 1d4be08f6e4c2dbd89cc0c3408a8231ee4497277
 2015-08-09 14:06:52 +12:00
Marc Zinnschlag
d29862eac3 Merge remote-tracking branch 'emperorarthur/anim_fail' 2015-08-08 10:47:46 +02:00
dteviot
58f732ebc9 Update path following checks each frame in AiCombat. 2015-08-04 18:20:05 +12:00
dteviot
ad9bab0b68 Removed redundant if. 2015-08-04 18:17:08 +12:00
dteviot
4256e151b1 Fixed error in deciding type of attack 2015-08-04 18:15:58 +12:00
dteviot
21e249cb92 pass parameters as const & 2015-08-04 18:14:36 +12:00
Arthur Moore
08d5aaf0fc Remove more comments 2015-07-31 18:23:07 -04:00
Arthur Moore
6fce49bfb5 Don't warn twice when unable to play an idle animation 2015-07-31 18:01:02 -04:00
Arthur Moore
61c3835637 Don't try to play animations we know are bad 
Prevents log spam
 2015-07-31 18:01:02 -04:00
scrawl
7644a46ded Creatures with no movement should not attempt to start combat (Fixes #2786) 2015-07-31 01:26:26 +02:00
scrawl
f326b8e5d2 Fix weapon animations playing on the lowerbody when swimming 2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e Play swimming animation fallback on the upper body when possible 2015-07-31 00:35:41 +02:00
Arthur Moore
5ea596f38d Refactor onChooseActionStatePerFrameActions 
This prevents playIdle errors from tyring to play idleAnimation 0
 2015-07-30 08:15:45 -04:00
Arthur Moore
f69de1f263 Alert the user if trying to play a non-idle animation 
Continue to propagate success/failure up the call stack.
 2015-07-30 08:08:58 -04:00
Arthur Moore
5e6fcc2aef Alert the user if attempting to play an animation fails 
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
 2015-07-30 08:00:26 -04:00
Marc Zinnschlag
26ea3aa1ad Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-30 10:26:40 +02:00
dteviot
04aee1fe20 extracted function reactionTimeActions(). 2015-07-26 17:32:29 +12:00
dteviot
c7aacaee70 extracted function returnToStartLocation(). 2015-07-26 17:29:32 +12:00
dteviot
5e519ef550 extract function isPackageFinished(). 2015-07-26 17:29:01 +12:00
dteviot
ad0d807103 extracted function reactionTimeActions(). 2015-07-26 17:28:32 +12:00
dteviot
9c0e3d6c28 extracted functions doPerFrameActionsForState() and onChooseActionStatePerFrameActions(). 2015-07-26 17:25:44 +12:00
dteviot
76f95eafe7 extract function onWalkingStatePerFrameActions(). 2015-07-26 17:25:00 +12:00
dteviot
5ec310dfba extract function onIdleStatePerFrameActions(). 2015-07-26 17:24:33 +12:00
dteviot
b3d5b47fea extracted function UpdateActorsMovement(). 2015-07-26 17:23:45 +12:00
scrawl
dff84adf7e Fix weapon animation priority 2015-07-26 01:35:36 +02:00
dteviot
aba7225817 Removed some duplicated operations. 2015-07-26 11:15:21 +12:00
scrawl
41996b0aad Don't play turning animations in first person mode 2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b Adjust the movement animation speed every frame (Fixes #1921) 2015-07-25 18:22:48 +02:00
scrawl
278076e609 Include cleanup 2015-07-25 04:14:22 +02:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
scrawl
e6b28d84f0 Outdated comment fix 2015-07-25 00:28:47 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
8286dc6c5a Player followers don't report crimes (Fixes #2457) 2015-07-23 02:29:09 +02:00
Marc Zinnschlag
f3d3cbc58b Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-20 09:57:46 +02:00
dteviot
2a4d35b98c fixed "comma at end of enumerator list" warning. 2015-07-20 18:20:57 +12:00
Marc Zinnschlag
9b3d5c958f Merge remote-tracking branch 'scrawl/music' 2015-07-19 11:49:00 +02:00
dteviot
00eef585af renamed mPlayedIdle to mIdleAnimation. 2015-07-19 18:04:42 +12:00
dteviot
22f49128cc replaced multiple booleans with single state variable. 2015-07-19 18:02:13 +12:00
dteviot
1ed6e95c07 Got rid of some radians to degrees to radians conversions. 2015-07-19 18:01:25 +12:00
dteviot
3ebe9fb34f renamed mRotate to mTurnActorGivingGreetingToFacePlayer 2015-07-19 18:00:49 +12:00
scrawl
b01abe4d19 Stop title music when the game starts (Fixes #2468) 2015-07-19 02:08:24 +02:00
scrawl
278a078e9d Unify magic effect tick functions 
- Removes duplicated code
- Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)
 2015-07-18 20:39:45 +02:00
scrawl
77f1387da8 Include cleanup 2015-07-18 20:36:28 +02:00
scrawl
111cf5462b Merge pull request #666 from scrawl/animation 
Animation refactoring & fixes
 2015-07-18 13:33:41 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
scrawl
660e7f5d89 Don't update animation states in skipAnim mode (Fixes #2782) 2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2 Don't restart the jump animation when equipping a different weapon (Fixes #2286) 2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1 Fix enchantments casting more than once per button press, broken by a1432b0255 2015-07-16 19:56:09 +02:00
scrawl
17ada63fcb Don't play turning animations on the upperbody when in first person mode (Fixes #2287) 2015-07-15 16:43:11 +02:00
scrawl
83cceeee72 Use the extended animation priority for Block animations, allow starting attacks during a block animation (Fixes #2761) 2015-07-15 16:43:11 +02:00
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
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
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
08d2b196bd Merge remote-tracking branch 'ace/explicit-instantiation' 2015-07-10 08:58:53 +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
88f1220a77 Merge remote-tracking branch 'dteviot/Bug2726' 2015-07-06 13:07:40 +02:00
scrawl
531bca1273 Add a threshold for changing aicombat targets (Fixes #2755) 2015-07-05 18:09:13 +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
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
mrcheko
c773ed9f9a move checkWayIsClear to pathfinding; move shortcut logic to separate func (AiPackage::shortcutPath); rework AiPackage::pathTo 2015-07-04 18:00:16 +03: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
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +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
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
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
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
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
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
scrawl
6e5f3339ad Make sure to play IdleSwim when the character is swimming (Bug #2696) 2015-06-17 20:49:01 +02:00
Marc Zinnschlag
5a5c2bb5bc Merge remote-tracking branch 'dteviot/FixRunningInCircles' 2015-06-17 15:56:01 +02:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
5347d407d8 Disallow AiWander fast-forward for water creatures 
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
 2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3 Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell 2015-06-15 20:04:36 +02:00
scrawl
f017fd6860 Reduce includes in animation.hpp 2015-06-14 23:13:26 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
dteviot
520fbd63c4 simplified pathfinding code. 
remove mIsPathConstructed.  Instead call !mPath.empty().
 2015-06-14 15:14:02 +12:00
dteviot
bfff84ba8f replaced #include with forward class declaration, as suggested by slaugherfish. 2015-06-14 10:30:55 +12:00
scrawl
d4c45efb2b Remove useless #undef's for windows now that we have NOMINMAX flag 2015-06-12 04:39:44 +02:00
dteviot
cb8ca2f03a Moved logic for building a Sync'ed path from AiCombat to PathFinding. 
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
 2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c AiTravel logic merged into AiPackage. 2015-06-11 18:28:31 +12:00
scrawl
4c09ecef72 Normalize fixes 2015-06-05 03:41:10 +02:00
scrawl
a0b0ae9bd1 Remove an unused variable 2015-06-04 21:51:24 +02:00
scrawl
78ac37b52a Remove BOOST_STATIC_ASSERT to fix clang warnings 2015-06-04 20:11:40 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0 Remove dependency on Ogre::StringConverter 2015-06-03 19:59:54 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
58ebf57154 Apply a comment that got lost in the endless depths of my git stash 2015-06-02 17:13:30 +02:00
scrawl
de8e5f0db1 Restore projectiles 2015-06-01 21:41:13 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
Marc Zinnschlag
9f0ccdc37a Merge remote-tracking branch 'scrawl/master' 2015-05-31 11:05:43 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
 2015-05-23 20:33:44 +02:00
scrawl
d1b6289cad Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
2235d2978b Restore animation text key handling 2015-05-22 04:36:33 +02:00
scrawl
ccab8cc9a1 Register Player in the PhysicsSystem 2015-05-12 17:40:42 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
5abeab21ed Various integer/floating point roll adjustments based on wiki 2015-05-11 16:55:09 +02:00
scrawl
9d86e5b028 GetSpellEffects returns true for active abilities (Fixes #2530) 2015-05-11 16:38:16 +02:00
scrawl
e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
 2015-05-04 02:41:50 +02:00
Marc Zinnschlag
83a7eea2a9 Merge remote-tracking branch 'scrawl/master' 2015-05-03 09:54:32 +02:00
scrawl
9cf9c2876e Pathgrid rendering 2015-05-02 22:45:39 +02:00
scrawl
bd8f0248f0 Player rendering 2015-05-01 18:21:50 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
Rohit Nirmal
997347b01e Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
scrawl
8c810e3620 Move rng to components 2015-04-22 17:58:55 +02:00
scrawl
e49b8fe690 Fix persuasion mechanics using player stats instead of NPC's (Fixes #2475) 2015-04-22 01:17:34 +02:00
scrawl
68f93294da Port EffectManager 2015-04-19 17:55:56 +02:00
scrawl
1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-19 02:29:16 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
dteviot
be6ee927b9 AiWander, use closest two points if distance is too small (Fixes #1317) 
In AiWander, if wander distance is set too small to get two points, take the closest two points.
 2015-03-28 20:05:54 +13:00
dteviot
63ab856024 Removed duplicated code. 2015-03-23 20:57:36 +13:00
dteviot
eb1090a1b6 Waypoint check only considers X & Y distance (Fixes #2423) 
When pathfinder checks if actor has reached a waypoint, ignore actor's altitude.
 2015-03-23 20:09:46 +13:00
scrawl
5cb61fa01c Don't mark gold as stolen, adjust stolen tooltip (Fixes #2465) 2015-03-22 17:28:27 +01:00
Marc Zinnschlag
86d39cede9 Merge remote-tracking branch 'dteviot/Rng' 2015-03-15 22:04:26 +01:00
dteviot
3f28634d1f consolidate random number logic 
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
 2015-03-15 14:07:47 +13:00
dteviot
1d7f3474fa Fixed more MSVC 2013 warnings. 2015-03-15 08:49:03 +13:00
scrawl
767624f518 Combat mechanic fixes 2015-03-12 03:08:58 +01:00
scrawl
a846bb1aa3 Update hit chance according to wiki and implement fCombatInvisoMult 2015-03-12 02:47:16 +01:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
scrawl
68de876051 Switch to weapon drawstate when creating a bound weapon (Fixes #2387) 2015-03-11 21:12:08 +01:00
scrawl
36e1b6cc48 Support fatigue below zero for the Drain effect (Fixes #2430) 2015-03-09 03:15:11 +01:00
scrawl
3d5c1d1190 Adjust fix for maximum attribute damage limit 2015-03-09 03:15:11 +01:00
dteviot
36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
 2015-03-08 18:29:12 +13:00
dteviot
ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 17:42:07 +13:00
dteviot
e6cd8484a2 fixing MSVC 2013 warning C4244: & C4305 
fixes for mistakes in last commit.
 2015-03-08 13:22:56 +13:00
dteviot
e197f5318b fixing MSVC 2013 warning C4244: & C4305 
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
 2015-03-08 13:07:29 +13:00
Marc Zinnschlag
ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 2015-03-07 18:34:29 +01:00
dteviot
f2ac939e61 reverted mShouldRepeat back to unsigned char. 
As recommended by Scrawl.
 2015-03-07 11:04:54 +13:00
Marc Zinnschlag
907ac5ef7f Merge remote-tracking branch 'scrawl/master' 2015-03-06 19:24:15 +01:00
dteviot
45b6538820 fixed MSVC 2013 warning C4800 
forcing value to bool 'true' or 'false'
 2015-03-06 23:19:57 +13:00
dteviot
407cd50890 fixed warning C4099: 
type name first seen using 'class' now seen using 'struct'
 2015-03-06 21:36:42 +13:00
dteviot
80fe24207c correction from Scrawl. 
Now correctly handles skills/attributes.
Also, document what ContentSelectorView::ContentSelector::slotAddonTableItemActivated() is doing.
 2015-03-05 20:21:22 +13:00
scrawl
cced508916 Remove unintended 1.5 factor for damage/restore magic effects 2015-03-04 01:49:00 +01:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
scrawl
a653716e2c Fix for damage/restore effects using the instant apply path when they have a duration 2015-03-01 22:22:20 +01:00
dteviot
cdee6f41fc fix: multi effect spell with different ranges (Fixes #2285) 
Applies all effects for a spell with multiple effects, where not all effects have the same range.
 2015-03-01 15:34:18 +13:00
dteviot
41e15e0c2d Limit maximum attribute damage (Fixes #2367) 
Maximum damage that an attribute can have = base + fortify.
 2015-03-01 10:27:51 +13:00
scrawl
f82751422d Fix constant effect restore enchantments being applied incorrectly (Fixes #2408) 2015-02-28 16:31:22 +01:00
Marc Zinnschlag
9109162030 Merge remote-tracking branch 'scrawl/master' 2015-02-23 20:51:18 +01:00
scrawl
77bb77b367 Fix for instant restore effects (Fixes #2392) 2015-02-23 19:07:12 +01:00
Marc Zinnschlag
07c27065d6 Merge remote-tracking branch 'slothlife/msvc-warning-fixes' 2015-02-22 21:34:46 +01:00
Marc Zinnschlag
4c5bba2947 Merge remote-tracking branch 'dteviot/SpellCastingFixes' 2015-02-17 16:44:14 +01:00
Marc Zinnschlag
8686ffcedb Merge remote-tracking branch 'scrawl/master' 2015-02-17 11:55:12 +01:00
dteviot
8d7de7d1ec Telekinesis allows safe opening of traps (Fixes #1916) 
When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests.
 2015-02-17 22:14:25 +13:00
cc9cii
efdee19477 Suppress warning about the lack of virtual destructor. 2015-02-16 16:41:53 +11:00
slothlife
a9b74671a6 Fix various MSVC warnings 2015-02-15 20:10:21 -06:00
scrawl
81925645a3 Unreachable enemies combat AI fix (Fixes #2271) 2015-02-14 16:51:54 +01:00
Alexander "Ace" Olofsson
d3128a12b6 Remove a large include form mwbase/windowmanager.hpp 2015-02-09 16:23:41 +01:00
Alexander "Ace" Olofsson
8c49812d56 Remove unneeded include in obstacle.hpp 2015-02-09 15:12:10 +01:00
Alexander "Ace" Olofsson
df5a08b6de Move manualref code out of header 2015-02-09 15:01:49 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
9dbd9af31c Adjust fix for Bug #2360 to repair affected savegames 2015-02-08 21:26:58 +01:00
scrawl
b542143e3a Fix faction reputation case sensitivity issue (Fixes #2360) 2015-02-08 21:04:01 +01:00
scrawl
61ec9196c8 Cap the displayed attribute multiplier in levelup to attribute points left to 100 2015-02-06 01:27:17 +01:00
scrawl
b5e0e45c78 Fix iLevelUpTotal not being used in the levelUp logic 2015-02-06 01:27:17 +01:00
scrawl
f0b1d889c0 ESSImport: import player skill progress 2015-02-06 01:27:17 +01:00
scrawl
ae77eacd7e Skill progress refactoring 2015-02-06 01:27:16 +01:00
scrawl
bea88c3643 Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
scrawl
aa6ebcd75c Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +01:00
scrawl
6d097fbfbd Normalise spelling of "levelled" throughout the code 2015-02-05 04:18:42 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
MiroslavR
ee8f88fc42 Reset health modifier when actor dies (Fixes #2330) 2015-02-01 22:04:49 +01:00
scrawl
7e33471edb Fix code duplication 2015-01-31 22:40:43 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
2346c3528d Remove NpcStats::mProfit and store it in the script instead 
Also use the Profit label when the "minimumProfit" script variable exists, rather than hardcoding to NPCs.
 2015-01-31 22:40:40 +01:00
scrawl
b9acf437fd Remove friendly hits from the save file 
The vanilla engine does not store friendly hits in the save file. Since there's no other mechanism that ever resets the friendly hits (at least not to my knowledge) this should be regarded a feature rather than a bug.
 2015-01-31 22:40:39 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6 Enchanted arrows should not be added to victim (Fixes #2306) 2015-01-27 23:12:20 +01:00
scrawl
67491c7164 Fix leveled item argument issue (Fixes #2302) 2015-01-27 23:12:20 +01:00
scrawl
c883a73d30 Several warning fixes 2015-01-23 15:34:47 +01:00
scrawl
378e91545d Fix Tribunal/BM summon effects not working 2015-01-23 15:34:47 +01:00
scrawl
69676906ae Don't clear known spells when reading from the savegame 
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
 2015-01-23 15:34:14 +01:00
scrawl
eede2c8e55 ESSImport: convert breath meter and skill increases 2015-01-20 19:30:39 +01:00
scrawl
14aacf9a72 Add comment 2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc Remove unused mLastDrowningHit 2015-01-17 00:10:45 +01:00