Commit Graph

2195 Commits (9767910f0615e8c5f68502798f1aae0a55bc420b)

Author SHA1 Message Date
scrawl 1869d37cfc Remove unused mLastDrowningHit 10 years ago
Marc Zinnschlag 9603325b99 Merge remote-tracking branch 'origin/master' 10 years ago
Marc Zinnschlag 375d426dd0 check for premature end of scripts more consistently 10 years ago
scrawl d387c207d1 Fix initial scaling for btCompoundShape children (Fixes #2234) 10 years ago
scrawl f11ec653d0 Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
10 years ago
scrawl 883f7ec7ce Move workaround for hiding markers from NIF loader to Scene 10 years ago
Marc Zinnschlag 7cc1ebc05b Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 7b4665c623 Terrain: documentation update 10 years ago
scrawl 261da8dd0a Terrain: use 32-bit indices if necessary 10 years ago
scrawl f7bac58b39 Terrain: change index buffer flags to unsigned 10 years ago
scrawl 41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 10 years ago
scrawl de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 10 years ago
scrawl 04d6cead3b Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133) 10 years ago
Marc Zinnschlag 763e058ed2 Merge remote-tracking branch 'dteviot/master' 10 years ago
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.
10 years ago
Marc Zinnschlag 7c959c8494 Merge remote-tracking branch 'dteviot/Bug811' 10 years ago
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".
10 years ago
Marc Zinnschlag e439065897 Merge remote-tracking branch 'scrawl/master' 10 years ago
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.
10 years ago
scrawl efbc8742a0 Remove some unnecessary includes 10 years ago
Marc Zinnschlag d254bb0a34 Merge remote-tracking branch 'dteviot/FixLoadOrderReset' 10 years ago
scrawl ef7e0070a6 Don't right-shift signed integers which is implementation-defined 10 years ago
Marc Zinnschlag 4b88ef5891 fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it) 10 years ago
dteviot 9d6efcecff Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset
Fixed Conflict:
	components/contentselector/model/contentmodel.cpp
