Commit Graph

13607 Commits (675884ba30119269ae4a6d0c193437385f87c203)
 

Author SHA1 Message Date
Marc Zinnschlag 675884ba30 Merge remote-tracking branch 'smbas/feature-soundgen-verifier' 10 years ago
Marc Zinnschlag 8fc0bdfac7 Merge remote-tracking branch 'cc9cii/keep-config-comments' 10 years ago
cc9cii 6b28955f31 Fix attempt to erase using a const_iterator. 10 years ago
cc9cii 36aa4aa9bd If a removed 'content=' item has comments, keep them in config file for later use. 10 years ago
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.
10 years ago
Marc Zinnschlag e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 10 years ago
Marc Zinnschlag 0994893bc5 Merge remote-tracking branch 'dteviot/FixRunningInCircles' 10 years ago
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
10 years ago
cc9cii 0efe8f5465 Fix broken launcher build for windows. 10 years ago
scrawl 28caeadef4 Improve error message for not found records 10 years ago
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.

Conflicts:
	components/config/gamesettings.cpp
10 years ago
scrawl c54a225467 Revert "Allow space characters in front of comments."
This reverts commit 4902c66792.
10 years ago
scrawl 3bfe167bc0 Revert "Fix loop where there was a potential for double entry."
This reverts commit a439f49c4d.
10 years ago
scrawl b7cd62e4de Revert "Remove user preference setting option."
This reverts commit d3b7cf44d3.
10 years ago
Stanislav Bas 281088c93b Add check for an empty sound field to SoundGens verifier 10 years ago
Stanislav Bas 2c15ad5e0c Add SoundGens verifier 10 years ago
cc9cii 5b6984d8d8 Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656. 10 years ago
Marc Zinnschlag c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 10 years ago
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. 10 years ago
Stanislav Bas 650e37dba1 RegionMap uses proper colors 10 years ago
scrawl 89c2a7e26b Fix for possibly missing library on windows 10 years ago
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.
10 years ago
scrawl 4b5c2398a1 Remove QTextCodec::setCodecForCStrings
Not needed, we're using QString::fromUtf8/toUtf8 to handle encodings correctly.
10 years ago
scrawl c04f6cf167 Remove unused code 10 years ago
scrawl 45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 10 years ago
scrawl cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 10 years ago
scrawl fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 10 years ago
scrawl d03880fbf0 Compile fix for old boost versions 10 years ago
scrawl 6051c47eef Fix for incorrect QString -> path conversion 10 years ago
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.
10 years ago
dteviot 6d7e6cd30c AiTravel logic merged into AiPackage. 10 years ago
Marc Zinnschlag 8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 10 years ago
cc9cii 8e8da724f5 Remove unnecessary comment entry in the config file. 10 years ago
Marc Zinnschlag f3e040b531 Merge remote-tracking branch 'cc9cii/filter-fix' 10 years ago
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.
10 years ago
Stanislav Bas c9a8d53240 Merge remote-tracking branch 'upstream/master' 10 years ago
Marc Zinnschlag 211f6a39b8 Merge remote-tracking branch 'cc9cii/keep-comments' 10 years ago
Marc Zinnschlag d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 10 years ago
cc9cii d3b7cf44d3 Remove user preference setting option. 10 years ago
cc9cii a439f49c4d Fix loop where there was a potential for double entry. 10 years ago
cc9cii 4902c66792 Allow space characters in front of comments. 10 years ago
Stanislav Bas d63b01dde3 Checkboxes in the table view use a combobox editor 10 years ago
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
10 years ago
Stanislav Bas 49512a2b57 Correct the explanation for the Console::acceptCommand() 10 years ago
Stanislav Bas d2293867ba Add the explanation to Console::acceptCommand() 10 years ago
Stanislav Bas 58e2d3711f Reset Console editbox before command execution 10 years ago
cc9cii 5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 10 years ago
Stanislav Bas c40987338d Scrollbars don't save their positions between openings 10 years ago
Stanislav Bas bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 10 years ago
Stanislav Bas b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 10 years ago