teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
14606 commits 34 branches 0 tags 66 MiB
Commit graph

8171 commits

Author SHA1 Message Date
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
3bca3e73d4 Fix GetWeaponDrawn and GetSpellReadied script functions for creatures 2015-07-25 02:11:59 +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
3f3c3d0ad3 Remove an already resolved todo comment 2015-07-24 23:28:43 +02:00
scrawl
4f6e5345cc Include cleanup 2015-07-24 23:28:36 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
scrawl
7f66339790 Remove a redundant function 2015-07-24 20:23:27 +02:00
scrawl
71bc22401f Include cleanup 2015-07-24 18:23:23 +02:00
scrawl
7e4e59efb9 Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792) 2015-07-23 02:29:09 +02:00
scrawl
7900631d51 Print the missing player cell to error output 2015-07-23 02:29:09 +02:00
scrawl
8286dc6c5a Player followers don't report crimes (Fixes #2457) 2015-07-23 02:29:09 +02:00
Marc Zinnschlag
6e3032efc1 Merge remote-tracking branch 'koncord/fix-gold-beh' 2015-07-22 08:30:43 +02:00
Koncord
6c3c85f0d4 Fix indent 
Remove misc.hpp in containerstore.cpp
 2015-07-20 21:53:20 +09:00
Marc Zinnschlag
f3d3cbc58b Merge remote-tracking branch 'dteviot/refactoringAiWander' 2015-07-20 09:57:46 +02:00
Marc Zinnschlag
d2cd151f77 Merge remote-tracking branch 'kunesj/master' 2015-07-20 09:45:14 +02:00
dteviot
2a4d35b98c fixed "comma at end of enumerator list" warning. 2015-07-20 18:20:57 +12:00
Koncord
7a86c8d8b6 Fix OpAddItem, OpGetItemCount and OpRemoveItem. 2015-07-20 12:48:19 +09:00
Koncord
a24df8cb66 Revert addImp() and remove() 
add isGold() in MWWorld::Class
 2015-07-20 12:43:58 +09:00
Koncord
9485aa5e44 Fix "removeitem gold_100" behavior 2015-07-20 09:53:08 +09:00
Koncord
aefcd1ad07 Fix "additem gold_100" behavior 2015-07-20 08:20:28 +09:00
Koncord
75e5023590 fix code duplication 2015-07-20 08:06:43 +09:00
Jiří Kuneš
a14a3c82de added description of new syntax to the onRetrieveTag function comment 2015-07-19 19:52:50 +02: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
1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 2015-07-19 00:45:02 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +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
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
scrawl
111cf5462b Merge pull request #666 from scrawl/animation 
Animation refactoring & fixes
 2015-07-18 13:33:41 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
Marc Zinnschlag
964cd44e96 Merge remote-tracking branch 'kunesj/master' 2015-07-18 11:34:04 +02:00
slothlife
f8f0380413 Fix for loading window icon on Windows 2015-07-17 21:41:53 -05:00
scrawl
a33ca75742 Pass AnimPriority by const reference 2015-07-18 03:23:41 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
scrawl
6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9 Use multimap to speed up custom map marker code 2015-07-17 20:49:10 +02:00
Jiří Kuneš
4a6d806127 fixed comment, save settings to member variable, removed usless include, changed variable to const 2015-07-17 20:30:00 +02:00
Jiří Kuneš
e68b388d16 removed setCrosshairOwned from windowmanager 2015-07-17 19:13:45 +02:00
Jiří Kuneš
c019f8e23d use correct mechanics manager 2015-07-17 18:49:47 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
Jiří Kuneš
66edae9b93 change collor of crosshair 2015-07-17 17:29:00 +02:00
Jiří Kuneš
72728b9c01 disable cusor when item/container is owned 2015-07-17 16:32:35 +02:00
scrawl
91d71d0fcd Disable MyGUI's scrollbar autorepeat (Fixes #2779) 
We are currently using a custom implementation so as to support MyGUI version 3.2.1. When compiled with 3.2.2 or later, we need to disable MyGUI's autorepeat so that it doesn't interfere with ours.
 2015-07-17 03:39:09 +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
f6f82d433c Fix bug with loop key assignment 
Animations with time of "loop start" == time of "loop stop" were not getting their loop times assigned correctly.

This fixes incorrect playing of the jump animation, one aspect of Bug #2286.
 2015-07-16 19:55:05 +02:00
scrawl
f8d360190d Remove an unneeded virtual 2015-07-15 19:10:09 +02:00
scrawl
992b770315 Don't set OnPcEquip for items that failed to equip (Fixes #2776) 2015-07-15 18:52:23 +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
3656851750 Remove the now unused changeBlendMask 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
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