Commit graph

2031 commits

Author SHA1 Message Date
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
04d6cead3b Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133) 2015-01-12 23:29:57 +01:00
Marc Zinnschlag
7c959c8494 Merge remote-tracking branch 'dteviot/Bug811' 2015-01-11 12:30:32 +01: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
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
efbc8742a0 Remove some unnecessary includes 2015-01-09 21:13:57 +01:00
Marc Zinnschlag
d254bb0a34 Merge remote-tracking branch 'dteviot/FixLoadOrderReset' 2015-01-09 09:32:23 +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
Marc Zinnschlag
83e454e493 Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix' 2015-01-07 12:29:09 +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
f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 2015-01-06 16:11:05 +01:00
scrawl
afc961d19c Workaround for random AABB assertion due to zero-sized particles (Fixes #1663) 2015-01-05 20:32:26 +01:00
Marc Zinnschlag
365bb3d3f0 Merge remote-tracking branch 'scrawl/unused' 2015-01-05 20:05:23 +01:00
scrawl
d919a0186e Comment out unused opSkipOnZero 2015-01-05 18:54:52 +01:00
scrawl
4a734f5cd3 Fall back to top-level directory when looking for resources (Fixes #2169) 2015-01-03 19:10:15 +01:00
Marc Zinnschlag
ac7c2a1473 some cleanup 2015-01-03 13:59:59 +01:00
Marc Zinnschlag
bbbf431ae3 double bug in script name handling workaround (Fixes #1730) 2015-01-03 13:54:46 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Thoronador
773669952b remove initializing constructors from "dumb structs"
As suggested by Marc Zinnschlag:
https://github.com/OpenMW/openmw/pull/423#issuecomment-68526701
2015-01-02 16:30:14 +01:00
Arthur Moore
ad609bff78 components/nif/base.hpp now uses the templated get() function 2015-01-02 01:19:34 -05:00
Arthur Moore
9909c4abad Made incorrect nif get error message more informative. 2015-01-02 01:16:47 -05:00
Arthur Moore
c1315ed90c Build the nif file tester by default
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
2015-01-01 22:49:33 -05:00
Arthur Moore
2619d57bb6 Converted most nifstream "get multiple" functions to the templated version 2015-01-01 22:49:05 -05:00
Arthur Moore
f318ee0b8c Add a templated option for getting vectors to NIFStream 2015-01-01 22:45:55 -05:00
Arthur Moore
4edc4142f3 Made NIFStream getters templated 2015-01-01 21:39:44 -05:00
Thoronador
9cc219ff76 fix uninitialized members in Pathgrid::Point 2015-01-02 01:22:53 +01:00
Thoronador
87fac78823 fix uninitialized members in Cell and structures 2015-01-02 01:01:37 +01:00
dteviot
fb671fed20 Corrected issues found by Scrawl. 2015-01-01 15:53:35 +13:00
scrawl
01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 2015-01-01 03:38:49 +01:00
dteviot
43dd9aee94 Fix for more errors found by Travis CI. 2015-01-01 10:13:27 +13:00
dteviot
93bbd7463a Fixed errors and warnings from Travis CI. 2015-01-01 09:40:42 +13:00
dteviot
dfbd470613 Adjust plug-in order to match profile loading.
Also marks plug-ins with load order problems in red and changes tool tip to describe error.
2014-12-31 19:19:54 +13:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
Marco Schulze
3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
2014-12-30 18:37:33 -03:00
scrawl
e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 2014-12-30 01:36:31 +01:00
Marc Zinnschlag
82af524a58 Merge remote-tracking branch 'dteviot/master' 2014-12-26 16:21:18 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
b35f87ae7e Improve font file error handling 2014-12-24 15:45:13 +01:00
scrawl
c7be850162 Add messagebox escape characters for spell/weapon cycling hotkeys 2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
dteviot
ad5d884761 omwlauncher crash when can't read file in active profile (Fixes #1069) 2014-12-24 10:22:26 +13:00
MiroslavR
3cc32b641a Fix some memory leaks 2014-12-23 20:44:25 +01:00
Marc Zinnschlag
120873a66d another workaround for script translation messup 2014-12-18 10:40:51 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00