1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Commit graph

12588 commits

Author SHA1 Message Date
scrawl
1780bcc238 Print RefNum in BetaComment 2015-01-11 17:04:58 +01:00
scrawl
4d4f2fc475 Add maximum distance for teleporting followers on using a door 2015-01-11 17:04:58 +01:00
scrawl
b108fbe986 Remove incorrect implementation of fGreetDistanceReset
This can't be right. A reset distance of 512 is smaller than the maximum greeting distance for certain NPCs, which would then say greetings non-stop.
2015-01-11 17:04:58 +01:00
scrawl
716e14a37a Print missing savegame dependencies on the console 2015-01-11 17:04:58 +01:00
scrawl
e2fe9693f3 Add missing tooltips in edit effect dialog 2015-01-11 17:04:58 +01:00
Marc Zinnschlag
7c959c8494 Merge remote-tracking branch 'dteviot/Bug811' 2015-01-11 12:30:32 +01:00
Marc Zinnschlag
289a912817 Merge remote-tracking branch 'scrawl/master' 2015-01-11 12:24:51 +01:00
dteviot
458b82c308 Centralized "fish can't attack non-swimmer" logic. 2015-01-11 14:25:46 +13:00
dteviot
7aa0f887c0 Minor changes to ESM::RefNum
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
2015-01-11 12:20:22 +13:00
scrawl
f9227beedd Add warning when loading a savegame that depends on non-existing content files (Fixes #2261) 2015-01-11 00:06:52 +01:00
scrawl
579f5d232f Move interactive messageBox to separate function 2015-01-10 23:23:48 +01:00
scrawl
91571f51be Ogre crash workaround (Fixes #1745) 2015-01-10 22:45:08 +01:00
dteviot
fcbf7d7deb Fixed string formatting minor error found by Mingun. 2015-01-11 08:33:33 +13:00
Marc Zinnschlag
595c08817f Merge remote-tracking branch 'scrawl/master' 2015-01-10 17:02:46 +01:00
scrawl
c37c071dfe Repository name fix 2015-01-10 16:07:12 +01:00
scrawl
2d51d599ea Adjust coverity config to official repo 2015-01-10 15:57:13 +01:00
scrawl
bf1739ae2c Adjust COVERITY_SCAN_TOKEN 2015-01-10 15:54:38 +01:00
scrawl
3378dece60 Add coverity_scan branch to .travis.yml 2015-01-10 15:54:38 +01:00
scrawl
412496e28c Enable coverity scan for Travis CI 2015-01-10 15:54:38 +01:00
scrawl
37bea9d4dc Fix exception for empty dialog topics (Fixes #2267) 2015-01-10 15:06:30 +01:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
dteviot
05b89be8bf Launcher sets content list to match values in openmw.cfg (Fixes #811)
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
2015-01-10 18:46:47 +13:00
scrawl
5b9d10f851 Reduce includes in MWGui 2015-01-10 03:56:06 +01:00
dteviot
063388e0eb Change "Profile" to "Content List" in user visible strings in Launcher. (Fixes #810) 2015-01-10 15:04:45 +13:00
scrawl
728b842e72 Use MyGUI::utility in favor of boost lexical_cast 2015-01-10 03:01:01 +01:00
scrawl
eecea4131f Reduce MyGUI includes 2015-01-10 02:50:43 +01:00
scrawl
4b704f665f Reduce includes, move DragAndDrop to separate file 2015-01-10 01:21:17 +01:00
scrawl
eb99ed697b Reduce includes 2015-01-10 01:00:52 +01:00
scrawl
66e7e04807 UnitTests: add another dialogue keyword test 2015-01-10 00:29:07 +01:00
scrawl
2ac23008f5 Remove an old workaround (Fixes #2263)
The workaround was added when we were still using OIS for input. It doesn't seem to be needed with SDL.
2015-01-10 00:07:55 +01:00
scrawl
efbc8742a0 Remove some unnecessary includes 2015-01-09 21:13:57 +01:00
scrawl
dfdf26e95e Add assertion to Store 2015-01-09 20:58:53 +01:00
scrawl
1b302b750c UnitTests: add tests for KeywordSearch conflict resolution 2015-01-09 20:53:49 +01:00
scrawl
9d07edda13 UnitTests: remove GMock which wasn't used anyway, and the gmock headers fail to compile together with gtest on ubuntu 14.04 2015-01-09 20:53:43 +01:00
scrawl
ce2cbab402 Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow) 2015-01-09 20:08:52 +01:00
Marc Zinnschlag
4e7f7baf8b Merge remote-tracking branch 'dteviot/Bug2076' 2015-01-09 13:57:21 +01:00
dteviot
64cd1396ac Fixed minor issues.
1. Renamed "hightRatio" to "heightRatio".
2. Replaced magic numbers with named constants.
2015-01-09 22:17:53 +13:00
dteviot
7fe2f86d06 Slaughter fish attacks when player only knee deep in water (Fixes #2076) 2015-01-09 21:40:53 +13:00
Marc Zinnschlag
d254bb0a34 Merge remote-tracking branch 'dteviot/FixLoadOrderReset' 2015-01-09 09:32:23 +01:00
scrawl
65ab31eae6 Remove now redundant Store::setUp implementation 2015-01-09 04:31:02 +01:00
scrawl
ddd6e682bc Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
scrawl
c77660ba20 Remove some nonsense code 2015-01-09 01:59:38 +01:00
scrawl
2ddbe22da3 Fix for NPC store clearDynamic bug
It was clearing the whole mShared vector, instead of only the dynamic part. Actually, that whole overload was pointless to begin with. All it does is making sure the Player record isn't cleared, but ESMStore::clearDynamic re-inserts the player record anyway after clearing.
2015-01-09 01:59:32 +01:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
d31ae2b345 Fix mIds mapping for dynamic records being lost on save/reload 2015-01-08 16:27:13 +01:00
scrawl
928b9ee41b Fix missing GUI mode update when showing soulgem dialog 2015-01-08 16:27:13 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
Marc Zinnschlag
4b88ef5891 fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it) 2015-01-08 13:59:03 +01:00
dteviot
9d6efcecff Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
Fixed Conflict:
	components/contentselector/model/contentmodel.cpp
2015-01-08 12:15:48 +13:00
dteviot
083de62be5 Fixed issues found by Zinnschlag.
1. Errors found are added to default tool tip text. (Instead of replacing it.)
2. If multiple errors are found, all are shown in tool tip text, not just first one.
3. Load Order Errors are updated when files are activated/deactivated, not just when the files have their position in list changed.
2015-01-08 11:18:42 +13:00