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
c783b50a83
Fix config file priority in the launcher to match OpenMW
2015-07-18 01:38:35 +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
Marc Zinnschlag
5febb96012
do not try to jump to source location for errors that do not have a source location
2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046
consider column when jumping to error in source text
2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4
jump to line in source text when clicking on an error in error table
2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388
made error table read only
2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd
improved error table layout
2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160
consider script warning settings for script subview
2015-07-17 11:52:59 +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
Marc Zinnschlag
9b12b4f1e2
refactored mapping from message severity enum to string
2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d
improved error reporting
2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f
display script errors in script subview
2015-07-16 12:36:20 +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
Marc Zinnschlag
df027b3498
hooked up script subview buttons to bottom box (enables add and clone)
2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4
fixed deleted button sensitivity state
2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03
improving consistency of subview layouts
2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24
replaced the script subview status bar with a bottom box (including a status bar)
2015-07-14 10:05:45 +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
fc6c14614b
added user settings option to toggle toolbars in single-record subviews
2015-07-13 12:52:18 +02:00
Marc Zinnschlag
749eff5259
renaming a few user settings categories
2015-07-13 09:42:16 +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
b97a4cee44
added button bar to script subview
2015-07-11 16:09:13 +02:00
Marc Zinnschlag
dacb93c57f
Merge remote-tracking branch 'scrawl/coverity_scan'
2015-07-11 11:53:43 +02:00
scrawl
0ed3e3e489
Fix cout/cerr mixup
2015-07-11 04:27:41 +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
Marc Zinnschlag
87a089d6b6
Merge remote-tracking branch 'dteviot/Bug2726'
2015-07-09 07:49:42 +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
MiroslavR
13f289d1a5
Fix calculation of selected blocks in ScriptEdit
2015-07-06 16:35:45 +02: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
Marc Zinnschlag
e0781a5d70
Merge remote-tracking branch 'scrawl/master'
2015-07-05 20:47:04 +02:00
Marc Zinnschlag
6c5dc5c7a0
Merge remote-tracking branch 'smbas/fix-cell-creating'
2015-07-05 20:43:59 +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
Marc Zinnschlag
ea1ddb5c9f
Merge remote-tracking branch 'smbas/feature-dialogue-edit-id'
2015-07-05 14:44:33 +02:00
Stanislav Bas
3ffa0aa185
Count of nested columns can be retrieved for a collection with no records
2015-07-05 15:36:41 +03: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
Stanislav Bas
c1b06538dc
Add Edit 'ID' action for nested fields
2015-07-04 19:55:48 +03:00
Stanislav Bas
30fd711a47
TableEditIdAction: prevent creation of a UniversalId with Type_None
2015-07-04 19:39:53 +03:00
Stanislav Bas
86dc5a2c67
Add Edit 'ID' action for nested tables
2015-07-04 19:27:59 +03:00
Stanislav Bas
464e674a81
Rework Table (view) code to use a TableEditIdAction
2015-07-04 18:51:39 +03:00
Stanislav Bas
6b34845168
Create a separate class for Edit 'ID' action to use in tables' context menus
2015-07-04 18:49:32 +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
Stanislav Bas
d73fd471c3
IdContextMenu: don't add Edit action if it's already in the context menu
2015-07-03 19:07:44 +03:00
Stanislav Bas
61ab0ba482
Prevent the Edit 'ID' action for the current ID of the dialogue subview
2015-07-03 18:48:13 +03:00
Stanislav Bas
149cb9d004
IdContextMenu: if the ID field is empty show the standard context menu (if available)
2015-07-03 16:51:47 +03:00
Stanislav Bas
e8e34f37dd
Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels)
2015-07-03 16:24:08 +03:00
Stanislav Bas
47b66b57ae
Create a context menu handler for dialogue editors with ID information
2015-07-03 15:37:10 +03:00
