Marc Zinnschlag
fafb7501e3
Merge remote-tracking branch 'cc9cii/PathFinder-split'
2014-04-07 09:48:15 +02:00
Emanuel Guevel
ce7aa96371
Fix visual glitch happening when closing inventory while sneaking
...
(bug #1255 )
2014-04-06 22:21:28 +02:00
Marc Zinnschlag
c7f2cfeca0
Merge remote-tracking branch 'gus/AIFix2'
2014-04-06 15:13:30 +02:00
cc9cii
28f7c42fb7
One more comment fix.
2014-04-04 18:17:42 +11:00
cc9cii
f59226265a
Remove redundant parameter from aStarSearch. Also update some comments.
2014-04-04 18:10:06 +11:00
cc9cii
5cf8e7e933
Remove logging.
2014-04-04 06:16:26 +11:00
cc9cii
040d4f8fc4
Move PathgridGraph into separate files.
2014-04-04 06:13:47 +11:00
cc9cii
a8b2eb1fe9
Make Travis happy.
2014-04-03 22:49:22 +11:00
cc9cii
325d0616bb
Cleanup debug statements.
2014-04-03 22:17:45 +11:00
cc9cii
98f77714ce
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
...
This version still has debugging statements and needs cleaning up.
2014-04-03 21:43:44 +11:00
cc9cii
f597d3e88b
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
2014-04-03 07:46:26 +11:00
Marc Zinnschlag
12e46c5dc7
Merge remote-tracking branch 'megaton/master'
2014-03-31 10:24:12 +02:00
Marc Zinnschlag
4ee1069baa
Merge remote-tracking branch 'scrawl/master'
2014-03-31 10:11:54 +02:00
scrawl
f5810b8e1c
Consider aspect ratio for loading screen background
...
More consistent with the main menu.
2014-03-30 23:07:49 +02:00
scrawl
1265131203
Set the selected index after all items are added (workaround for MyGUI bug)
2014-03-30 20:07:43 +02:00
megaton
50af9bc0d3
General perfomance optimizations.
2014-03-30 19:45:27 +04:00
cc9cii
d04bb3befb
MSVC uses C version of locale.
2014-03-30 17:23:22 +11:00
scrawl
5eeed03f5b
Only exchange bribe gold if the bribe was accepted
2014-03-30 00:12:31 +01:00
scrawl
72df9e77c6
Don't show version text in the pause menu
2014-03-30 00:07:32 +01:00
gus
d9ea7107b7
compile fix.
2014-03-29 18:36:32 +01:00
gus
bee057346b
Merge branch 'master' of https://github.com/OpenMW/openmw.git into AIFix2
...
Conflicts:
apps/openmw/mwmechanics/aifollow.cpp
2014-03-29 18:05:56 +01:00
Marc Zinnschlag
adab85eeb7
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 13:29:06 +01:00
Jeffrey Haines
6b28c06b2c
Feature #1233 Bribe gold in inventory - Corrected 1000 drake bribe
2014-03-29 07:47:41 -04:00
Jeffrey Haines
ad9286a30f
Revert "Revert "made mReceiver private""
...
This reverts commit 33aecc5218
2014-03-29 07:45:56 -04:00
Jeffrey Haines
33aecc5218
Revert "made mReceiver private"
...
This reverts commit 3e8f7b3bae
2014-03-29 07:45:36 -04:00
Marc Zinnschlag
c7b969821f
silenced a warning
2014-03-29 11:11:43 +01:00
Marc Zinnschlag
27095f3edb
Merge remote-tracking branch 'cc9cii/AiWander-improvements'
2014-03-29 11:08:51 +01:00
cc9cii
ebb1813b9b
Minor comment clarification.
2014-03-29 20:17:04 +11:00
cc9cii
07fd801d94
My previous analysis of the pathfinding issue was incorrect. It was in fact caused due to some of the pathgrid points being unreachable. Instead of returning an empty path in such a scenario, incorrect path + requested destination were being returned. There was also a defect where past cost was being used for selecting open points.
...
There is still an unresolved issue where mGraph and mSCComp are being rebuilt unnecessarily. The check mCell != cell in buildPath() is being triggered frequently. Not sure why.
2014-03-29 19:35:52 +11:00
cc9cii
267855c44e
Prevent NPC suicides off silt the strider platform in Seyda Neen. Added some comments as well. There may be opportunities for some optimization but left that out for now.
2014-03-29 19:35:52 +11:00
cc9cii
90a813ad2c
Allow interrupting a walking NPC to trigger a greeting.
2014-03-29 19:35:52 +11:00
Marc Zinnschlag
04baa4a573
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-29 08:14:04 +01:00
Jeffrey Haines
3e8f7b3bae
made mReceiver private
2014-03-29 02:59:47 -04:00
Jeffrey Haines
13d330e427
Feature #1233 Bribe gold not in inventory
...
Gold is now put into inventory receivers when bribing.
2014-03-28 21:16:42 -04:00
Marc Zinnschlag
86e5179fd8
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 22:40:12 +01:00
Jeffrey Haines
9efef31bb8
Feature #953 Trader Gold - Unused code/warning resolved
...
Removed unused code
getBaseGold throws proper error
2014-03-28 17:27:23 -04:00
Marc Zinnschlag
c38812d026
Merge remote-tracking branch 'jeffreyhaines/master'
2014-03-28 19:34:40 +01:00
Jeffrey Haines
401d21b4ee
getBaseGold implemented in MWWorld::Class for NPC and Creature
...
Implemented a getBaseGold() to get the vendor gold base
NPC gold base now can come from mNpdt12 and mNpdt52
2014-03-28 14:21:38 -04:00
Jeffrey Haines
895748f18d
Gold Pool implemented for Vendors
...
It appears that my solution breaks persuasion gold for some reason. I
may be wrong. I can’t see where this could be happening as the files
I’ve changes should not affect persuasion at all.
2014-03-28 12:01:56 -04:00
Marc Zinnschlag
2c2106205d
Merge remote-tracking branch 'scrawl/master'
2014-03-28 09:56:35 +01:00
scrawl
d7df9cae21
Bug #1224 : Changed fix to potentially allow for language independent saves
2014-03-27 22:32:42 +01:00
scrawl
4f852daf45
Don't play company logo when using --skip-menu
2014-03-27 19:59:33 +01:00
scrawl
f2cd37edd0
Play company logo movie
2014-03-27 19:51:48 +01:00
scrawl
5906d795c0
Refactored video player (now a MyGUI widget)
2014-03-27 19:10:15 +01:00
scrawl
2e4ef93b28
Add proper main menu (background image, logo animation, title music)
2014-03-27 15:25:01 +01:00
Marc Zinnschlag
5c81f20f46
Merge remote-tracking branch 'rohitnirmal/load-weap-icon'
2014-03-27 14:57:55 +01:00
Jeffrey Haines
6896142db1
Trader Gold Reset Delay
...
Trade Time initialized to 0
Gold pot set correctly for npc’s and creatures
2014-03-27 07:30:24 -04:00
Jeffrey Haines
2a8bf46607
Trader Gold Reset Delay
...
Implemented traded gold reset delay.
Note:
Traders gold pool is still in inventory.
2014-03-27 01:23:56 -04:00
Rohit Nirmal
e695890e01
Only update the icon if player is NOT unarmed, to avoid bad dereference.
2014-03-26 21:53:35 -05:00
Rohit Nirmal
bcacdc49af
Update weapon icon in HUD when save is loaded.
2014-03-26 21:08:31 -05:00
