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
graffy76
089a1d48c1
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-25 08:06:56 -05: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
graffy76
935049b187
Added #include for QListWidgetItem to usersettingsdialog.hpp
2013-05-20 20:40:53 -05: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
Miroslav Puda
51414e2051
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 22:34:48 +02:00
Marc Zinnschlag
5d4c311de7
Merge remote-tracking branch 'scrawl/master'
2013-05-20 15:01:25 +02:00
Miroslav Puda
cd57523601
Merge branch 'master' of https://github.com/zinnschlag/openmw
2013-05-20 14:01:47 +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
Marc Zinnschlag
c1ceb32b28
Merge remote-tracking branch 'scrawl/master'
2013-05-20 12:10:51 +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
Marc Zinnschlag
c626e2b257
Merge branch 'ref'
...
Conflicts:
apps/opencs/view/doc/view.hpp
2013-05-19 14:59:01 +02:00
Marc Zinnschlag
ca33d66ed9
added missing columns for weapon records
2013-05-19 14:44:41 +02:00
Marc Zinnschlag
2123900db5
added missing columns for NPC records
2013-05-19 13:53:47 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00