Torben Carrington
73a9671742
Pathfinding Overhaul - Changed the name of checkIfNextPointReached to a more intuitive name considering what it does (checkPathCompleted) and fixed a minor bug in it, modified buildPath() to take one final parameter, a bool which dictates whether or not to always use pathfinding (like AIWander should be doing) or to allow for "shortcuts", modified all ai packages to work with these two changes.
2013-05-29 20:05:17 -07:00
Torben Carrington
c080785235
Pathfinding Overhaul - Finished cleaning, removed unnecessary parameter in one function, fixed use of the function in ai packages and added use of clearPath() function in aiwander, fixed algorithms and got rid of excess subtractions in getDistance functions (thanks to Chris!).
2013-05-29 19:26:45 -07:00
Torben Carrington
7b465ae4f1
Pathfinding Overhaul - Even more cleanup and spacing corrections, small renaming (more to come), removed a few unnecessary actions that wasted CPU time and tmp RAM.
2013-05-29 17:33:33 -07:00
Torben Carrington
96fdaf7410
Pathfinding Overhaul - More cleanup.
2013-05-29 16:10:15 -07:00
Torben Carrington
4838678944
Pathfinding Overhaul - Cleanup, removed unnecessary include, fixed spacing, added a function for clearing a path, overall preperation to begin working on fixing pathfinding.
2013-05-29 15:59:23 -07:00
Miroslav Puda
dc17fa1636
Removal of duplicit enumeration and unnecessary conditions.
2013-05-29 00:01:18 +02:00
Marc Zinnschlag
bbec3680c6
Merge remote-tracking branch 'pakanek/enchanting-mechanics'
2013-05-28 10:02:03 +02:00
Marc Zinnschlag
6e7416d8c5
Merge remote-tracking branch 'scrawl/master'
2013-05-28 09:59:41 +02:00
scrawl
9a43927078
Fix weapons not appearing in Enchantable filter
2013-05-28 03:15:13 +02:00
Miroslav Puda
7a4a386cbe
Removal of tab characters.
2013-05-27 20:47:53 +02:00
Torben Carrington
dbbc96f600
AIWander Segmentation Fault Fix - Fixes the segmentation fault that used to occur when there was no pathgrid in the cell and a range was passed to AIWander.
2013-05-27 11:44:46 -07:00
Miroslav Puda
b40e24c50c
Refactorization
2013-05-27 20:23:04 +02:00
Miroslav Puda
4e17bc1499
Fix for display of cast cost decimal value
2013-05-27 20:16:57 +02:00
Marc Zinnschlag
7927ac818c
Merge remote-tracking branch 'torben/aiwanderpatchpotential'
2013-05-27 18:29:15 +02:00
Miroslav Puda
9a9b075a02
Correct cast cost for enchantments.
2013-05-27 18:08:12 +02:00
Torben Carrington
ebc1fdd017
AIWander Patch - fixed another possibility of a bug occuring, best to fix it now then wait until it happens.
2013-05-27 09:05:42 -07:00
scrawl
0c7f48ec8a
Implement movement for creatures (formula is a stub)
2013-05-27 18:03:06 +02:00
Miroslav Puda
1c7b94e94f
Switching in nextCastStyle() is now based on enum CastingStyle.
2013-05-27 16:08:58 +02:00
Miroslav Puda
252a1d9223
Replacement of some magical constants
2013-05-27 15:50:47 +02:00
Miroslav Puda
9e1eb8b3b1
Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics
2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226
Better formula for enchantment cost and code refactorization.
2013-05-27 14:42:08 +02:00
Miroslav Puda
56edc1b213
Correction of getting spell range "Target".
2013-05-27 12:26:06 +02:00
Torben Carrington
bd6d54cc8f
AIWander Minor Patch - Forgot an else statement and another check on an empty node vector, previously no nodes in range or only one would cause the AIWander to not do anything, now they will play idles correctly still.
2013-05-27 03:24:41 -07:00
Marc Zinnschlag
86dd6d0847
Merge remote-tracking branch 'eroen/libcxx'
2013-05-27 10:27:31 +02:00
Marc Zinnschlag
fa63ebce78
Merge remote-tracking branch 'scrawl/master'
2013-05-27 10:19:02 +02:00
Marc Zinnschlag
bd8344b387
Merge remote-tracking branch 'torben/aiwander'
2013-05-27 10:16:37 +02:00
Torben Carrington
3b43ee751e
AI Execute Fix - May as well not create the object either to save extra time.
2013-05-26 19:54:59 -07:00
Torben Carrington
feb180724c
AI Execution Fix - Preiovusly AiExecute was being called even when in a menu, this was not correct behavior.
2013-05-26 19:33:45 -07:00
scrawl
3a6e54c4f5
Sell owned items in the cell
2013-05-27 02:18:36 +02:00
Torben Carrington
fd96d47fe4
AIWander Completed. Replicates vanilla as best possible, pathfinding needs fixing before this looks correct but once the pathfinding files are edited this will behave pretty much exactly as vanilla. Major credit to Hrnchamd for major research.
2013-05-26 11:30:42 -07:00
Torben Carrington
96daad7a22
AIWander - shortened some if statements and made super minor optimizations to others, now using proper GMST to load proper idlechance instead of hacky set value."
2013-05-26 09:31:56 -07:00
Torben Carrington
e37324b967
AIWander everything works. only two things to do: Implement limiting selection on z axis, and correcting decision algorithm.
2013-05-26 08:49:44 -07:00
eroen
2850032d9e
libc++ fixes: avcodec/avformat workaround
...
With libc++, string includes stdint.h, which breaks the fragile avformat.h
workaround, which depends on __STDC_CONSTANT_MACROS being defined before
stdint.h is included.
Moving the string inclusion after that eyesore shouldn't break anything.
2013-05-26 12:01:01 +02:00
Marc Zinnschlag
5fac75845c
Merge remote-tracking branch 'torben/aiescortclean'
2013-05-25 15:35:56 +02:00
Torben Carrington
ddf28ca201
AIEscort Cleanup - Fixed spacing, removed unnecessary includes, fixed branch itself. The other pull requests were fine, it was just this one with the problem.
2013-05-25 04:36:21 -07:00
Marc Zinnschlag
94474e8952
Merge remote-tracking branch 'torben/checkidlecomplete'
2013-05-25 12:35:34 +02:00
Marc Zinnschlag
81cd1c6e30
Merge remote-tracking branch 'torben/aitravelcleanup'
2013-05-25 12:35:00 +02:00
Torben Carrington
c8c1ddd927
Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.
2013-05-24 20:10:07 -07:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
Torben Carrington
56b1384c90
AITravel Cleanup - Removed unnecessary includes and other varius cleanups.
2013-05-24 18:16:35 -07:00
riothamus
d9350be8da
Console Object Selection Fix
2013-05-24 09:31:56 -04:00
Marc Zinnschlag
b1a8dc35e0
minor adjustments
2013-05-24 15:03:46 +02:00
Marc Zinnschlag
62479cd885
Merge remote-tracking branch 'torben/aiwanderrepeat'
2013-05-24 14:58:10 +02:00
Torben Carrington
1cfe037d6b
AIWander - Added support for the Repeat parameter to mimic vanilla.
2013-05-24 04:49:20 -07:00
scrawl
32e90bb733
Fix chargen statssheet
2013-05-23 17:28:45 +02:00
riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04:00
Miroslav Puda
3cebb41459
missing break
2013-05-21 21:04:15 +02:00
Edmondo Tommasina
f0482dd796
dialogue.cpp: fix build error "‘bind’ is not a member of ‘boost‘"
...
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:
In constructor ‘MWGui::DialogueWindow::DialogueWindow()’:
/var/tmp/portage/games-rpg/openmw-9999/work/openmw-9999/apps/openmw/mwgui/dialogue.cpp:271:44:
error: ‘bind’ is not a member of ‘boost’
2013-05-20 23:51:01 +02:00
scrawl
d3effdf34c
Fix exception when trying to equip a shield while a lockpick is equipped
2013-05-20 13:32:38 +02:00
scrawl
d9dd02c610
Security fixes
2013-05-20 12:42:11 +02:00
scrawl
2715520d6f
Cleanup Security class
2013-05-19 23:19:48 +02:00
scrawl
5173779f4b
Add sounds for security skill
2013-05-19 19:48:51 +02:00
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
Chris Robinson
53d1c3939c
Merge remote-tracking branch 'zini/master' into animations
2013-05-17 06:26:34 -07:00
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
2013-05-17 06:21:59 -07:00
scrawl
d096b19307
Fix not being able to equip arrows/bolts
2013-05-17 14:11:19 +02:00
scrawl
3cadb5918f
Fix containers showing random items from my commit earlier
2013-05-17 14:11:02 +02:00
Chris Robinson
ee585046ac
Don't show weapons in first-person
2013-05-17 01:56:16 -07:00
Chris Robinson
4b9a888d74
Use the PickProbe animation group as appropriate
2013-05-17 01:46:51 -07:00
Marc Zinnschlag
cc42b1ef48
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 20:07:48 +02:00
riothamus
d89dbde940
Bug 752, spacing fix
2013-05-16 14:05:22 -04:00
Marc Zinnschlag
9fe5ff46cd
Merge remote-tracking branch 'riothamus/riothamus-b752'
2013-05-16 19:52:14 +02:00
riothamus
36f1197b51
Bug 752, cleanup
2013-05-16 13:51:54 -04:00
riothamus
db981a72fe
Bug 752
2013-05-16 13:40:00 -04:00
Marc Zinnschlag
2c8a511179
Merge remote-tracking branch 'scrawl/persistence'
2013-05-16 19:37:41 +02:00
scrawl
8a3d3f954b
NPC/creature persistence flag
2013-05-16 18:50:26 +02:00
Chris Robinson
6201cb0093
Add a method to clear the animation queue
2013-05-16 06:59:41 -07:00
Glorf
af28be915f
Use fallback video name
2013-05-16 13:47:27 +02:00
Glorf
0539ca6a9c
Bugfix #778
2013-05-16 13:35:28 +02:00
Chris Robinson
6c6200efef
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 16:34:51 -07:00
Marc Zinnschlag
9fee99d56c
Merge remote-tracking branch 'scrawl/master'
2013-05-15 22:43:00 +02:00
scrawl
aaa9aba999
Some fixes
2013-05-15 22:38:53 +02:00
scrawl
c41f119ba6
Added new game button
2013-05-15 17:54:18 +02:00
Chris Robinson
71d39c2fa0
Merge remote-tracking branch 'zini/master' into animations
2013-05-15 06:36:06 -07:00
Chris Robinson
e069215583
Don't clear the last queued animation when it stops
2013-05-15 06:32:20 -07:00
Chris Robinson
66f55b3178
Play the item up/down sound when readying/unreadying weapons
2013-05-15 01:45:47 -07:00
Chris Robinson
b459a010b0
Fix vec.z being applied while not in the air
2013-05-14 23:03:28 -07:00
Chris Robinson
3c5c10144a
Remove a duplicate showWeapons call
2013-05-14 19:38:57 -07:00
Marc Zinnschlag
56b2b05f9a
Merge remote-tracking branch 'glorf/weather'
2013-05-14 22:56:26 +02:00
Glorf
39c7bc8363
Corrected celestical object sizes
2013-05-14 20:34:40 +02:00
Glorf
9fa2dd5277
Playing with moons part 2
2013-05-14 19:58:08 +02:00
Chris Robinson
e8661794fe
Avoid trying to find a state for non-actors.
...
They're only ever play idles, unless PlayGroup is called.
2013-05-14 07:29:07 -07:00
Chris Robinson
355f653614
Use AnimationAlloc instead of AnimationAllocatedObject
2013-05-14 01:30:01 -07:00
Chris Robinson
47a9a4cdff
Clean up a for loop
2013-05-14 01:29:15 -07:00
scrawl
96e3b3b7c2
Fix a compile error, OGRE_NEW only works for classes derived from AllocatedObject
2013-05-13 21:03:53 +02:00
Marc Zinnschlag
d684120f7a
Merge remote-tracking branch 'scrawl/master'
2013-05-13 20:47:50 +02:00
scrawl
ac4fa1941d
Fix the frame update not getting called on the first frame
2013-05-13 20:08:12 +02:00
Chris Robinson
822f130f79
Merge remote-tracking branch 'zini/master' into animations
2013-05-13 04:09:56 -07:00
Chris Robinson
8ec722ac92
Use std::find_if instead of ugly for loops
2013-05-13 04:08:36 -07:00
Chris Robinson
f83ee5d316
Play ready/unready animations on the upper body
2013-05-13 03:32:00 -07:00
Torben Carrington
4d10a1c407
Fixed an additional 0 being sent into the AIWander idle parameters vector (Thanks to Chris)
2013-05-13 02:57:52 -07:00
Marc Zinnschlag
af191c7382
fixed AiWander arguments
2013-05-13 11:27:36 +02:00
Chris Robinson
a9928bb842
Split up the UpperBody group
...
Also recognize the [un]equip start and stop text keys.
2013-05-13 02:09:22 -07:00
Chris Robinson
70dc2f77ad
Move the priority enum to MWMechanics
2013-05-13 00:54:44 -07:00
Chris Robinson
7ba2508556
add a priority for death animations, and store it in the state list
2013-05-12 19:19:21 -07:00
Chris Robinson
4e389b5a8f
Store whether a given animation loops in the state table
2013-05-12 05:59:39 -07:00
Chris Robinson
bbb38c61cc
Fix queued animations
2013-05-12 05:08:01 -07:00
