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
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
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
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