Miroslav Puda
cfbdf3f779
Enum Type renamed to CastingStyle
2013-05-27 15:37:31 +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
886bc7e2f6
libc++ fixes: don't rely on tr1
...
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.
Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
2013-05-26 12:44:30 +02: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
scrawl
de5a08a07d
Version should be 100 for GLSLES
2013-05-25 05:40:35 +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
c2c88acc7b
GLSLES: only the fragment shader needs precision explicitely set.
2013-05-25 04:26:40 +02:00
scrawl
cc747d8ae4
GLSL ES: precision qualifiers are required
2013-05-25 04:23:07 +02: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
Marc Zinnschlag
3ae02547d2
increased version number
2013-05-23 22:42:36 +02:00
scrawl
32e90bb733
Fix chargen statssheet
2013-05-23 17:28:45 +02:00
Marc Zinnschlag
2d894fde57
Merge remote-tracking branch 'riothamus/riothamus-b788' into openmw24
2013-05-23 16:08:58 +02:00
riothamus
7187f50c40
Bug 788
2013-05-23 09:13:21 -04:00
Marc Zinnschlag
681345dd15
Merge remote-tracking branch 'riothamus/riothamus-b787-B'
2013-05-23 09:13:39 +02:00
riothamus
885d12e867
updated hud layout
2013-05-22 22:06:22 -04:00
Marc Zinnschlag
9d67cd6251
Merge remote-tracking branch 'pakanek/esmtool_plain_script'
2013-05-22 23:48:26 +02:00
scrawl
a54f8c7ee2
Removed an optimization that caused problems on 32 bit builds
2013-05-22 21:01:05 +02:00
Miroslav Puda
00866ef246
Merge branch 'master' of https://github.com/zinnschlag/openmw into esmtool_plain_script
2013-05-22 20:25:47 +02:00
Miroslav Puda
8a9ddcaa32
Plain output moved at the end of records output.
2013-05-22 20:24:23 +02:00
Miroslav Puda
d3d5cb4edf
New command line option --plain to print contents of scripts, books, dialogs.
2013-05-22 20:09:11 +02:00
Marc Zinnschlag
c40e753ea9
Merge remote-tracking branch 'pakanek/master'
2013-05-22 14:07:49 +02:00
Miroslav Puda
7149439ace
Replacement of empty() method by assertion.
2013-05-22 13:23:49 +02:00
Marc Zinnschlag
6d0b8f7bc8
added missing include
2013-05-22 10:14:12 +02:00
Miroslav Puda
3cebb41459
missing break
2013-05-21 21:04:15 +02:00
Miroslav Puda
48ac6e799b
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-21 17:04:17 +02:00
Marc Zinnschlag
adc41c4502
Merge remote-tracking branch 'edmondo/master'
2013-05-21 09:47:14 +02:00
Marc Zinnschlag
69d4861e4d
Merge remote-tracking branch 'riothamus/riothamus-b787'
2013-05-21 09:46:08 +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
riothamus
39bd8894a9
Bug 787
2013-05-20 16:39:24 -04:00
