Marc Zinnschlag
13112c6d04
Merge remote-tracking branch 'scrawl/aiwanderfix'
2015-06-16 12:28:34 +02:00
scrawl
5347d407d8
Disallow AiWander fast-forward for water creatures
...
Pathgrid nodes are usually above the water level, so appearing at a random node would have the creature break out of the water level it's supposed to be constrained to.
2015-06-15 20:13:59 +02:00
scrawl
98a77f68a3
Fix AiWander::fastForward using incorrect pathgrid coordinates when actor recently moved to a new cell
2015-06-15 20:04:36 +02:00
scrawl
609e146a22
Build fixes for windows
2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30
Merge remote-tracking branch 'smbas/feature-soundgen-verifier'
2015-06-15 16:25:11 +02:00
Marc Zinnschlag
8fc0bdfac7
Merge remote-tracking branch 'cc9cii/keep-config-comments'
2015-06-15 16:22:48 +02:00
cc9cii
6b28955f31
Fix attempt to erase using a const_iterator.
2015-06-15 10:26:16 +10:00
cc9cii
36aa4aa9bd
If a removed 'content=' item has comments, keep them in config file for later use.
2015-06-15 09:53:26 +10:00
scrawl
30de47f858
Reduce the number of jobs in .travis.yml
...
Hopefully this fixes the occasional out-of-memory problems. Note travis-CI virtual machines just have 2 virtual cores according to http://docs.travis-ci.com/user/ci-environment/ , so 4 jobs wouldn't improve build times anyway.
2015-06-14 17:12:14 +02:00
Marc Zinnschlag
e17f7ac81a
Merge remote-tracking branch 'cc9cii/master'
2015-06-14 12:50:10 +02:00
Marc Zinnschlag
0994893bc5
Merge remote-tracking branch 'dteviot/FixRunningInCircles'
2015-06-14 12:05:53 +02:00
cc9cii
c22c9c271d
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- allows moving various config entries up or down
- comment lines above config entries stay as a pair
2015-06-14 14:51:01 +10:00
cc9cii
0efe8f5465
Fix broken launcher build for windows.
2015-06-14 14:42:08 +10:00
scrawl
28caeadef4
Improve error message for not found records
2015-06-14 02:31:00 +02:00
scrawl
de98d991b4
Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535."
...
Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2
2015-06-13 23:50:12 +02:00
scrawl
c54a225467
Revert "Allow space characters in front of comments."
...
This reverts commit 4902c66792
2015-06-13 23:49:29 +02:00
scrawl
3bfe167bc0
Revert "Fix loop where there was a potential for double entry."
...
This reverts commit a439f49c4d
2015-06-13 23:49:29 +02:00
scrawl
b7cd62e4de
Revert "Remove user preference setting option."
...
This reverts commit d3b7cf44d3
2015-06-13 23:49:27 +02:00
Stanislav Bas
281088c93b
Add check for an empty sound field to SoundGens verifier
2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c
Add SoundGens verifier
2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8
Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656 .
2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2
Merge remote-tracking branch 'smbas/fix-regionmap-colors'
2015-06-13 11:33:12 +02:00
cc9cii
b81454d226
Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668 .
2015-06-13 14:37:47 +10:00
Stanislav Bas
650e37dba1
RegionMap uses proper colors
2015-06-12 22:31:12 +03:00
scrawl
89c2a7e26b
Fix for possibly missing library on windows
2015-06-12 15:22:19 +02:00
scrawl
e13a938896
Add support to build with Qt5 (Task #2665 )
...
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
2015-06-12 15:13:42 +02:00
scrawl
4b5c2398a1
Remove QTextCodec::setCodecForCStrings
...
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
2015-06-12 02:00:06 +02:00
scrawl
c04f6cf167
Remove unused code
2015-06-12 01:58:13 +02:00
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0
Compile fix for old boost versions
2015-06-11 23:25:26 +02:00
scrawl
6051c47eef
Fix for incorrect QString -> path conversion
2015-06-11 22:36:19 +02:00
dteviot
cb8ca2f03a
Moved logic for building a Sync'ed path from AiCombat to PathFinding.
...
Is now used by AiFollow, which should fix "running in circles" bug caused when recalc a path and closest way point is the one NPC has just passed.
2015-06-11 18:31:35 +12:00
dteviot
6d7e6cd30c
AiTravel logic merged into AiPackage.
2015-06-11 18:28:31 +12:00
Marc Zinnschlag
8d22d26669
Merge remote-tracking branch 'cc9cii/scrollbar-fix'
2015-06-10 18:51:14 +02:00
cc9cii
8e8da724f5
Remove unnecessary comment entry in the config file.
2015-06-10 08:23:38 +10:00
Marc Zinnschlag
f3e040b531
Merge remote-tracking branch 'cc9cii/filter-fix'
2015-06-08 10:42:16 +02:00
cc9cii
893ad11be1
Fix missing columns in tables. Should resolve Bug #2624 .
...
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
2015-06-08 08:04:18 +10:00
Stanislav Bas
c9a8d53240
Merge remote-tracking branch 'upstream/master'
2015-06-07 13:14:50 +03:00
Marc Zinnschlag
211f6a39b8
Merge remote-tracking branch 'cc9cii/keep-comments'
2015-06-07 09:00:37 +02:00
Marc Zinnschlag
d90aff4303
Merge remote-tracking branch 'smbas/feature-id-completion'
2015-06-07 08:52:44 +02:00
cc9cii
d3b7cf44d3
Remove user preference setting option.
2015-06-07 13:29:45 +10:00
cc9cii
a439f49c4d
Fix loop where there was a potential for double entry.
2015-06-07 07:38:52 +10:00
cc9cii
4902c66792
Allow space characters in front of comments.
2015-06-07 07:21:15 +10:00
Stanislav Bas
d63b01dde3
Checkboxes in the table view use a combobox editor
2015-06-06 15:41:25 +03:00
cc9cii
15fe5d88e2
Allow comments (lines starting with # character) and blank lines in openmw.cfg. Should resolve Feature #2535 .
...
- controlled via a checkbox in launcher settings
2015-06-06 20:35:55 +10:00
Stanislav Bas
49512a2b57
Correct the explanation for the Console::acceptCommand()
2015-06-05 22:57:35 +03:00
Stanislav Bas
d2293867ba
Add the explanation to Console::acceptCommand()
2015-06-05 22:44:06 +03:00
Stanislav Bas
58e2d3711f
Reset Console editbox before command execution
2015-06-05 22:00:02 +03:00
