scrawl
23ffd33d9e
Convert readme to markdown
2015-01-10 16:27:15 +01:00
Marc Zinnschlag
e439065897
Merge remote-tracking branch 'scrawl/master'
2015-01-10 11:33:04 +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
Marc Zinnschlag
38a413a483
Merge remote-tracking branch 'scrawl/master'
2015-01-07 20:22:15 +01:00
scrawl
94002b0758
Add freedesktop.org mimeinfo for OpenMW save game files
...
This allows us to launch OpenMW when the user opens a save game file through the file manager.
2015-01-07 15:08:57 +01:00
scrawl
4684014a83
Use .omwsave extension for save game files
2015-01-07 15:06:39 +01:00
Marc Zinnschlag
83e454e493
Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix'
2015-01-07 12:29:09 +01:00
Marc Zinnschlag
e830998739
Merge remote-tracking branch 'scrawl/cmdline-savegame'
2015-01-07 12:16:03 +01:00
scrawl
13c5bd5cc2
Enchanting: fix skill-based cast cost bonus being applied twice
2015-01-07 04:41:12 +01:00
scrawl
ef1b0a191b
Revert "Enchanting: fix inverted self-enchant success chance"
...
It wasn't inverted to begin with. The author of this commit is an idiot.
2015-01-07 03:48:16 +01:00
scrawl
4e92f6ab48
Add commandline option to load a save game on startup
2015-01-07 03:27:24 +01:00
scrawl
157438460b
Fix being able to activate objects when paralyzed
2015-01-07 02:34:29 +01:00
scrawl
dc5ed5b861
Remove weather particles underwater ( Fixes #2010 )
2015-01-07 02:34:29 +01:00
scrawl
d02e075bab
Add setting for exterior cell grid size ( Fixes #1537 )
2015-01-07 02:34:29 +01:00
scrawl
a17252eab3
Remove unused checkWaypoint function
...
It was an almost exact copy of the checkPathCompleted function anyway.
2015-01-07 02:34:28 +01:00
scrawl
4d9100091d
Reduce default pathing arrival tolerance to 32 units ( Fixes #1605 )
2015-01-07 02:34:28 +01:00
scrawl
e19ab77d00
Store camera first person state in savegame ( Fixes #2255 )
2015-01-07 02:34:24 +01:00
scrawl
c6c7d102d0
Revert "components/nif/base.hpp now uses the templated get() function"
...
This reverts commit ad609bff78
.
Revert "Made incorrect nif get error message more informative."
This reverts commit 9909c4abad
.
Revert "Build the nif file tester by default"
This reverts commit c1315ed90c
.
Revert "Converted most nifstream "get multiple" functions to the templated version"
This reverts commit 2619d57bb6
.
Revert "Add a templated option for getting vectors to NIFStream"
This reverts commit f318ee0b8c
.
Revert "Made NIFStream getters templated"
This reverts commit 4edc4142f3
.
2015-01-06 23:36:15 +01:00
scrawl
992b87ea44
Reset existing summons when the spell is re-casted ( Fixes #2135 )
2015-01-06 16:11:10 +01:00
scrawl
f267497c03
Allow separate summoned creature instances for each spell ID ( Fixes #2194 )
2015-01-06 16:11:05 +01:00
Marc Zinnschlag
31f6ccdf4d
Merge remote-tracking branch 'internecine/bug2031'
2015-01-06 09:43:59 +01:00
Internecine
e1fdcb608e
Fixed incorrect index
2015-01-06 15:00:24 +13:00
scrawl
464f8abb3f
List exterior cell names in tab completion ( Fixes #2252 )
2015-01-06 01:10:09 +01:00
scrawl
afc961d19c
Workaround for random AABB assertion due to zero-sized particles ( Fixes #1663 )
2015-01-05 20:32:26 +01:00
scrawl
708dbc2518
Crime fix
2015-01-05 20:31:50 +01:00
scrawl
c343a5c803
stopCombat fix
2015-01-05 20:31:50 +01:00
Marc Zinnschlag
365bb3d3f0
Merge remote-tracking branch 'scrawl/unused'
2015-01-05 20:05:23 +01:00
scrawl
e6be979350
Fix default position for spell window
2015-01-05 18:57:23 +01:00
scrawl
c1955ef7fa
Fix enchanting dialog effect labels showing a duration for constant effects
2015-01-05 18:57:08 +01:00