mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:19:55 +00:00
Code Issues Releases Wiki Activity
12936 commits 38 branches 54 tags 122 MiB
Commit graph

2133 commits

Author SHA1 Message Date
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
763e058ed2 Merge remote-tracking branch 'dteviot/master' 2015-01-12 10:41:04 +01:00
dteviot
e95b513cfc Use icon to show files with problem (Fixes #2268) 
Launcher now indicates files with problem using an icon.
Using red text for files with load order issue removed because it doesn't work well with dark themes.
 2015-01-12 21:17:41 +13: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
Marc Zinnschlag
fc1d42a7d2 fixed exclusion for certain characters at the start of names 2014-12-18 09:55:26 +01:00
Marc Zinnschlag
b951251572 handle junk in argument lists (Fixes #2206) 2014-12-17 15:03:05 +01:00
Marc Zinnschlag
5cb94da9c5 compensate for incorrect minus character in translated dialogue script (Fixes #2207) 2014-12-17 11:56:54 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
84b0dcf2e3 Work around particles not being rendered in the first frame 2014-12-15 18:19:05 +01:00
scrawl
8f29f2667e Fix rotation order for XYZ rotation keys (Fixes #1067) 2014-12-13 15:49:32 +01:00
Marc Zinnschlag
ed5387fb8c replaced stay [ ignoring implementation with one that does not interfere with other workarounds (Fixes #2205) 2014-12-13 15:43:40 +01:00
Marc Zinnschlag
e4f75267d0 in case of arguments not separated with comma the fist token of the next argument was put back incorrectly 2014-12-13 15:40:24 +01:00
Marc Zinnschlag
33d905dc03 Merge remote-tracking branch 'scrawl/master' 2014-12-13 12:37:57 +01:00
scrawl
0ca11eab1c Ignore extra argument for removeItem (Fixes #2208) 2014-12-13 02:39:56 +01:00
Arthur Moore
b8edd9bac3 Get a nif file's version string regardless of its length. 2014-12-12 02:01:46 -05:00
Arthur Moore
cd835152e1 Fix spacing issue for NIF file errors. 2014-12-12 02:01:46 -05:00
Arthur Moore
018f4e6895 Fail early if trying to read a string larger than the nif file size. 
This is much better than failing after a few minutes with an out of memory error.
 2014-12-12 02:01:46 -05:00
scrawl
2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-12-11 22:44:58 +01:00
scrawl
886903d70e Implement HitAttemptOnMe function (Bug #2078) 2014-12-11 22:25:41 +01:00
scrawl
be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 2014-12-11 21:00:02 +01:00
Marc Zinnschlag
cda0363f29 allow a space in the middle of multi-character comparison operators (Fixes #2185) 2014-12-11 13:51:37 +01:00
scrawl
fb1aa096be Settings: reduce scope for better readability 2014-12-10 21:46:36 +01:00
scrawl
6eebe9b44c Read NiFogProperty, but don't use it yet (Feature #920) 2014-12-10 20:51:32 +01:00
scrawl
e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 2014-12-09 22:25:28 +01:00
Marc Zinnschlag
0649373d2e Merge branch 'report' 2014-12-08 19:01:38 +01:00
Marc Zinnschlag
109fbab546 changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1 2014-12-07 16:02:28 +01:00
scrawl
9a1b7cbe52 Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986) 2014-12-06 16:50:09 +01:00
scrawl
3f0bc6eecb Ignore extra bytes after the SCVR string list (Fixes #2184) 2014-12-05 23:36:06 +01:00
scrawl
5a25649076 Implement XYZ rotation keys support (Fixes #1067) 2014-12-05 20:58:03 +01:00
scrawl
65536f0857 Load initial particle system state from NIF files (Fixes #2178) 2014-12-05 18:00:30 +01:00
Marc Zinnschlag
eb6e1576be Merge remote-tracking branch 'scrawl/master' 2014-12-03 20:17:34 +01:00
scrawl
b650338d69 Implement drawMode of NiStencilProperty (Feature #1057) 2014-12-03 18:28:35 +01:00
scrawl
e6c59f5585 Revert "Allow NIF rotation matrices that include scale values" 
This reverts commit f57ddec6a2.

Conflicts:
	components/nif/nifstream.hpp

(Fixes #2168)
 2014-12-03 18:28:35 +01:00
root
85b8fca1f0 fixes 2014-12-03 01:11:50 +04:00
root
4e756a2f4a path to game get through jni 2014-12-03 01:03:27 +04:00
scrawl
59cde9b431 Don't use transparency override if there's no transparency (rug fix for Bug #2050) 2014-12-01 23:09:46 +01:00
scrawl
077c619611 Implement Clamp mode for NiTexturingProperty (Fixes #2050) 2014-12-01 23:09:46 +01:00
scrawl
dffa8c6c14 Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170) 2014-11-30 22:02:25 +01:00
Marc Zinnschlag
4c1906b999 Merge remote-tracking branch 'cc9cii/master' 2014-11-29 21:00:59 +01:00
cc9cii
5ae1554a75 Simplify skipping moved references (thanks scrawl) 2014-11-30 04:00:06 +11:00
scrawl
5fa7536427 Fix incorrect box shape translation reset 
Fixes incorrect placement of collision box for "azura spirit_trib"
 2014-11-29 16:50:42 +01:00
cc9cii
33c454e073 Check whether any subrecords remain after skipping moved references. Should resolve bug #2070. 2014-11-29 20:39:25 +11:00
scrawl
c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 2014-11-23 16:37:31 +01:00
Marc Zinnschlag
cd5d02402f Merge remote-tracking branch 'scrawl/wizard' 2014-11-21 09:48:57 +01:00
scrawl
e11bec1a37 Fix the launcher not properly reloading data directories 2014-11-20 22:36:24 +01:00
scrawl
31fab533fe OSX build fix 2014-11-20 18:14:49 +01:00
Marc Zinnschlag
86037149cd add optional string argument for activate instruction (ignored) 2014-11-20 11:06:32 +01:00
scrawl
c6558fe487 Fix Ogre being initialised twice 2014-11-19 13:19:02 +01:00
scrawl
751211351c Fix multi-line comment warning 2014-11-18 17:54:24 +01:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 2014-11-18 17:43:51 +01:00
Marc Zinnschlag
95dfb07816 make [ a whitespace character in scripts (Fixes #2126) 2014-11-15 09:53:08 +01:00
scrawl
273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-11-11 15:43:46 +01:00
scrawl
92ab292e18 Make MODL subrecord for light records optional (Fixes #2114) 2014-11-09 04:50:54 +01:00
MiroslavR
b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 2014-11-08 00:57:03 +01:00
Arthur Moore
4a9a9855bf NIFStream getUInt should return an unsigned integer 2014-10-31 05:01:26 -04:00
Arthur Moore
4583dc05db Move NIFStream functions into a cpp file where they belong 2014-10-31 04:54:16 -04:00
scrawl
ccab8b1a92 Fix bug in TerrainGrid::getWorldBoundingBox (Fixes #2075) 2014-10-29 16:01:55 +01:00
scrawl
f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 2014-10-28 16:07:37 +01:00
scrawl
f57ddec6a2 Allow NIF rotation matrices that include scale values (Fixes #2052) 2014-10-27 21:53:00 +01:00
scrawl
fc1a897fbf Add comment to WNAM in ESM::Land 2014-10-27 21:53:00 +01:00
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
Arthur Moore
38bcff2622 Moved base NIF classes into a separate file. 
This resolves the dependency mess, and makes things more readable.
The dependency tree for nif records now looks like this:
Record.hpp
--base.hpp
----controlled.hpp
----controller.hpp
----data.hpp
----effect.hpp
----extra.hpp
----node.hpp

Node.hpp has many extra dependencies because nifogre only includes it instead of each of these files.
That should be fixed.
 2014-10-19 03:01:30 -04:00
Arthur Moore
5abed1c32a Print a NIF file's version information when an error occurs 2014-10-19 02:54:27 -04:00
Arthur Moore
9ebf3f2f10 Provide more data when nifstream throws a runtime_error 2014-10-19 02:42:28 -04:00
scrawl
bf0669e18c Ignore some extra string arguments to ShowMap (Fixes #2029) 
Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching.
 2014-10-18 00:56:41 +02:00
scrawl
6d7f4085a5 Add shader implementation of alpha test 2014-10-17 19:11:06 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +02:00
scrawl
86280df55a DialInfo: Clear SelectStructs from previous loadings when a record is overwritten (Fixes #2017) 2014-10-16 19:35:20 +02:00
scrawl
e413bebe99 Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980) 2014-10-16 15:07:51 +02:00
cc9cii
313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
Conflicts:
	apps/opencs/CMakeLists.txt
 2014-10-13 20:45:30 +11:00
Thoronador
4d62541b62 fix usage of numeric_limits static functions min() and max() 
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
 2014-10-12 23:28:16 +02:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
Marc Zinnschlag
a0dbb40c8e Allow script names starting with digits (Fixes #1730) 2014-10-11 14:48:52 +02:00
Marc Zinnschlag
21b16f8425 Merge branch 'tables' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
 2014-10-10 16:11:54 +02:00
cc9cii
406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 2014-10-09 23:47:30 +01:00
Marc Zinnschlag
c85735abed Merge remote-tracking branch 'scrawl/terrain' 2014-10-09 12:56:42 +02:00
scrawl
8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 2014-10-08 17:17:31 +02:00
sylar
4c46da79de changed android configs paths 2014-10-07 23:31:22 +04:00
cc9cii
c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre 
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
 2014-10-04 06:20:10 +10:00
scrawl
eda296f1e3 Remove workaround for Ogre 1.8 (no longer supported) 2014-10-02 16:50:10 +02:00
scrawl
861cc26aa6 Don't sell racial spells (Fixes #1961) 2014-10-02 16:50:05 +02:00
Marc Zinnschlag
f4c9897bbd Merge branch 'master' into tables 2014-10-02 15:49:36 +02:00
Marc Zinnschlag
d64127106b load and save pathgrid records 2014-10-02 12:30:15 +02:00
scrawl
c010c28337 Implement ToggleWorld instruction 2014-09-30 15:54:09 +02:00
cc9cii
687b62dfd3 Revert some changes (mostly iostream adds) 2014-09-30 18:46:26 +10:00
cc9cii
312b7cd571 Merge branch 'master' into QtOGre 
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
 2014-09-30 10:52:04 +10:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
scrawl
4b8ea25cf0 Add missing case folding for dependency filenames (Fixes #1940) 2014-09-26 20:47:53 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
790e0150b1 Fix global map markers being duplicated when cell is visited again 2014-09-26 16:51:48 +02:00
scrawl
6b82e3665b Remove old nifbullet test 2014-09-26 16:10:55 +02:00
scrawl
487e318ede Remove old niftool test 2014-09-26 15:25:51 +02:00
scrawl
fc4f069d0f Remove old BSA tests 2014-09-26 15:22:08 +02:00
Marc Zinnschlag
850dbb55a5 improved magic effect IDs 2014-09-26 13:36:54 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
e4c097b4f7 Fix wrong default ExpandDirection for AutoSizedButton 2014-09-25 19:22:26 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
Marc Zinnschlag
58a9176c18 preparing magic effects record for use in OpenCS 2014-09-25 14:16:00 +02:00
scrawl
1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 2014-09-25 00:04:38 +02:00
scrawl
45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 2014-09-24 12:21:19 +02:00
Marc Zinnschlag
02247fe712 load and save sound gen records 2014-09-23 12:20:02 +02:00
Marc Zinnschlag
147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix' 
Conflicts:
	CMakeLists.txt
 2014-09-23 08:57:49 +02:00
slothlife
35ced14e45 Fix for MSVC warnings 2014-09-22 21:33:09 -05:00