10 years ago
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.
10 years ago
Marc Zinnschlag 38a413a483 Merge remote-tracking branch 'scrawl/master' 10 years ago
Marc Zinnschlag 83e454e493 Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix' 10 years ago
scrawl e19ab77d00 Store camera first person state in savegame (Fixes #2255) 10 years ago
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.
10 years ago
scrawl f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 10 years ago
scrawl afc961d19c Workaround for random AABB assertion due to zero-sized particles (Fixes #1663) 10 years ago
Marc Zinnschlag 365bb3d3f0 Merge remote-tracking branch 'scrawl/unused' 10 years ago
scrawl d919a0186e Comment out unused opSkipOnZero 10 years ago
scrawl 4a734f5cd3 Fall back to top-level directory when looking for resources (Fixes #2169) 10 years ago
Marc Zinnschlag ac7c2a1473 some cleanup 10 years ago
Marc Zinnschlag bbbf431ae3 double bug in script name handling workaround (Fixes #1730) 10 years ago
Marc Zinnschlag 9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 10 years ago
Thoronador 773669952b remove initializing constructors from "dumb structs"
As suggested by Marc Zinnschlag:
https://github.com/OpenMW/openmw/pull/423#issuecomment-68526701
10 years ago
Arthur Moore ad609bff78 components/nif/base.hpp now uses the templated get() function 10 years ago
Arthur Moore 9909c4abad Made incorrect nif get error message more informative. 10 years ago
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.
10 years ago
Arthur Moore 2619d57bb6 Converted most nifstream "get multiple" functions to the templated version 10 years ago
Arthur Moore f318ee0b8c Add a templated option for getting vectors to NIFStream 10 years ago
Arthur Moore 4edc4142f3 Made NIFStream getters templated 10 years ago
Thoronador 9cc219ff76 fix uninitialized members in Pathgrid::Point 10 years ago
Thoronador 87fac78823 fix uninitialized members in Cell and structures 10 years ago
dteviot fb671fed20 Corrected issues found by Scrawl. 10 years ago
scrawl 01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 10 years ago
dteviot 43dd9aee94 Fix for more errors found by Travis CI. 10 years ago
dteviot 93bbd7463a Fixed errors and warnings from Travis CI. 10 years ago
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.
10 years ago
scrawl 363d1f9207 Merge remote-tracking branch 'upstream/master' 10 years ago
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.
10 years ago
scrawl e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 10 years ago
Marc Zinnschlag 82af524a58 Merge remote-tracking branch 'dteviot/master' 10 years ago
scrawl 59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 10 years ago
scrawl b35f87ae7e Improve font file error handling 10 years ago
scrawl c7be850162 Add messagebox escape characters for spell/weapon cycling hotkeys 10 years ago
scrawl f931ba2efc Fix some static analysis issues (coverity) 10 years ago
dteviot ad5d884761 omwlauncher crash when can't read file in active profile (Fixes #1069) 10 years ago
MiroslavR 3cc32b641a Fix some memory leaks 10 years ago
Marc Zinnschlag 120873a66d another workaround for script translation messup 10 years ago
Marc Zinnschlag 057d0913d6 Merge branch 'scriptfixes' 10 years ago
Marc Zinnschlag fc1d42a7d2 fixed exclusion for certain characters at the start of names 10 years ago
Marc Zinnschlag b951251572 handle junk in argument lists (Fixes #2206) 10 years ago
Marc Zinnschlag 5cb94da9c5 compensate for incorrect minus character in translated dialogue script (Fixes #2207) 10 years ago
scrawl 31d28e727f Implement leveled list script functions (Fixes #1546) 10 years ago
scrawl 84b0dcf2e3 Work around particles not being rendered in the first frame 10 years ago
scrawl 8f29f2667e Fix rotation order for XYZ rotation keys (Fixes #1067) 10 years ago
Marc Zinnschlag ed5387fb8c replaced stay [ ignoring implementation with one that does not interfere with other workarounds (Fixes #2205) 10 years ago
Marc Zinnschlag e4f75267d0 in case of arguments not separated with comma the fist token of the next argument was put back incorrectly 10 years ago
Marc Zinnschlag 33d905dc03 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 0ca11eab1c Ignore extra argument for removeItem (Fixes #2208) 10 years ago
Arthur Moore b8edd9bac3 Get a nif file's version string regardless of its length. 10 years ago
Arthur Moore cd835152e1 Fix spacing issue for NIF file errors. 10 years ago
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.
10 years ago
scrawl 2601b26217 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 886903d70e Implement HitAttemptOnMe function (Bug #2078) 10 years ago
scrawl be16f1d0a5 Implement PcForce1stPerson, PcForce3rdPerson, PcGet3rdPerson (Bug #2078) 10 years ago
Marc Zinnschlag cda0363f29 allow a space in the middle of multi-character comparison operators (Fixes #2185) 10 years ago
scrawl fb1aa096be Settings: reduce scope for better readability 10 years ago
scrawl 6eebe9b44c Read NiFogProperty, but don't use it yet (Feature #920) 10 years ago
scrawl e0c6f84546 AiFollow: target has to be seen in order to start following (Fixes #1637) 10 years ago
Marc Zinnschlag 0649373d2e Merge branch 'report' 10 years ago
Marc Zinnschlag 109fbab546 changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1 10 years ago
scrawl 9a1b7cbe52 Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row (Fixes #1986) 10 years ago
scrawl 3f0bc6eecb Ignore extra bytes after the SCVR string list (Fixes #2184) 10 years ago
scrawl 5a25649076 Implement XYZ rotation keys support (Fixes #1067) 10 years ago
scrawl 65536f0857 Load initial particle system state from NIF files (Fixes #2178) 10 years ago
Marc Zinnschlag eb6e1576be Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl b650338d69 Implement drawMode of NiStencilProperty (Feature #1057) 10 years ago
scrawl e6c59f5585 Revert "Allow NIF rotation matrices that include scale values"
This reverts commit f57ddec6a2.

Conflicts:
	components/nif/nifstream.hpp

(Fixes #2168)
10 years ago
root 85b8fca1f0 fixes 10 years ago
root 4e756a2f4a path to game get through jni 10 years ago
scrawl 59cde9b431 Don't use transparency override if there's no transparency (rug fix for Bug #2050) 10 years ago
scrawl 077c619611 Implement Clamp mode for NiTexturingProperty (Fixes #2050) 10 years ago
scrawl dffa8c6c14 Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170) 10 years ago
Marc Zinnschlag 4c1906b999 Merge remote-tracking branch 'cc9cii/master' 10 years ago
cc9cii 5ae1554a75 Simplify skipping moved references (thanks scrawl) 10 years ago
scrawl 5fa7536427 Fix incorrect box shape translation reset
Fixes incorrect placement of collision box for "azura spirit_trib"
10 years ago
cc9cii 33c454e073 Check whether any subrecords remain after skipping moved references. Should resolve bug #2070. 10 years ago
scrawl c1e6b8608b Always create a skeleton if there's an "ArrowBone" node (Fixes #2117) 10 years ago
Marc Zinnschlag cd5d02402f Merge remote-tracking branch 'scrawl/wizard' 10 years ago
scrawl e11bec1a37 Fix the launcher not properly reloading data directories 10 years ago
scrawl 31fab533fe OSX build fix 10 years ago
Marc Zinnschlag 86037149cd add optional string argument for activate instruction (ignored) 10 years ago
scrawl c6558fe487 Fix Ogre being initialised twice 10 years ago
scrawl 751211351c Fix multi-line comment warning 10 years ago
scrawl 4fa303d7c4 Merge branch 'master' into HEAD
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
10 years ago
Marc Zinnschlag 95dfb07816 make [ a whitespace character in scripts (Fixes #2126) 10 years ago
scrawl 273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 92ab292e18 Make MODL subrecord for light records optional (Fixes #2114) 10 years ago
MiroslavR b8d5a9486a Make Restore/Damage Attribute/Skill effects continuous 10 years ago
Arthur Moore 4a9a9855bf NIFStream getUInt should return an unsigned integer 10 years ago
Arthur Moore 4583dc05db Move NIFStream functions into a cpp file where they belong 10 years ago
scrawl ccab8b1a92 Fix bug in TerrainGrid::getWorldBoundingBox (Fixes #2075) 10 years ago
scrawl f7ba1dbfc8 Add error handling for getPcRank and similar defines (Fixes #2071) 10 years ago
scrawl f57ddec6a2 Allow NIF rotation matrices that include scale values (Fixes #2052) 10 years ago
scrawl fc1a897fbf Add comment to WNAM in ESM::Land 10 years ago
scrawl 4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 10 years ago
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.
10 years ago
Arthur Moore 5abed1c32a Print a NIF file's version information when an error occurs 10 years ago
Arthur Moore 9ebf3f2f10 Provide more data when nifstream throws a runtime_error 10 years ago
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.
10 years ago
scrawl 6d7f4085a5 Add shader implementation of alpha test 10 years ago
Marc Zinnschlag a3c894c1e2 Merge branch 'cellmarker' 10 years ago
scrawl 86280df55a DialInfo: Clear SelectStructs from previous loadings when a record is overwritten (Fixes #2017) 10 years ago
scrawl e413bebe99 Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980) 10 years ago
cc9cii 313aed078e Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
	apps/opencs/CMakeLists.txt
10 years ago
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.
10 years ago
cc9cii 809b8c6d5b Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
10 years ago
Marc Zinnschlag a0dbb40c8e Allow script names starting with digits (Fixes #1730) 10 years ago
Marc Zinnschlag 21b16f8425 Merge branch 'tables'
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp
10 years ago
cc9cii 406135ee96 Merge remote-tracking branch 'upstream/master' into terrain 10 years ago
Marc Zinnschlag c85735abed Merge remote-tracking branch 'scrawl/terrain' 10 years ago
scrawl 8786fb639f Implement terrain rendering in OpenCS (Fixes #1597) 10 years ago
sylar 4c46da79de changed android configs paths 10 years ago
cc9cii c9e054cdd7 Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
10 years ago
scrawl eda296f1e3 Remove workaround for Ogre 1.8 (no longer supported) 10 years ago
scrawl 861cc26aa6 Don't sell racial spells (Fixes #1961) 10 years ago
Marc Zinnschlag f4c9897bbd Merge branch 'master' into tables 10 years ago
Marc Zinnschlag d64127106b load and save pathgrid records 10 years ago
scrawl c010c28337 Implement ToggleWorld instruction 10 years ago
cc9cii 687b62dfd3 Revert some changes (mostly iostream adds) 10 years ago
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
10 years ago
scrawl e9ed0211c9 Attempt to fix Clang warnings 10 years ago
scrawl 4b8ea25cf0 Add missing case folding for dependency filenames (Fixes #1940) 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 790e0150b1 Fix global map markers being duplicated when cell is visited again 10 years ago
scrawl 6b82e3665b Remove old nifbullet test 10 years ago
scrawl 487e318ede Remove old niftool test 10 years ago
scrawl fc4f069d0f Remove old BSA tests 10 years ago
Marc Zinnschlag 850dbb55a5 improved magic effect IDs 10 years ago
scrawl 0bc840aadd Add NumericEditBox widget 10 years ago
scrawl e4c097b4f7 Fix wrong default ExpandDirection for AutoSizedButton 10 years ago
scrawl 6b65502557 Add properties for new widget classes to MyGUI plugin 10 years ago
Marc Zinnschlag 58a9176c18 preparing magic effects record for use in OpenCS 10 years ago
scrawl 1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 10 years ago
scrawl 45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 10 years ago
Marc Zinnschlag 02247fe712 load and save sound gen records 10 years ago
Marc Zinnschlag 147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix'
Conflicts:
	CMakeLists.txt
10 years ago
slothlife 35ced14e45 Fix for MSVC warnings 10 years ago
eroen 0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 10 years ago
Marc Zinnschlag 89beecad8c Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 4d6ebfb496 Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934) 10 years ago
scrawl 144c818b41 Throw an exception if a required Ogre plugin is not found 10 years ago
scrawl dec9ffdb6c ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932) 10 years ago
Sebastian Wick 41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Marc Zinnschlag d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
10 years ago
Marc Zinnschlag bf6150d009 allow project scope scripts 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
scrawl a413e91442 ImageButton: get texture size from MyGUI, rather than from Ogre 10 years ago
scrawl c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 10 years ago
scrawl ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 10 years ago
scrawl ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 10 years ago
Marc Zinnschlag 9ae9104a45 Merge branch 'openmw-32' 10 years ago
Marc Zinnschlag 14f32563e7 fixed script compiler code ordering issue 10 years ago
scrawl f3f869e99a Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction 10 years ago
Marc Zinnschlag d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 10 years ago
Rohit Nirmal e315a72582 Remove extra semicolons at the end of some lines. 10 years ago
Marco Melletti 9b6faa2ffa wrong rearrangement fixes
misleading comments fixed
10 years ago
Marco Melletti e1393ad2df reputation sorted out 10 years ago
Marco Melletti 2e47290ed0 finished loadnpc.hpp, fixed npdt 52byte structure 10 years ago
scrawl 1c178768f5 Allow Script records with missing SCDT (precompiled code, not used anyway)
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
10 years ago
Marco Melletti bc7e154643 done with header files, unsure about mSkills and mReputation in
loadnpc.hpp
10 years ago
Marco Melletti 8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 10 years ago
scrawl 819234cdfe Use rbegin() instead of --end() 10 years ago
scrawl 9809748eba Store NIF keys mapped by time and use lower_bound for searches 10 years ago
scrawl 0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 10 years ago
scrawl 267cf4e140 Implement ResetActors script instruction (Fixes #1859) 10 years ago
Marc Zinnschlag 2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 10 years ago
Rohit Nirmal b5eb16b663 Silence some scan-build warnings. 10 years ago
cc9cii df87859d7c Move the workaround to loadscpt.cpp as per feedback comments. 10 years ago
Marc Zinnschlag ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii 7ff1136d81 For compiling in Windows with MSVC. 11 years ago
scrawl 4f92044d71 Allow user-created markers on local map (Fixes #1571) 11 years ago
scrawl c2a91148f3 Implement multiple emitter nodes for NiBSPArrayController
The particles for the flame, frost and storm atronachs work correctly now.
11 years ago
scrawl 44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 11 years ago
Marc Zinnschlag f1f38fc786 Merge remote-tracking branch 'miroslavr/master' 11 years ago