openmw

mirror of https://github.com/OpenMW/openmw.git synced 2025-02-03 19:45:34 +00:00

Author	SHA1	Message	Date
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
eroen	0738e862cb	Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable	2014-09-22 15:36:42 +02:00
Marc Zinnschlag	89beecad8c	Merge remote-tracking branch 'scrawl/master'	2014-09-21 12:24:53 +02:00
scrawl	4d6ebfb496	Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934 )	2014-09-20 17:13:51 +02:00
scrawl	144c818b41	Throw an exception if a required Ogre plugin is not found	2014-09-20 16:12:52 +02:00
scrawl	dec9ffdb6c	ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932 )	2014-09-20 13:34:20 +02:00
Sebastian Wick	41094a8641	the global config path is not always $prefix/etc, so just define the whole path in the build system	2014-09-19 20:23:39 +02:00
Sebastian Wick	2ae8158ee9	SYSCONFDIR and LinuxPath should work with different install prefixs	2014-09-19 03:15:28 +02:00
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	2014-09-14 11:59:54 +02:00
Marc Zinnschlag	bf6150d009	allow project scope scripts	2014-09-14 11:41:28 +02:00
Marc Zinnschlag	9b7f61b4ba	Merge remote-tracking branch 'scrawl/myguiplugin'	2014-09-14 10:45:26 +02:00
scrawl	a413e91442	ImageButton: get texture size from MyGUI, rather than from Ogre	2014-09-12 05:17:45 +02:00
scrawl	c6bcd75058	Add various custom widgets used in OpenMW to the MyGUI plugin	2014-09-12 05:14:21 +02:00
scrawl	ee3b1e800c	Add FontLoader and transparent BG texture to the MyGUI plugin	2014-09-12 04:27:23 +02:00
scrawl	ecfc2ff5d0	Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools	2014-09-11 23:33:54 +02:00
Marc Zinnschlag	9ae9104a45	Merge branch 'openmw-32'	2014-09-11 14:22:07 +02:00
Marc Zinnschlag	14f32563e7	fixed script compiler code ordering issue	2014-09-09 13:55:10 +02:00
scrawl	f3f869e99a	Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction	2014-09-07 23:47:57 +02:00
Marc Zinnschlag	d4c27d4ce0	Merge remote-tracking branch 'mellotanica/master'	2014-09-07 10:10:54 +02:00
Rohit Nirmal	e315a72582	Remove extra semicolons at the end of some lines.	2014-09-06 13:04:52 -05:00
Marco Melletti	9b6faa2ffa	wrong rearrangement fixes misleading comments fixed	2014-09-06 17:04:50 +02:00
Marco Melletti	e1393ad2df	reputation sorted out	2014-09-06 15:16:04 +02:00
Marco Melletti	2e47290ed0	finished loadnpc.hpp, fixed npdt 52byte structure	2014-09-05 21:23:25 +02:00
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.	2014-09-05 16:43:20 +02:00
Marco Melletti	bc7e154643	done with header files, unsure about mSkills and mReputation in loadnpc.hpp	2014-09-04 13:23:29 +02:00
Marco Melletti	8bce460f34	loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix	2014-09-03 14:40:32 +02:00
scrawl	819234cdfe	Use rbegin() instead of --end()	2014-09-02 05:46:12 +02:00
scrawl	9809748eba	Store NIF keys mapped by time and use lower_bound for searches	2014-09-02 04:29:30 +02:00
scrawl	0da4757ee6	Merge branch 'master' of github.com:scrawl/openmw	2014-09-01 02:04:18 +02:00
scrawl	267cf4e140	Implement ResetActors script instruction (Fixes #1859 )	2014-08-30 18:27:32 +02:00
Marc Zinnschlag	2eadff54d4	Merge remote-tracking branch 'rohitnirmal/scan-build-fixes'	2014-08-29 13:40:37 +02:00
Rohit Nirmal	b5eb16b663	Silence some scan-build warnings.	2014-08-28 20:55:32 -05:00
cc9cii	df87859d7c	Move the workaround to loadscpt.cpp as per feedback comments.	2014-08-29 07:41:49 +10:00
Marc Zinnschlag	ce3d75bba2	Merge remote-tracking branch 'scrawl/master'	2014-08-28 12:34:08 +02:00
cc9cii	7ff1136d81	For compiling in Windows with MSVC.	2014-08-27 21:25:47 +10:00
scrawl	4f92044d71	Allow user-created markers on local map (Fixes #1571 )	2014-08-26 17:45:23 +02:00
scrawl	c2a91148f3	Implement multiple emitter nodes for NiBSPArrayController The particles for the flame, frost and storm atronachs work correctly now.	2014-08-26 03:06:30 +02:00
scrawl	44642ae21b	Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd)	2014-08-26 02:09:23 +02:00
Marc Zinnschlag	f1f38fc786	Merge remote-tracking branch 'miroslavr/master'	2014-08-25 22:03:40 +02:00
MiroslavR	46e9ee408f	Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format.	2014-08-25 18:59:50 +02:00
MiroslavR	3823e36f05	Merge branch 'master' of github.com:OpenMW/openmw	2014-08-25 00:56:35 +02:00
MiroslavR	d16e0c063c	Enchanting, spellmaking dialog: check for flags when listing known effects	2014-08-24 21:59:52 +02:00
Arthur Moore	b7852b8215	Convert niffile.cpp to use std::map instead of a custom search function. I haven't profiled this, but it should speed things up a decent bit.	2014-08-24 14:39:59 -04:00
Arthur Moore	8be6aefd95	Moved functions from niffile.cpp to where they belong. Also cleaned up some #includes Removed a few asserts. Vector already throws an out_of_range error.	2014-08-24 13:45:36 -04:00
Marc Zinnschlag	45c0be8f62	Merge remote-tracking branch 'emperorarthur/niftest'	2014-08-24 19:25:51 +02:00
Arthur Moore	cdfa24e15d	(Re) Wrote a tool to test NIF files in BSAs and on the filesystem. Just give it a set of files, one file per argument, and it will make sure openmw can read them. On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.	2014-08-24 12:09:39 -04:00
Marc Zinnschlag	111b55f48e	Merge remote-tracking branch 'scrawl/script'	2014-08-24 17:58:05 +02:00
scrawl	174153b2da	Revert "Fix member variable case problem" This reverts commit `f0354ea04c`. Fixes #759 (again) Conflicts: components/compiler/lineparser.cpp	2014-08-24 17:46:08 +02:00
Marc Zinnschlag	52f6a2ec7b	remote local variable access was always using variable with index 1 instead of the index specified by the access request (Fixes #1739 )	2014-08-24 11:58:08 +02:00
Marc Zinnschlag	736ab76f68	limit argument error workaround to PositionCell instruction (Fixes #1732 )	2014-08-24 10:17:55 +02:00
Marc Zinnschlag	d024c1a93f	Merge remote-tracking branch 'scrawl/master'	2014-08-24 09:14:17 +02:00
scrawl	1a8acac40a	Share keyframe data in NIF resource (Fixes #908 )	2014-08-24 02:37:59 +02:00
scrawl	2b407a9995	Refactor NIF cache - Remove broken cache locking mechanism This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now. - Decouple cache from NIFFile (now a new nifcache component) - Add API for future background loading - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.	2014-08-24 02:37:50 +02:00
Marc Zinnschlag	7c1b32ae62	Merge remote-tracking branch 'miroslavr/corprus'	2014-08-23 09:15:27 +02:00
Marc Zinnschlag	f468c53281	renamed the script field in DebugProfile to improve consistency	2014-08-22 13:38:03 +02:00
Marc Zinnschlag	232c6c9ad3	Merge branch 'scriptedit' into run	2014-08-22 13:20:02 +02:00
MiroslavR	85aa237baf	Implement removal of corprus spells	2014-08-22 03:34:31 +02:00
MiroslavR	96e7ff666d	Implement saving/loading of corprus stats, remove redundant code	2014-08-19 03:17:31 +02:00
Bret Curtis	feb0ef8390	fixes building on systems with kFreeBSD kernel	2014-08-18 17:19:54 +02:00
scrawl	83037a1a91	Move fast-forward of particle systems outside of OgreNifLoader (Fixes #1830 ) Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.	2014-08-18 16:37:47 +02:00
scrawl	360c7f863c	Store magic effect Base values in savegame (Fixes #1489 )	2014-08-17 05:38:48 +02:00
scrawl	2db50da8dd	Implement magic effect script instructions (Feature #1489 )	2014-08-17 05:09:14 +02:00
scrawl	6c6b3bd890	Remove extra setVisibilityFlags on SkelBase SkelBase is already contained in mEntities.	2014-08-15 22:46:48 +02:00
Marc Zinnschlag	3486da0fb0	consolidated the debug profile flags into a single and added a global flag	2014-08-15 12:27:08 +02:00
scrawl	77a4e38c49	Remove -Wno-ignored-qualifiers and fix caused warnings	2014-08-14 19:18:30 +02:00
scrawl	28e61c9834	Add default values for fDifficultyMult and sDifficulty (Fixes #1742 ) Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM	2014-08-13 17:32:52 +02:00
scrawl	e2ee3b2497	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwrender/terrainstorage.cpp	2014-08-12 19:53:37 +02:00
Marc Zinnschlag	40a33eb9f0	Merge remote-tracking branch 'miroslavr/master'	2014-08-12 17:49:03 +02:00
gus	5fd599b5de	minor corrections	2014-08-12 13:31:20 +02:00
MiroslavR	baa14511cf	Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision	2014-08-12 12:18:38 +02:00
scrawl	28fe81df90	Make Lights with OffDefault flag not emit light nor particles when placed in a cell (Fixes #1796 )	2014-08-11 20:39:56 +02:00
MiroslavR	4d403ed747	Rename and move functions for texture path correction	2014-08-11 20:04:44 +02:00
scrawl	4138c3e966	Reuse health of previous level rather than recalculating initial health (Fixes #1787 )	2014-08-10 17:09:14 +02:00
Marc Zinnschlag	ee3acc31a8	minor correction to previous commit	2014-08-10 10:09:45 +02:00
cc9cii	c43bd3c345	Continue loading esm after detecting string table overflow condition. Should resolve bug #1774 .	2014-08-10 12:54:54 +10:00
MiroslavR	4873c4bd31	Generalize function for texture path correction (Fixes #1779 )	2014-08-09 18:59:57 +02:00
scrawl	8c26f802e6	Move terrain grid implementation to a component so the editor can use it (Feature #1597 )	2014-08-08 15:46:33 +02:00
scrawl	982453d4f6	Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597 )	2014-08-08 15:46:33 +02:00
scrawl	22d7d8a466	Implement Command creature/humanoid magic effects (Fixes #1120 )	2014-08-07 17:21:07 +02:00
scrawl	2e7b5fde7c	Fix uninitialized QuestStatus in DialInfo (Fixes #1694 )	2014-08-06 20:13:57 +02:00
Marc Zinnschlag	f4ddf2a7b9	Merge remote-tracking branch 'sandstranger/android'	2014-08-06 08:04:11 +02:00
root	32ebc90ba4	fix v9	2014-08-06 07:52:36 +04:00
root	713787d92f	fix v7	2014-08-06 07:48:16 +04:00
root	8978f9bcc6	fix v6	2014-08-06 02:10:47 +04:00
root	3cd98e5259	fix code v5	2014-09-06 02:02:39 +04:00
root	e27ca878a1	fixed v 4	2014-08-06 01:01:43 +04:00
root	174b528082	fixe v 3	2014-08-06 00:54:53 +04:00
root	d8772156a7	fixe all code v 2	2014-08-06 00:46:21 +04:00
root	8a8b91dfe1	fixed all code for building on all platforms inlcudng ANDROID	2014-09-04 22:47:03 +04:00
root	7cd2d4809c	android-build	2014-08-04 19:50:53 +04:00
Marc Zinnschlag	33c36bf0df	Merge remote-tracking branch 'scrawl/master'	2014-08-03 22:23:48 +02:00
Marc Zinnschlag	30f114873d	added debug profile record	2014-08-03 10:12:03 +02:00
Digmaster	a32ab842ae	Added ForceJump/ForceMoveJump commands	2014-08-02 22:42:40 -07:00
Marc Zinnschlag	1e6d557089	Merge branch 'visibility'	2014-07-31 14:34:25 +02:00
Marc Zinnschlag	a25758c3b1	fixed visibility flags setting	2014-07-31 14:02:55 +02:00
scrawl	0c1c468f70	Accept a useless extra integer argument for addItem (Fixes #1726 )	2014-07-31 01:18:52 +02:00
scrawl	45af34d189	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-07-29 19:35:44 +02:00
scrawl	543bb22e8f	Implement collision script instructions (Fixes #1111 )	2014-07-29 19:01:40 +02:00
scrawl	ccde462308	Fix typo (RefId -> RefNum)	2014-07-29 19:01:14 +02:00
scrawl	7dfb624ee2	Support loading text keys for objects without a skeleton This means we can no longer map them to bone IDs, but they are unused anyway. Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop)	2014-07-29 00:23:00 +02:00
bogglez	c006393178	Fix http://bugs.openmw.org/issues/768 Changes application_name in configuration manager to OpenMW instead of openmw, if on windows. This shouldn't break anything since Windows uses case-insensitive filesystems. Strictly speaking the installation directory must be OpenMW now though (not sure whether this is the case)	2014-07-28 21:52:34 +02:00
scrawl	4773d754c6	Remove redundant isHostile flag (Fixes #1652 )	2014-07-28 16:41:12 +02:00
Marc Zinnschlag	7991dfb907	Merge remote-tracking branch 'scrawl/master'	2014-07-28 09:03:17 +02:00
Marc Zinnschlag	c9cd7fb6b7	Merge branch 'scripts'	2014-07-28 09:02:24 +02:00
Marc Zinnschlag	ad50b926f5	reducing some stray arguments again	2014-07-28 09:01:44 +02:00
Marc Zinnschlag	17bd094afd	allow a few more stray arguments	2014-07-27 20:55:54 +02:00
Marc Zinnschlag	2abc4e42c8	end parsing of line after parsing a declaration	2014-07-27 20:49:57 +02:00
scrawl	1a04501951	Handle faction save/load properly when player has faction reputation in a faction he is not a member of (Fixes #1573 )	2014-07-27 20:33:45 +02:00
Marc Zinnschlag	6a745c014f	workaround for incorrect argument order for PositionCell instruction	2014-07-27 11:51:53 +02:00
Marc Zinnschlag	acb728195f	improved documentation of ESM::Script member variables	2014-07-25 10:37:34 +02:00
Marc Zinnschlag	2e355df8b3	removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)	2014-07-25 07:59:50 +02:00
scrawl	75abe8db31	Ignore FLTV from old savegames	2014-07-24 20:52:14 +02:00
scrawl	d4ff17f1c5	Remove unused FLTV and NAM0 from CellRef	2014-07-24 02:20:16 +02:00
scrawl	4e0c133fb3	Add comment to Cell NAM0 (it's a RefId counter)	2014-07-24 02:19:36 +02:00
scrawl	75366b2e37	Implement CellRef's faction rank (rank requirement to use item)	2014-07-24 02:17:38 +02:00
Marc Zinnschlag	19f4c46fe4	alllow (and ignore) explicit references for StopScript and ScriptRunning	2014-07-23 12:33:35 +02:00
Marc Zinnschlag	aa8c0bccb4	added new argument type: z (optional, any)	2014-07-23 09:44:29 +02:00
scrawl	2b57c7fa67	Use CellRef's global variable to disable owner (Fixes #1677 )	2014-07-22 17:06:40 +02:00
gus	2092e5fe22	compile fixes	2014-07-22 11:49:45 +02:00
Marc Zinnschlag	11a2c767cc	some argument parsing cleanup	2014-07-21 12:50:29 +02:00
scrawl	1320ac6983	Ensure non-negative particle life time, add size assertion	2014-07-18 16:11:08 +02:00
Marc Zinnschlag	e33ee52b91	make stray names in the begin line a warning instead of an error	2014-07-18 12:29:20 +02:00
scrawl	192d5ca08f	Allow overriding OGRE_PLUGIN_DIR in cmake command line	2014-07-17 22:31:57 +02:00
scrawl	4d39d77eaa	Fix incompatible encoding names in ContentModel (bug uncovered by `41c17bccb6`)	2014-07-17 20:40:40 +02:00
scrawl	2a510573b8	Remove unused implementation file	2014-07-17 16:16:14 +02:00
scrawl	41c17bccb6	Exit if an unknown encoding option is specified	2014-07-17 16:16:14 +02:00
scrawl	876af8f529	Fix not saved Attacked flag (Fixes #1657 )	2014-07-17 16:16:13 +02:00
Marc Zinnschlag	8952154488	inherit target ID when starting a script from another script	2014-07-17 13:37:57 +02:00
Marc Zinnschlag	27c84d6cb7	the reference for a targeted script is now determined when needed instead of at the start of the script execution	2014-07-17 13:36:55 +02:00
Marc Zinnschlag	35b27ea8cb	ignore stray string argument after GetDisabled	2014-07-17 11:29:04 +02:00
Marc Zinnschlag	e8322da663	added support for targeted scripts to script compiler	2014-07-17 08:36:34 +02:00
Marc Zinnschlag	75ab8de3d2	added opcode for running scripts with explicit references (targeted scripts)	2014-07-15 13:26:04 +02:00
Marc Zinnschlag	e9377ad5c4	include targeted script data in saved games	2014-07-15 13:05:38 +02:00
Marc Zinnschlag	563c2e5730	be a bit more relaxed about allowing - in names (Fixes #1593 )	2014-07-15 10:39:11 +02:00
scrawl	41d73377b0	Use explicit C locale in Misc::StringUtils (Fixes #1216 )	2014-07-12 18:53:22 +02:00
scrawl	1c41ce9b9d	Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)	2014-07-12 18:53:15 +02:00
scrawl	ad90d20ad8	Don't silently skip unknown NPC subrecords	2014-07-08 10:30:46 +02:00
Marc Zinnschlag	1ce60fa13b	Merge branch 'tables'	2014-07-03 12:03:21 +02:00
Marc Zinnschlag	d96ed38d49	added body part table	2014-07-01 12:37:22 +02:00
Marc Zinnschlag	e97fd35ae6	added enchantments table	2014-06-30 20:40:34 +02:00
scrawl	2506c16bf5	Add a dummy GetStat function returning 0 (Fixes #1589 )	2014-06-30 17:49:01 +02:00
scrawl	e25fa6c157	Refactor non-distant land terrain path to a grid based implementation (Fixes #1562 )	2014-06-29 02:42:36 +02:00
scrawl	4949aa1fbb	Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)	2014-06-28 18:21:56 +02:00
scrawl	1ab02d8072	Fix exception for box shapes (Fixes #1580 )	2014-06-28 00:10:36 +02:00
scrawl	7b1e1d03d8	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwrender/sky.hpp	2014-06-26 04:29:03 +02:00
scrawl	2bcbc6ab7d	Potential crash fix, either way should have a better error message now	2014-06-25 14:52:12 +02:00
Marc Zinnschlag	85965bfd47	Merge remote-tracking branch 'scrawl/master'	2014-06-25 09:58:00 +02:00
scrawl	ee098de0a6	Don't ignore lighting values of particles not attached to a character	2014-06-25 01:14:21 +02:00
scrawl	b259c5def2	Make GetFactionReaction garbage argument optional	2014-06-25 01:12:57 +02:00
scrawl	8a8ecce1e5	Fix some uninitialized data written to savegames	2014-06-25 00:11:25 +02:00
scrawl	e274314548	Ignore alpha modifier for particle materials This makes the tx_ash_flake.dds particles from ashcloud.nif appear.	2014-06-24 19:51:30 +02:00
scrawl	b52977e44c	Add dummy Face implementation for now (Bug #1541 )	2014-06-24 15:09:13 +02:00
scrawl	30be59c029	Implement auto-adjusting of particle emit rate This makes ashcloud.nif and blightcloud.nif work properly.	2014-06-24 03:07:10 +02:00
scrawl	750d8b5589	Allow garbage integer argument for addSpell (Fixes #1539 )	2014-06-23 22:02:22 +02:00
scrawl	0b34d8d2fd	Add support for animated collision shapes (Fixes #1549 )	2014-06-23 20:43:24 +02:00
slothlife	9ea22324f7	Fix some MSVC warnings. Several fixes are warnings about truncations on 64-bit, while others are complaints about mixed signed / unsigned integer operations.	2014-06-23 01:13:30 -05:00
scrawl	0bed6d9d56	Physics: Recognize BBoxCollision flag, but don't use it for raycasting (Fixes #1349 )	2014-06-22 00:16:47 +02:00
scrawl	e002acdeae	Physics: Create actor shapes outside of BulletNifLoader This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.	2014-06-21 23:37:16 +02:00
scrawl	7bf7daa846	Fix exception (getline will trigger failbit on the last line)	2014-06-20 21:33:03 +02:00
scrawl	9a26cf22e6	Implement toggleMenus	2014-06-20 18:51:00 +02:00
scrawl	218f916d6d	Savegame: Don't write stat modifiers that are zero	2014-06-19 17:17:26 +02:00
scrawl	c69a311ad8	Disable lighting for particles Fixes magic cast visuals being too dark depending on the environment.	2014-06-19 04:57:46 +02:00
scrawl	4e71db7081	Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.	2014-06-18 21:39:17 +02:00
scrawl	5645c9185b	Fix location of local data path	2014-06-18 17:18:48 +02:00
scrawl	1dc9e151cb	Count werewolf kills (Fixes #1525 )	2014-06-18 16:56:36 +02:00
scrawl	2477456f99	Implement Murder crimes and OnMurder instruction (Fixes #1315 )	2014-06-17 04:05:27 +02:00
scrawl	ec66484472	Fix forceGreeting with explicit references (Fixes #1518 )	2014-06-17 04:05:27 +02:00
scrawl	d5b97005ab	Make ESM::Faction skills optional (Fixes #1508 ) Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.	2014-06-16 02:52:16 +02:00
scrawl	ee2b81763e	Savegame: Store AiSettings and summoned creatures CreatureStats state is now completely stored (Closes #1174) Also play VFX_Summon_Start and VFX_Summon_End visual effects.	2014-06-15 21:19:37 +02:00
scrawl	fd59a4a79e	Fix some doxygen typos	2014-06-15 16:11:22 +02:00
scrawl	77388fe2ce	Implement BetaComment instruction (dumps reference info)	2014-06-15 16:11:16 +02:00
Marc Zinnschlag	c8c45d4923	Merge remote-tracking branch 'lgro/valgrind_fixes'	2014-06-15 10:57:01 +02:00
Lukasz Gromanowski	abeb1d4ab3	Valgrind: Added constructor for KeyListT class, and added initialziation of ver member field in NIFFile class. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-06-15 09:39:16 +02:00
scrawl	4f742fd468	Allow INFO records with no subrecords following DATA (Fixes #1486 )	2014-06-13 21:54:03 +02:00
scrawl	e458cf1df2	Savegame: Store death counter (Fixes #1477 )	2014-06-13 02:26:53 +02:00
scrawl	a54ac579a5	Savegame: Store AiSequence	2014-06-13 02:26:52 +02:00
scrawl	b158919c4b	Fix uninitialized variable use	2014-06-13 02:26:52 +02:00
scrawl	029e438c11	Don't check mInterpolationType each iteration	2014-06-11 23:57:39 +02:00
scrawl	73be457805	Merge ESM::Cell fields by subrecord Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord. Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (oldcell = cell;)	2014-06-11 16:13:33 +02:00
scrawl	47172fb8a2	ContentModel: Don't confuse file path with file name (Fixes #1352 )	2014-06-10 19:23:42 +02:00
scrawl	3788fb042e	Implement MenuTest script instruction (Fixes #1454 )	2014-06-10 18:49:42 +02:00
scrawl	2dd54dbcfc	Implement ClearInfoActor script instruction (Fixes #1422 )	2014-06-10 18:49:41 +02:00
scrawl	98d7b6672a	Make MODL subrecord optional for potions (Fixes #1419 )	2014-06-08 11:22:37 +02:00
scrawl	823ccb1b3d	Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386 )	2014-06-08 11:22:37 +02:00
scrawl	a0bff03560	Fix not handling failbit/badbit in ifstream (Bug #1355 )	2014-06-08 11:22:37 +02:00
Arthur Moore	f9f278f645	Fixed a capitalization error. Changed Interpolations to unsigned. Also explained what's happening in the comments.	2014-06-06 07:00:04 -04:00
Arthur Moore	b90e4db871	Actually read in XYZ_ROTATION_KEY data instead of discarding it.	2014-06-06 01:26:28 -04:00
dreamer-dead	e772bb88da	Remove RTTI usage in NIF reader.	2014-06-05 20:22:20 +04:00
Marc Zinnschlag	5313862a46	Merge remote-tracking branch 'scrawl/master'	2014-06-04 15:14:29 +02:00
scrawl	7376cb9b61	Fix loading ESX files cleaned with testool (Fixes #1382 )	2014-06-03 22:49:37 +02:00
scrawl	ce14a6413b	Small optimization to ESM::Variant	2014-06-03 22:40:09 +02:00
scrawl	577ed3943b	Show wallpaper when loading a savegame	2014-06-02 23:26:43 +02:00
Arthur Moore	576c06d791	Fix Bug #1371 Not properly reading in the NIF file's QuaternionKeyList.	2014-06-01 18:01:44 -04:00
scrawl	c018319940	Addition to `7c9c0830a9`: don't create useless BaseWhite clones	2014-06-01 02:21:47 +02:00
scrawl	7c9c0830a9	Fix errors due to BaseWhite material being removed	2014-05-31 19:50:01 +02:00
scrawl	16ac6e7aac	Merge DialInfo objects by subrecord instead of overwriting the object Fixes #1360	2014-05-31 13:01:11 +02:00
Marc Zinnschlag	ecf3d52b46	Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader'	2014-05-30 12:07:16 +02:00
Marc Zinnschlag	f5e587f566	Merge remote-tracking branch 'puppykevin/master'	2014-05-30 11:42:19 +02:00
cc9cii	11ce093a9e	Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284 .	2014-05-30 18:46:18 +10:00
Marc Zinnschlag	be7f344eca	Merge branch 'refs' Conflicts: apps/opencs/model/doc/savingstate.cpp components/esm/cellref.hpp	2014-05-30 10:38:38 +02:00
Marc Zinnschlag	be88168e91	Merge remote-tracking branch 'scrawl/master'	2014-05-30 10:07:18 +02:00
scrawl	50a72ed710	Fix ghosts in Cavern Of The Incarnate having -1 health	2014-05-29 18:09:13 +02:00
pvdk	38d825b004	Merge remote-tracking branch 'upstream/master' into wizard Conflicts: CMakeLists.txt apps/launcher/maindialog.cpp	2014-05-29 16:42:16 +02:00
Kevin Poitra	18314b1707	We use spaces, not tabs.	2014-05-28 14:56:50 -05:00
Kevin Poitra	8e55eb8009	Fix some formatting.	2014-05-28 13:06:43 -05:00
Kevin Poitra	545c3c312c	Remove a superfluous clear.	2014-05-28 13:03:40 -05:00
Marc Zinnschlag	f112c78858	Merge remote-tracking branch 'scrawl/master'	2014-05-28 19:47:36 +02:00
scrawl	e68600eda2	Make Activate instruction work properly even when onActivate was not called in the same frame. There are two major differences to the old implementation: - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low. - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action. Fixes #1166 and #1346.	2014-05-28 19:23:50 +02:00
Marc Zinnschlag	bb011f278e	Merge remote-tracking branch 'cc9cii/master'	2014-05-28 14:45:57 +02:00
cc9cii	bbe77d656a	Minor fixes from static analysis.	2014-05-28 21:15:50 +10:00
Arthur Moore	50a4d175da	Read NIF interpolation type 4 (XYZ_ROTATION_KEY) Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible. Partly implements Feature #1067	2014-05-28 03:42:26 -04:00
Marc Zinnschlag	be39395ce7	Merge remote-tracking branch 'scrawl/master'	2014-05-27 21:09:24 +02:00
Marc Zinnschlag	12fc0aaecb	removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)	2014-05-27 21:08:29 +02:00
scrawl	3e2eed9269	Implement getFactionReaction function Strange bug when using value != 0 for the garbage argument?	2014-05-27 15:23:22 +02:00
scrawl	e266c39c5d	Implement modFactionReaction instruction (Closes #1347 )	2014-05-27 14:54:29 +02:00
scrawl	0966755a0c	Store death animation index in CreatureStats	2014-05-26 20:52:32 +02:00
scrawl	3cd835e61a	Fix bsa file loading not being case insensitive (Fixes #1178 )	2014-05-26 17:34:36 +02:00
scrawl	039398c8ae	Basic RefData and CellRef change tracking Wrapped item charge handling in getItemHealth function	2014-05-25 14:30:07 +02:00
scrawl	b47b2b84f3	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: apps/openmw/mwdialogue/filter.cpp apps/openmw/mwgui/waitdialog.cpp	2014-05-23 08:39:48 +02:00
Marc Zinnschlag	244eb11651	Merge remote-tracking branch 'greye/widechar'	2014-05-23 07:48:26 +02:00
scrawl	e51300989c	Handle NiBSPArrayController as alias for NiParticleSystemController The differences (if any) are unknown. NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?	2014-05-22 23:07:06 +02:00
greye	663d5c314e	be more verbose on change reasons	2014-05-22 16:35:57 +04:00
greye	4346e3b4d0	try to load plugins from relative paths	2014-05-20 21:42:51 +04:00
Marc Zinnschlag	d8440e1fdc	implemented reference record merging	2014-05-20 09:02:22 +02:00
greye	444a07c01b	workaround OgreLog Unicode path handling	2014-05-19 18:12:13 +04:00
greye	493f8c6050	fix opening BSA on Unicode path	2014-05-19 13:39:07 +04:00
greye	417e07fbce	fix irrelevant error reporting	2014-05-19 10:59:36 +04:00
greye	6cb795ef7d	attempt to fix LowLevelFile, minor code reuse	2014-05-19 10:47:02 +04:00
greye	2c82da8e6e	load Ogre::ConfigFile from DataStream	2014-05-19 10:07:43 +04:00
scrawl	3dceb7ee4f	Fix overwriting DialInfo	2014-05-18 18:58:32 +02:00
scrawl	0aa1042fd7	Optimized dialogue merging with a lookup map	2014-05-18 16:01:16 +02:00
scrawl	1677fcf324	Dialogue merging	2014-05-18 15:25:16 +02:00
scrawl	5b76c0893a	Merge branch 'master' of https://github.com/OpenMW/openmw Conflicts: components/esm/inventorystate.hpp	2014-05-18 12:55:43 +02:00
greye	e02b04536f	fix most vexing parse issue	2014-05-18 14:55:05 +04:00
greye	424d06a6f8	open fstreams from boost::filesystem::path, vol.2	2014-05-18 14:55:05 +04:00
greye	2236216344	minor simplification	2014-05-18 14:55:05 +04:00
greye	a22ec223d8	open fstreams from boost::filesystem::path, vol.1	2014-05-18 14:55:05 +04:00
greye	b4950509bc	use converted widechars in ini importer	2014-05-18 14:55:05 +04:00
greye	eafdefe999	using WindowsPath implies utf-8 for boost fs::path	2014-05-18 14:55:05 +04:00
greye	584c121f33	fix windows unicode path handling	2014-05-18 14:55:04 +04:00
scrawl	a872c9f83a	Feature #1323 : handle restocking levelled items	2014-05-18 12:53:21 +02:00
cc9cii	b36bb58e8c	Bug #1324 : Artem's solution	2014-05-18 07:34:13 +10:00
Marc Zinnschlag	f7c89015f9	Merge remote-tracking branch 'scrawl/master'	2014-05-17 11:50:31 +02:00
scrawl	ae66d28c87	Feature #32 : Implement respawn for containers, creatures and NPCs	2014-05-17 09:09:00 +02:00
scrawl	e266aff561	Savegame: store projectiles	2014-05-17 05:24:32 +02:00
scrawl	b3735981d6	Remove unused file_finder	2014-05-15 21:36:24 +02:00
Marc Zinnschlag	3b2ba4f6cd	Merge remote-tracking branch 'scrawl/master'	2014-05-15 14:25:36 +02:00
scrawl	a76e391ad0	Savegame: store door movement state (Closes #747 )	2014-05-15 09:54:10 +02:00
scrawl	471bbd0021	Savegame: store levelled creature state and move to actorIds (Closes #1332)	2014-05-15 09:54:04 +02:00
Marc Zinnschlag	d08869a25d	Merge remote-tracking branch 'slothlife/msvc_warning_cleanup' Conflicts: apps/openmw/mwrender/localmap.cpp	2014-05-15 08:13:15 +02:00
slothlife	f33559fead	Fixes for MSVC warnings, less overall changes Kept some fixes from the first round of review. Found out that several targets weren't being built with the same basic warnings disabled. Disabled a few warnings for external libraries specifically, rather than applying them to all targets.	2014-05-14 20:12:52 -05:00
scrawl	9b67fcc4d7	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-05-14 23:54:25 +02:00
scrawl	9052cc4a57	Savegame: store ActiveSpells	2014-05-14 23:54:15 +02:00
scrawl	61187c2fef	Savegame: store actorIds	2014-05-14 09:47:49 +02:00
scrawl	51020fdb5f	Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.	2014-05-14 09:17:30 +02:00
Thomas	cbcf0f6039	Changed AiEScort to use new PathTo function	2014-05-14 01:44:11 -04:00
slothlife	c160a04ede	Revert "Fixes for warnings when building with MSVC" This reverts commit `46eb20b98c`.	2014-05-14 00:03:30 -05:00
Thomas	085fb2c5a2	Simplified documentation a bit	2014-05-13 14:13:05 -04:00
Thomas	a61d804de6	now that I've found the documentation, fixed some stuff for extensions	2014-05-13 13:53:06 -04:00
Thomas	77d365e196	Forced some function arguments to take in a specific array size	2014-05-13 13:25:22 -04:00
Thomas	9dbe53c722	Merge remote-tracking branch 'upstream/master'	2014-05-13 04:11:07 -04:00
Thomas	2c74ea381e	Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue	2014-05-12 21:05:32 -04:00
scrawl	6cc691115b	Savegame: store most of CreatureStats	2014-05-12 21:37:36 +02:00
Thomas	645d174a96	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/aisequence.hpp	2014-05-12 14:49:08 -04:00
scrawl	a4a9794417	Savegame: store fog of war (Closes #1177 )	2014-05-11 02:07:58 +02:00
scrawl	041319c43e	Fixes #1234 : Store dynamic record counter in savegame to prevent name clashes	2014-05-11 00:32:22 +02:00
slothlife	46eb20b98c	Fixes for warnings when building with MSVC Most warnings are innocuous (wrong type-specifier for forward declarations, conversion of literals into unsigned integers, warnings about methods optimized out), but I believe actual bugs were revealed in vartypedelegate.cpp and combat.cpp.	2014-05-09 08:32:52 -05:00
Thomas	dbf06d8c8b	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/aipursue.hpp apps/openmw/mwmechanics/aisequence.hpp	2014-05-04 02:06:43 -04:00
scrawl	7bddfc0025	Fix some spelling mistakes.	2014-05-03 12:23:22 +02:00
scrawl	122e606e30	Crime: improvement to arrest on sight for large bounties iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).	2014-05-03 12:17:44 +02:00
scrawl	8560b43464	Move to esm component	2014-05-02 12:48:07 +02:00
scrawl	17bb8d7f9a	Fixes #1252 : Add item/magic keybindings to savegame	2014-05-01 21:16:32 +02:00
scrawl	6f7fbc867f	Fix several leaks	2014-05-01 16:55:15 +02:00
Thomas	8f90dd43ec	Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier	2014-04-29 12:52:08 -04:00
Thomas	885228ec02	Merge remote-tracking branch 'upstream/master' Conflicts: apps/openmw/mwmechanics/actors.cpp	2014-04-28 12:27:57 -04:00
scrawl	27a05027f4	Fixes #1172 : Added basic loading/saving progress bar The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.	2014-04-28 11:29:57 +02:00
Thomas	c2127845af	Added onKnockdown command	2014-04-27 20:54:22 -04:00
scrawl	30666f2cce	Fixes #1297 : Store global map markers in savegame	2014-04-26 13:42:32 +02:00
scrawl	f921f2e7db	Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last. This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.	2014-04-26 12:04:37 +02:00
scrawl	45d2a00717	Fixes #1293 : Allow interpolation type 0 in case of 0 keys	2014-04-26 11:36:27 +02:00
Thomas	f6deca7c80	Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors	2014-04-23 13:02:51 -04:00
Thomas	61341d4206	Removed mLocked, kept it as "Negative lock level means unlocked"	2014-04-23 10:00:18 -04:00
Thomas	420163d35f	Small changes to lock command (If no valid lockLevel exists, defaults to 100)	2014-04-23 05:19:34 -04:00
scrawl	6929e541dd	Fix texture name issue with Vality's Bitter Coast Mod	2014-04-21 05:30:14 +02:00
scrawl	2cb9f38a45	Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent.	2014-04-20 19:34:58 +02:00
scrawl	262e959699	Remove unused slice_array	2014-04-20 19:28:39 +02:00
pvdk	aa07a33906	Fixed most of the memory leaks and started working on correctly exiting the thread	2014-04-18 13:17:37 +02:00
scrawl	d3d0b7362f	Fix older savegame compatibility regarding new crime feature.	2014-04-18 12:34:26 +02:00
pvdk	a2c129f655	Merge remote-tracking branch 'upstream/master' into wizard	2014-04-16 16:57:53 +02:00
pvdk	21c406316f	Working on the Settings tab: start the importer/wizard	2014-04-16 16:54:55 +02:00
Marc Zinnschlag	86e65944b8	Merge remote-tracking branch 'jeffreyhaines/master' Conflicts: apps/openmw/CMakeLists.txt	2014-04-15 11:31:48 +02:00
Marc Zinnschlag	300eb6f444	make FNAM sub-record optional for all record types	2014-04-13 13:23:50 +02:00
Jeffrey Haines	a274b48f2f	States are saved. Crime is reacted to. Issues where some crime is ignored. Needs a lot more work	2014-04-05 22:45:40 -04:00
megaton	50af9bc0d3	General perfomance optimizations.	2014-03-30 19:45:27 +04:00
pvdk	ef38fae09d	Merge remote-tracking branch 'upstream/master' into wizard	2014-03-29 11:56:35 +01:00
Marc Zinnschlag	2c2106205d	Merge remote-tracking branch 'scrawl/master'	2014-03-28 09:56:35 +01:00
scrawl	d7df9cae21	Bug #1224 : Changed fix to potentially allow for language independent saves	2014-03-27 22:32:42 +01:00
scrawl	53ba23e303	Fixes #1224 : Store class name instead of id in savegame header	2014-03-26 19:56:12 +01:00
Marc Zinnschlag	1b6b4e3442	Merge remote-tracking branch 'slothlife/weather_save'	2014-03-23 08:36:45 +01:00
scrawl	452b522bc3	Fix typos	2014-03-22 19:01:41 +01:00
slothlife	00eac7d53a	Fixed header include guard to match filename	2014-03-21 01:22:54 -05:00
slothlife	6eab9c5179	Move weather state save/load to a new class	2014-03-21 01:19:40 -05:00
slothlife	1acd1bd913	Feature #1173 : Saved Game: include weather state Removed some unused state in and changed Ogre::String to std::string in WeatherManager.	2014-03-20 01:25:52 -05:00
Marek Kochanowicz	6416ae90d2	Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog Conflicts: apps/opencs/CMakeLists.txt apps/opencs/view/world/subviews.cpp	2014-03-19 10:23:15 +01:00
scrawl	c8c0e5de38	Fixed code issues found with unity build. Missing include guards, duplicated functions, ...	2014-03-16 23:49:06 +01:00
pvdk	8fe837ae6e	Merge remote-tracking branch 'upstream/master' into wizard	2014-03-16 20:05:12 +01:00
scrawl	b0a1e1198a	Yet another terrain fix	2014-03-16 16:30:17 +01:00
scrawl	a9dcc90970	Another terrain fix	2014-03-09 11:59:23 +01:00
Marc Zinnschlag	2de862126a	moved resources group creation from Engine to bsa component	2014-03-09 11:42:39 +01:00
scrawl	b8ca067730	Small fix for terrain	2014-03-09 03:21:34 +01:00
Marc Zinnschlag	f1353dc84f	Merge branch 'scene'	2014-03-06 16:46:44 +01:00
scrawl	d0f98103e4	Terrain: re-added "distant land=off" path Still a hack, but the overhead of building and traversing the quad tree appears negligible.	2014-03-06 03:04:23 +01:00
scrawl	1d926816b5	Terrain: background load blendmaps & layer textures. Refactor QuadTree update.	2014-03-05 21:46:37 +01:00
scrawl	4328e08162	Terrain: get rid of unneeded members	2014-03-05 21:46:37 +01:00
scrawl	6a002d19b3	Terrain: destroy no longer used materials	2014-03-05 21:46:37 +01:00
scrawl	97c3efb3ba	Terrain: decoupled Chunk from QuadTreeNode.	2014-03-05 21:46:37 +01:00
scrawl	edb5a54092	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
scrawl	195071efc7	Terrain: geometry is now loaded in background threads. TODO: background load layer textures and blendmaps. "Distant land" setting has been removed for now (i.e. always enabled).	2014-03-05 21:46:37 +01:00
scrawl	b3fed853ae	Terrain: take cell world size into account for LOD selection	2014-03-05 21:46:37 +01:00
scrawl	6c863486e1	Terrain: fix an embarrassing copy&paste mistake.	2014-03-05 21:46:36 +01:00
scrawl	64c9932597	Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function)	2014-03-05 21:46:36 +01:00
scrawl	c9e349f60f	Terrain: support alternate coordinate systems. Get rid of LoadingListener for now	2014-03-05 21:46:36 +01:00
Bret Curtis	ab224f93c9	remove our stdint.h version that uses boost and force usage of system stdint.h	2014-03-05 17:08:58 +01:00
Marc Zinnschlag	f9d2fde783	Merge branch 'openmw-29' Conflicts: apps/openmw/mwmechanics/aicombat.cpp	2014-03-04 09:34:38 +01:00
Marc Zinnschlag	6e8b9c88b2	changed name of default worldspace (should reduce chance of a name conflict)	2014-03-02 22:43:15 +01:00
cc9cii	46867ec0cf	Fix file handles being left open on windows builds	2014-03-01 07:24:20 +11:00
cc9cii	2421f23c2f	cleanup the mess...	2014-02-27 23:59:23 +11:00
pvdk	3792b301e9	Wizard now runs the ini-importer to import settings from Morrowind.ini	2014-02-25 15:33:30 +01:00
pvdk	fb59112b74	Merge remote-tracking branch 'upstream/master' into wizardhead	2014-02-24 13:58:51 +01:00
Marc Zinnschlag	bfcd768078	various bits of cleanup	2014-02-23 21:39:18 +01:00
cc9cii	1ab5948f19	merge upstream changes	2014-02-23 19:11:37 +11:00
Marc Zinnschlag	d780364842	fixed record size type	2014-02-22 17:31:44 +01:00
Marc Zinnschlag	b0ae5b8ab7	Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29	2014-02-22 17:16:55 +01:00
cc9cii	fcfc8fcccb	Revert "Allow MinGW64 compilation in Windows/msys" This reverts commit `c3f350e3fb`. Conflicts: libs/platform/string.h	2014-02-22 23:45:13 +11:00
cc9cii	c241405d91	Fix Windows save & load.	2014-02-22 12:15:20 +11:00
cc9cii	c3f350e3fb	Allow MinGW64 compilation in Windows/msys	2014-02-22 12:06:50 +11:00
Marc Zinnschlag	c5b2c154f8	another esm writer fix	2014-02-20 12:49:56 +01:00
Marc Zinnschlag	72b29ddb79	fix broken esm writer header code	2014-02-20 12:35:57 +01:00
pvdk	c54217d008	Merge remote-tracking branch 'upstream/master' into HEAD Conflicts: CMakeLists.txt components/CMakeLists.txt components/config/gamesettings.cpp	2014-02-19 19:26:07 +01:00
scrawl	1fba5d1bb9	Terrain: change world bounds from AABB to 4 floats	2014-02-19 11:23:03 +01:00
scrawl	90f6cda4cc	Moved includes to appropriate place	2014-02-19 11:23:03 +01:00
Marc Zinnschlag	44f6f79bf5	Merge remote-tracking branch 'corristo/osx-ogre-19'	2014-02-16 17:12:52 +01:00
Marc Zinnschlag	9788bbcab9	partially store creature state in saved game files (only attributes and dynamics for now)	2014-02-16 15:56:36 +01:00
Marc Zinnschlag	b0532e0c85	store NPC state in saved game files	2014-02-16 15:51:45 +01:00
Marc Zinnschlag	9f721fd144	store list of known topics in saved game files	2014-02-16 12:54:27 +01:00
Marc Zinnschlag	6ac64bbe15	Merge branch 'script' Conflicts: readme.txt	2014-02-16 12:12:56 +01:00
Nikolay Kasyanov	8f99da084b	OS X: plugins are now in Frameworks dir, not in Plugins	2014-02-16 14:13:12 +04:00
Marc Zinnschlag	0d84adb2c6	allow x->(y) instead of (x->y)	2014-02-15 12:50:40 +01:00
Marc Zinnschlag	fd665a1994	ignore conditions after an else (only works if condition is put in parentheses)	2014-02-15 12:45:50 +01:00
Marc Zinnschlag	d213c6c36a	fixed a constness-issue	2014-02-14 12:23:00 +01:00
Marc Zinnschlag	451e1f413b	instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly	2014-02-14 11:15:16 +01:00
Marc Zinnschlag	e76ef92669	also allow the use of keywords as remote local variables in set statements	2014-02-14 09:06:06 +01:00
Marc Zinnschlag	2086ebe410	fix for inappropriate disable (2nd attempt)	2014-02-14 08:48:26 +01:00
Marc Zinnschlag	b01c6dad37	Revert "allow disable as an alias for getDisabled (in most cases)" This reverts commit `f7ff4fbd51`.	2014-02-14 08:29:18 +01:00
Nikolay Kasyanov	c2fe0d480a	Merge remote-tracking branch 'upstream/master' into osx-ogre-19 Conflicts: CMakeLists.txt	2014-02-14 00:04:16 +04:00
Marc Zinnschlag	053b3dc371	Merge branch 'openmw-28' Conflicts: CMakeLists.txt	2014-02-13 20:57:28 +01:00
Nikolay Kasyanov	58add97676	Merge branch 'master' into osx-ogre-19 Conflicts: CMakeLists.txt	2014-02-13 20:34:06 +04:00
Marc Zinnschlag	f7ff4fbd51	allow disable as an alias for getDisabled (in most cases)	2014-02-13 15:31:07 +01:00
Marc Zinnschlag	d6e212a02b	Merge branch 'master' into script	2014-02-13 15:02:02 +01:00
Marc Zinnschlag	309573a3ac	allow the use of the keyword end as a variable name in an expression	2014-02-13 14:15:48 +01:00
Marc Zinnschlag	d73097c2e4	Merge remote-tracking branch 'scrawl/master'	2014-02-13 13:13:37 +01:00
scrawl	d4a755d1aa	Fix some hardcoded literals	2014-02-13 11:15:55 +01:00
Marc Zinnschlag	9c52820754	Merge remote-tracking branch 'scrawl/master'	2014-02-13 10:54:51 +01:00
scrawl	c6fb0f2d9b	Removed terrain component's dependency on ESM	2014-02-13 10:13:53 +01:00
Marc Zinnschlag	ac8290c4d3	fixed problem with line endings in case of a local variable redeclaration	2014-02-13 09:59:22 +01:00
Marc Zinnschlag	dde4fbd818	allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away	2014-02-13 09:52:44 +01:00
Marc Zinnschlag	87b51e47a9	fixed another case issue in remote member access	2014-02-13 09:40:07 +01:00
Marc Zinnschlag	c03bd8ebb6	allow [] as aliases for ()	2014-02-13 08:59:33 +01:00
Marc Zinnschlag	0313876d88	allow leaving out if in a top-level if-statement	2014-02-13 08:49:40 +01:00
Marc Zinnschlag	2eeb0eb4f3	allow lines to continue with other instructions after an legit else	2014-02-13 08:38:26 +01:00
Marc Zinnschlag	749136bf33	ignore attempts to set non-existing variables	2014-02-12 20:23:47 +01:00
Marc Zinnschlag	a85d3c7dcb	ignore unused explicit references for functions	2014-02-12 13:53:59 +01:00
Marc Zinnschlag	6e2e4d1adf	ignore stray begin	2014-02-12 13:45:01 +01:00
Marc Zinnschlag	93d4743012	interpret instruction keywords as names within expressions	2014-02-12 09:56:25 +01:00
Marc Zinnschlag	c0a6acfe6c	allow the use of keywords as variable names in more places	2014-02-12 09:23:23 +01:00
Marc Zinnschlag	b1b0877122	allow additional numeric argument for AiFollow and ignore it	2014-02-12 09:14:32 +01:00
Marc Zinnschlag	bfb0e62c4a	ignore additional string argument after enable/disable	2014-02-12 09:10:05 +01:00
Marc Zinnschlag	61626e90da	allow additional string argument for stopcombat and addspell (ignored)	2014-02-12 08:53:37 +01:00
Marc Zinnschlag	6a5d88b640	ignore stray else and endif in scripts	2014-02-12 08:42:42 +01:00
Marc Zinnschlag	697bda6371	allow (and discard) explicit reference on instructions that do not accept explicit references	2014-02-11 14:55:31 +01:00
Marc Zinnschlag	f26aa4f645	fixed while loop implementation	2014-02-11 13:31:04 +01:00
Emanuel Guevel	8c8f4cd420	Fix typo	2014-02-10 22:53:16 +01:00
Marc Zinnschlag	5c0071f320	fixed spelling of an error message	2014-02-10 14:59:20 +01:00
Marc Zinnschlag	3b990795c4	added access to remote access of local variables of global scripts	2014-02-10 14:45:55 +01:00
Marc Zinnschlag	3147aebf75	factored out declaration parser	2014-02-10 13:01:52 +01:00
scrawl	0cc1cd8f7e	Fix message box formatting bug	2014-02-05 05:18:11 +01:00
scrawl	2c0d46525b	Fast-forward particle systems to make cell loads less obvious.	2014-02-05 05:18:09 +01:00
scrawl	cf3812188f	Fix bounding box assertions due to negative particle life time Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)	2014-02-05 05:18:09 +01:00
pvdk	f263acdac6	Merge remote-tracking branch 'upstream/master' into versioninfo	2014-02-03 02:27:24 +01:00
Marc Zinnschlag	2b2ac6f62b	allow declaration of local variables with keywords as names	2014-02-02 15:43:48 +01:00
Marc Zinnschlag	32860a05e3	added dummy implementations for getPcInJail and getPcTraveling	2014-02-02 15:35:18 +01:00
Marc Zinnschlag	914ab1b8ab	allow 'x' instead of 'getjournalindex x'	2014-02-02 15:08:27 +01:00
Marc Zinnschlag	cd9b137129	allow elseif without matching if (grrrrr)	2014-02-02 14:24:58 +01:00
Marc Zinnschlag	8bcdf54570	added warning mode to script compiler error handler	2014-02-02 13:55:03 +01:00
scrawl	f89b3cac02	Feature #764 : Store the actor that gave the dialog response	2014-02-01 18:42:01 +01:00
Marc Zinnschlag	1b5301eec0	Merge branch 'savedgame' Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwbase/soundmanager.hpp apps/openmw/mwgui/mapwindow.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwsound/soundmanagerimp.hpp components/esm/loadcell.cpp	2014-02-01 18:16:32 +01:00
Marc Zinnschlag	5b04c10e1d	added creature/NPC state to saved games (only container/inventory for now)	2014-02-01 17:36:23 +01:00
Marc Zinnschlag	dd674566a2	store content of containers in saved game files	2014-01-31 13:25:32 +01:00
scrawl	bbd15b185d	Skip inactive controllers. Fixes those bloody bone boots again.	2014-01-31 05:59:58 +01:00
scrawl	5b300c1052	Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation)	2014-01-31 05:06:35 +01:00
scrawl	305a471c5a	Fix VisController in ascended sleeper's death animation	2014-01-31 05:06:08 +01:00
Marc Zinnschlag	900532a6ca	store additional state of lights in saved game files	2014-01-30 12:37:33 +01:00
Marc Zinnschlag	e0537a3253	made object state polymorphic	2014-01-28 13:53:24 +01:00
Marc Zinnschlag	a623f03850	reduced object state for objects in containers	2014-01-28 13:49:59 +01:00
mrcheko	e50e94af0b	remove CreatureStats::mAttackType, set/getAttackType()	2014-01-27 23:05:17 +02:00
Marc Zinnschlag	29c3a288e3	load and save of reference in cells (without CustomData state)	2014-01-27 13:27:42 +01:00
scrawl	e0de76a6f7	Save/load global map	2014-01-25 19:06:14 +01:00
scrawl	9c0ed69550	Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.	2014-01-25 15:10:25 +01:00
scrawl	a1ac99463f	Fix an uninitialized value	2014-01-24 22:52:04 +01:00
scrawl	03cf383be7	Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame Conflicts: apps/openmw/mwgui/referenceinterface.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp apps/openmw/mwscript/cellextensions.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.cpp apps/openmw/mwworld/worldimp.cpp	2014-01-24 18:28:35 +01:00
scrawl	295aed3533	Implement savegame screenshots	2014-01-24 17:49:16 +01:00
scrawl	786ed6ca5b	Include some required Ogre headers explicitely	2014-01-24 15:02:34 +01:00
pvdk	19bef4fce8	Distinguish between release and development builds	2014-01-23 13:18:05 +01:00
Marc Zinnschlag	419e3a7d30	write references in cells to saved game file	2014-01-23 12:51:42 +01:00
Marc Zinnschlag	dd7d80ffbc	removed a redundant field from object state	2014-01-23 12:51:25 +01:00
Marc Zinnschlag	22cb4784b5	store cell state in saved game files (no references yet)	2014-01-23 11:29:40 +01:00
pvdk	d92ded3bcd	Forgot adding the version header CMake file	2014-01-22 19:30:41 +01:00
pvdk	c95b8bcb39	Moved the generated version header stuff into components	2014-01-22 17:33:55 +01:00
scrawl	f89c400305	Don't complain about greetings with no sound	2014-01-22 00:02:43 +01:00
scrawl	bd34b61f2a	Set all keyframe-controlled bones as manually controlled	2014-01-20 13:37:34 +01:00
scrawl	4c0045b418	Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)	2014-01-18 21:11:12 +01:00
scrawl	805843d7ff	Closes #1086 : Implement blood effects	2014-01-17 11:27:13 +01:00
Marc Zinnschlag	ce00639d31	added missing birthsign field to player state record	2014-01-17 10:51:52 +01:00
Marc Zinnschlag	d8d4f1a15e	some fixes to record structs	2014-01-16 12:02:45 +01:00
scrawl	d544551f61	Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization) Information provided by Hrnchamd.	2014-01-15 15:50:45 +01:00
scrawl	0a8c61a7fe	Bug #1107 : Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.	2014-01-15 14:53:29 +01:00
scrawl	79a6ffd216	Closes #1107 : Do not create box shapes unless the box collision flag is enabled	2014-01-15 14:53:29 +01:00
scrawl	3ea1407ed3	Closes #1109 : Don't reset water level when loading a plugin that does include water level records	2014-01-15 14:53:29 +01:00
scrawl	264736c139	Remove hopelessly outdated nifogre tests	2014-01-15 14:53:29 +01:00
scrawl	d0500e8124	Some unneeded includes cleanup	2014-01-15 14:53:28 +01:00
Marc Zinnschlag	bf1a37dc38	Merge remote-tracking branch 'sirherrbatka/referencables_verifer'	2014-01-15 14:29:54 +01:00
Marc Zinnschlag	8c5f313546	added savedgame-specifc record structs for objects state	2014-01-14 15:29:55 +01:00
scrawl	52b9ebff9d	Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.	2014-01-14 07:42:03 +01:00
scrawl	26d972280f	Fix a few text defines	2014-01-14 06:03:34 +01:00
Marc Zinnschlag	3e58eb34e4	Merge remote-tracking branch 'sergeyshambir/startcombat' Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2014-01-13 10:17:10 +01:00
Marc Zinnschlag	e453468eff	moved CellRef loading code to the CellRef class	2014-01-12 19:23:08 +01:00
Marc Zinnschlag	9025210965	Merge branch 'refnum' into savedgame Conflicts: apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/manualref.hpp components/esm/cellref.hpp	2014-01-12 16:58:06 +01:00
scrawl	1d19d36bd6	Remove unused magic effect flags and update esmtool output	2014-01-12 01:25:00 +01:00
scrawl	ce6aab89cf	Fix a possible permutation issue	2014-01-11 04:58:30 +01:00
scrawl	c64dc2c831	Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.	2014-01-11 00:51:03 +01:00
scrawl	bfdca3b738	Fix needTangents not being set for cached/shared materials	2014-01-09 23:13:31 +01:00
scrawl	aa855e9524	Include some required Ogre headers explicitely	2014-01-09 20:56:24 +01:00
scrawl	6f9113fe88	Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions	2014-01-09 01:49:58 +01:00
Marc Zinnschlag	7c8f735004	Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28	2014-01-08 20:16:39 +01:00
scrawl	7b33f6f2ac	Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.	2014-01-08 17:19:43 +01:00
scrawl	0285d18fc2	Respect items belonging to a faction	2014-01-07 20:24:01 +01:00
Sergey Shambir	d5a0ff17fd	MWScript: updated vmformat.txt, changed opcodes to fix sequence. Opcodes for StartCombat, StopCombat, GetTarget now follow the last previous opcode.	2014-01-07 05:06:20 +04:00
Sergey Shambir	5c7e39a92f	Implemented script commands StartCombat, StopCombat, GetTarget. Also renamed one field of AIWander class because it's not longer unknown.	2014-01-07 04:43:06 +04:00
Marc Zinnschlag	fefaec5804	Merge remote-tracking branch 'scrawl/savedgame' into savedgame	2014-01-06 22:30:08 +01:00
scrawl	4ad43fdf92	Closes #1088 : Quick&dirty fix for NIF filters not working properly with some mods	2014-01-06 19:01:05 +01:00
Marc Zinnschlag	43dd3b8ef2	removed redundant deletion flag from CellRef	2014-01-06 13:53:20 +01:00
scrawl	62774fcc4a	Merge branch 'master' into HEAD Conflicts: apps/openmw/mwbase/world.hpp apps/openmw/mwinput/inputmanagerimp.cpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/loadtes3.cpp	2014-01-06 00:23:17 +01:00
scrawl	b3764c504a	Implement GetPcJumping instruction	2014-01-05 19:08:12 +01:00
scrawl	c004fb778f	Get rid of underscore defines. They are reserved by the standard.	2014-01-05 18:22:29 +01:00
scrawl	b8e9343764	Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes	2014-01-05 18:09:50 +01:00
scrawl	14b70a3ce6	Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)	2014-01-05 01:34:35 +01:00
scrawl	2a7d610f87	Implement GetSpellReadied instruction	2014-01-03 22:55:17 +01:00
scrawl	55c5d7cee4	Implement Resurrect instruction	2014-01-03 15:54:23 +01:00
scrawl	b4230f716e	Implement RemoveEffects instruction	2014-01-03 05:19:10 +01:00
scrawl	7d8ca91286	Implement RemoveSpellEffects instruction	2014-01-03 05:18:44 +01:00
scrawl	366801f3d5	Implement explodeSpell instruction (like Cast, with caster = target)	2014-01-03 04:44:50 +01:00
scrawl	93e1a2df73	Implement Cast script instruction (shrines work now)	2014-01-03 04:09:52 +01:00
scrawl	29acc3f722	Fix particles being too small. Looks like this should actually be size*2.	2014-01-02 16:56:31 +01:00
Marc Zinnschlag	a6e6411686	Merge remote-tracking branch 'scrawl/master'	2014-01-02 12:12:52 +01:00
scrawl	783c501d70	Some checks to prevent bound item abuse	2014-01-02 01:36:08 +01:00
Marc Zinnschlag	e1355be47c	Merge remote-tracking branch 'lgro/valgrind_warnings'	2014-01-01 19:41:52 +01:00
Lukasz Gromanowski	1ce4663065	Updated compiler opcodes for COE, and setHello. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-31 18:13:38 +01:00
scrawl	86b2211932	Don't warn about NiFlipController (already implemented)	2013-12-31 17:33:15 +01:00
scrawl	764ec9bc5f	Closes #716 : Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now.	2013-12-31 15:50:27 +01:00
scrawl	07a9b7623a	Enable skeleton-based bounding boxes added in Ogre 1.10	2013-12-31 13:22:57 +01:00
scrawl	254eba350e	Not handling interpolation type should be an error, since it will fail reading the next record if it hasn't read the previous one completely.	2013-12-31 00:56:04 +01:00
Lukasz Gromanowski	50b6e828cc	Added asserts in Interpreter::installSegmentX methods. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-30 23:51:44 +01:00
scrawl	f3a7321a43	Closes #856 : More aggressive supression of skeleton base: only create for keyframe controllers, not any controllers	2013-12-30 16:44:07 +01:00
Lukasz Gromanowski	60fb75b03a	Fixed valgrind warning about uninitialized variable: ==16814== Conditional jump or move depends on uninitialised value(s) ==16814== at 0xA945B8: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener) (quadtreenode.cpp:269) ==16814== by 0xA94A77: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener) (quadtreenode.cpp:354) ==16814== by 0xA77541: Terrain::World::update(Ogre::Vector3 const&) (world.cpp:159) ==16814== by 0x6EBA17: MWRender::RenderingManager::requestMap(MWWorld::CellStore) (renderingmanager.cpp:649) ==16814== by 0x8A25C4: MWWorld::Scene::loadCell(MWWorld::CellStore, Loading::Listener) (scene.cpp:157) ==16814== by 0x8A2CEA: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:296) ==16814== by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440) ==16814== by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761) ==16814== by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436) ==16814== by 0x92843D: OMW::Engine::go() (engine.cpp:483) ==16814== by 0x6C6B3F: main (main.cpp:279) ==16814== Uninitialised value was created by a heap allocation ==16814== at 0x4C27CC2: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) ==16814== by 0xA93E60: Terrain::QuadTreeNode::createChild(Terrain::ChildDirection, float, Ogre::Vector2 const&) (quadtreenode.cpp:178) ==16814== by 0xA7733E: Terrain::World::buildQuadTree(Terrain::QuadTreeNode) (world.cpp:139) ==16814== by 0xA76B18: Terrain::World::World(Loading::Listener, Ogre::SceneManager, Terrain::Storage*, int, bool, bool) (world.cpp:94) ==16814== by 0x6EC6EB: MWRender::RenderingManager::enableTerrain(bool) (renderingmanager.cpp:1013) ==16814== by 0x8A2A00: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:206) ==16814== by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440) ==16814== by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761) ==16814== by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436) ==16814== by 0x92843D: OMW::Engine::go() (engine.cpp:483) ==16814== by 0x6C6B3F: main (main.cpp:279) Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-29 21:58:55 +01:00
Marc Zinnschlag	56a80da70c	Merge remote-tracking branch 'ace/win-fix'	2013-12-29 14:50:09 +01:00
Marc Zinnschlag	456b41f05b	Merge remote-tracking branch 'scrawl/master'	2013-12-29 14:45:22 +01:00
scrawl	c0dba2834b	Closes #855 : Don't try to look up bone if there's no skeleton	2013-12-29 01:20:57 +01:00
Alexander "Ace" Olofsson	b50151cb38	Quick build fix for windows	2013-12-28 18:16:01 +01:00
Marc Zinnschlag	f1be4656ec	Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding'	2013-12-28 17:14:41 +01:00
Marc Zinnschlag	60a8a9e684	Merge remote-tracking branch 'scrawl/master'	2013-12-28 17:03:54 +01:00
Lukasz Gromanowski	9b73d23139	Fix warning about uninitialized variable inside stream.peak(): openmw/mwgui/bookpage.cpp:394:13: warning: ‘((void)& stream +24)’ may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-28 13:55:54 +01:00
scrawl	6d47d710a0	Reimplement NiGeomMorpherController using Ogre's pose animation system	2013-12-28 00:51:09 +01:00
Marek Kochanowicz	03235bf0a2	NPC. Still WIP.	2013-12-27 22:13:55 +01:00
scrawl	a9526622b1	Particle improvements: particle systems now move with the particle bone, not the scene node. This difference is not noticable if the particle bone is static, but it makes the code much nicer and mirrors more closely what NifSkope does.	2013-12-27 18:58:24 +01:00
scrawl	9877db413c	Connect particle systems to the particle node, not the emitter node	2013-12-26 20:53:52 +01:00
scrawl	eab2c89346	Issue #983 : Fix controllers to affect objects attached to the base node	2013-12-26 20:53:52 +01:00
scrawl	5931fdcbde	Implement NiBillboardNode. Flags not handled yet.	2013-12-26 20:53:52 +01:00
scrawl	33389b9b63	XDG compliant paths	2013-12-26 20:53:51 +01:00
scrawl	aef0fd1460	Rename some path methods	2013-12-26 20:53:51 +01:00
scrawl	e68e2f82a2	Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.	2013-12-26 20:53:51 +01:00
scrawl	0050e6e67b	Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.	2013-12-26 20:53:51 +01:00
scrawl	c5c3248376	Compile fixes for Ogre 1.10	2013-12-26 20:53:51 +01:00
scrawl	6d27ebabb6	Integrate AddGlow with material controllers	2013-12-26 20:53:45 +01:00
pvdk	095ff4e17a	Moved launcher settings stuff into components, so they can be reused in the wizard	2013-12-25 00:50:25 +01:00
Nikolay Kasyanov	892ff93489	OS X: attempt to fix #1045	2013-12-25 00:25:58 +04:00
Marek Kochanowicz	e4e7d50623	Added creatureCheck. I don't know meaning of all data fields here.	2013-12-23 12:32:35 +01:00
Lukasz Gromanowski	18a9878bdd	Fixes #1042 : TES3 header data wrong encoding Changed loading of HEDR structure from all-in-once to field-by-field so author and descryption could be converted to UTF-8. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-21 09:33:05 +01:00
scrawl	5fd98d7c3a	Add an assertion	2013-12-19 01:41:36 +01:00
scrawl	18c002a21d	Fix an awful typo.	2013-12-19 01:31:42 +01:00
Marc Zinnschlag	c22e38f825	removing 255 content file limitation	2013-12-17 21:19:05 +01:00
scrawl	19e5978a01	Merge branch 'master' of https://github.com/zinnschlag/openmw Conflicts: apps/openmw/main.cpp	2013-12-16 13:35:31 +01:00
Marc Zinnschlag	1cf1d49bc4	fix to content file reading error reporting in case of missing dependency	2013-12-16 11:39:24 +01:00
Marc Zinnschlag	bf4ffe94dc	fixed a memory leak in the script record	2013-12-15 16:19:45 +01:00
Marc Zinnschlag	3590fa40bd	store global script state in saved game files	2013-12-15 16:16:50 +01:00
scrawl	530d06ab54	Remove unused code	2013-12-14 05:07:08 +01:00
scrawl	0c3c3ed8e9	Fix wind gravity affector	2013-12-11 15:15:30 +01:00
Marc Zinnschlag	77a2179d1e	Merge remote-tracking branch 'scrawl/master'	2013-12-09 18:39:34 +01:00
scrawl	57a33c957e	Add possibly missing include	2013-12-09 14:26:08 +01:00
scrawl	37a7ee8fcd	Set alpha value of character animations according to Invisibility / Chameleon effects.	2013-12-08 23:05:21 +01:00
Lukasz Gromanowski	594cc693b2	Fixes #1006 : Many NPCs have 0 skill Added calculation of skill values for NPC with mNpdtType set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12). Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-08 21:47:43 +01:00
scrawl	9fcb4fad5c	Implement NiFlipController	2013-12-08 18:51:56 +01:00
scrawl	51a9f0111c	Implement NiAlphaController and NiMaterialColorController	2013-12-08 16:38:13 +01:00
scrawl	1624e0fd8a	Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.	2013-12-07 20:15:39 +01:00
Marc Zinnschlag	ef8c0fab73	Merge remote-tracking branch 'scrawl/master'	2013-12-07 16:26:52 +01:00
scrawl	c5e543b91b	Implement NiGeomMorpherController	2013-12-07 14:10:33 +01:00
Marc Zinnschlag	030c733e2d	Merge branch 'master' into savedgame Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwworld/worldimp.cpp files/settings-default.cfg	2013-12-07 12:27:06 +01:00
Marc Zinnschlag	674931a851	remove terminating 0 from strings read from ESM records	2013-12-06 14:24:14 +01:00
Lukasz Gromanowski	bfd79bfbe6	Various fixes for CppCheck warnings. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-12-06 07:36:16 +01:00
Marc Zinnschlag	07f692bdd2	Merge remote-tracking branch 'scrawl/master'	2013-12-05 16:04:50 +01:00
scrawl	062ea627b3	Add parallax mapping for objects	2013-12-05 15:51:07 +01:00
scrawl	69c0bb1723	Add normal, specular & parallax mapping for terrain	2013-12-05 15:51:01 +01:00
Alexander "Ace" Olofsson	47c60a7037	Fix C4716 (Must return a value) error on Windows MSVC	2013-12-04 21:48:25 +01:00
scrawl	3a82f8c193	Fix incorrect log file name for launcherOgre.log	2013-12-03 15:56:00 +01:00
Marc Zinnschlag	e269c9e689	changed a few sub record names to make them more unique	2013-12-03 14:30:18 +01:00
Marc Zinnschlag	7d8e3ac651	fixed QuestState::load/save	2013-12-03 13:51:44 +01:00
Marc Zinnschlag	16e2d67b1f	added overloaded start/endRecord functions to ESMWriter	2013-12-01 13:32:11 +01:00
Marc Zinnschlag	eec9821cd8	added records for storing journals in saved game files	2013-11-30 14:41:12 +01:00
pvdk	1512ac11ad	Fixed the content selector checkboxes appearing as partially checked	2013-11-30 12:16:57 +01:00
Marc Zinnschlag	750133c0dd	one more fix to SavedGame record saving	2013-11-30 11:05:07 +01:00
scrawl	e7ad503e30	Merge branch 'particles' into projectiles	2013-11-28 17:16:59 +01:00
Marc Zinnschlag	e432ab5e8a	fixed static problem in Land recrod save function	2013-11-28 11:51:21 +01:00
Marc Zinnschlag	b40c0f2a07	one more fix to SavedGame record saving	2013-11-26 09:56:08 +01:00
scrawl	9f5ff033d7	Handle the "GetLOS" alias for GetLineOfSight	2013-11-25 14:06:59 +01:00
scrawl	58dce88c7d	Handle the "tai" alias for ToggleAI	2013-11-25 14:03:51 +01:00
scrawl	6b81fd78f1	Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems.	2013-11-25 13:50:33 +01:00
Marc Zinnschlag	1ecadccb28	fixed save function of SavedGame record	2013-11-25 12:59:40 +01:00
Marc Zinnschlag	67cd0887e6	added description field to saved game record; make use of description in GUI	2013-11-24 15:19:56 +01:00
Marc Zinnschlag	fc1501a510	store character profile information in saved game file	2013-11-21 10:53:42 +01:00
Marc Zinnschlag	d6e2701dd6	changed played time data type from float to double	2013-11-21 10:10:41 +01:00
scrawl	3452bd2e0b	Add glow effect for enchanted items	2013-11-20 00:13:12 +01:00
Marc Zinnschlag	9487bd33c3	removed broken save function from ESMWriter	2013-11-19 16:07:36 +01:00
Marc Zinnschlag	4c61deca8d	fixed save code for SavedGame record	2013-11-19 15:31:39 +01:00
Marc Zinnschlag	35bf98a940	modified esm reader/writer to use UTF8 when no encoder is given	2013-11-19 13:46:24 +01:00
Marc Zinnschlag	903e867c24	change to TES3 record (moved format field to the top)	2013-11-19 13:44:18 +01:00
Marc Zinnschlag	dc75627d53	added secondary saved game header record	2013-11-19 10:51:30 +01:00
Marc Zinnschlag	11e254aac8	Merge remote-tracking branch 'gus/AICombat' Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2013-11-19 09:10:48 +01:00
gus	dff3cf162d	ToggleAI script instruction	2013-11-18 23:03:44 +01:00
scrawl	7fd5f1df83	Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX.	2013-11-17 23:31:08 +01:00
scrawl	aa84ce3f0d	Copy paste mistake (oops)	2013-11-16 14:44:31 +01:00
scrawl	c5f1bbcc5f	Add functions to get the effect affecting resistance and weakness for another effect	2013-11-15 19:43:25 +01:00
scrawl	956d8adb99	Merge branch 'master' of https://github.com/zinnschlag/openmw into magic Conflicts: apps/openmw/mwgui/inventoryitemmodel.cpp	2013-11-14 14:25:22 +01:00
Marc Zinnschlag	d49b8e7443	Merge branch 'dialogue'	2013-11-14 11:40:50 +01:00
scrawl	a6e2f43b75	Stop continuous VFX when the effect is no longer active.	2013-11-13 15:44:43 +01:00
scrawl	ffdb91bb21	Add particles for Cast + Hit. Not looking quite right yet.	2013-11-11 23:43:28 +01:00
Marc Zinnschlag	2fff7fc843	save info records	2013-11-11 12:21:26 +01:00
scrawl	afafaf73e8	Fix a build error	2013-11-10 22:40:46 +01:00
Marc Zinnschlag	8c4303399f	Merge branch 'master' into dialogue Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp	2013-11-10 13:21:39 +01:00
Marc Zinnschlag	418ccf705d	Merge branch 'openmw-27' Conflicts: apps/launcher/graphicspage.hpp components/CMakeLists.txt	2013-11-06 10:21:25 +01:00
Marc Zinnschlag	2d4a6c0edf	cleaned up ID handling in INFO record (including a ESMTool bug fix)	2013-11-05 12:56:20 +01:00
Marc Zinnschlag	9d7695ea88	added missing columns to topic info table	2013-11-05 11:41:48 +01:00
graffy76	ed913936f8	Eliminated game & addon keys from profile configuration	2013-11-03 21:36:41 -06:00
graffy76	1d4b5a2425	Fix broken launcher content file display / selection scheme Disable selection of content files with missing dependencies (grayed out)	2013-11-03 14:02:41 -06:00
graffy76	12c06a5615	Fixed broken dependency check	2013-11-03 06:21:28 -06:00
graffy76	973803eb2f	Fixed pathing issues in launcher	2013-11-03 00:02:46 -05:00
graffy76	8d12e2b99d	fixed merge conflicts Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/launcher/settings/gamesettings.hpp components/contentselector/model/contentmodel.cpp	2013-11-02 09:31:23 -05:00
graffy76	cddece4f9e	Another stab at fixing the pathing problem...	2013-11-01 21:47:26 -05:00
Marc Zinnschlag	767cb54e7c	added missing columns to journal info table	2013-10-31 12:54:55 +01:00
gus	d587f3c946	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/docs/vmformat.txt	2013-10-31 09:51:17 +01:00
scrawl	636d399c7f	Refactored Ogre initialisation into a component	2013-10-30 14:04:33 +01:00
Marc Zinnschlag	ba88c94d58	first attempt at an info record collection	2013-10-29 13:18:22 +01:00
graffy76	b51bef0d98	fixed missing adjuster widget in file dialog open view	2013-10-27 20:21:19 -05:00
Lukasz Gromanowski	d51c9b64dd	Issue #913 : Merge --master and --plugin switches Launcher part of master/plugin switches merge. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2013-10-27 20:03:12 +01:00
graffy76	9ce4a04a2d	merge from saving Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp	2013-10-25 14:44:22 -05:00
graffy76	16d87ea1d1	Merge branch 'master' into esxSelector	2013-10-25 08:11:24 -05:00
graffy76	2ca7f24731	Fixed filedialog new / edit content path issue	2013-10-24 17:33:28 -05:00
graffy76	b48f066f33	Reimplemented content selector for filedialog and datafilespage classes	2013-10-23 17:39:17 -05:00
graffy76	ba3589bc76	Revert "Implemented ContentSelector as a singleton "charm" modifier for" This reverts commit `24b167b755`. Conflicts: apps/launcher/datafilespage.cpp apps/opencs/editor.cpp apps/opencs/view/doc/filedialog.cpp apps/opencs/view/doc/filedialog.hpp components/contentselector/view/contentselector.cpp components/contentselector/view/contentselector.hpp	2013-10-22 22:20:21 -05:00
graffy76	f9591ddda6	Reimplemented constentselector view class	2013-10-22 21:52:35 -05:00
Marc Zinnschlag	c995533e07	Merge branch 'dialogue' into saving Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp	2013-10-21 16:45:43 +02:00
Marc Zinnschlag	adf3a41a83	added topic and journal tables	2013-10-20 17:15:32 +02:00
Nikolay Kasyanov	3993c34739	Merge remote-tracking branch 'upstream/master' into osx-ogre-19	2013-10-14 20:37:55 +04:00
Marc Zinnschlag	3c580fbc59	Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'	2013-10-12 13:40:29 +02:00
Jordan Ayers	296b2ab870	Magic Effect: Recognize other display types. Fill out the list of effects which use percentage formatting. Add in types which use Feet and level labels.	2013-10-08 23:55:14 -05:00
Jordan Ayers	6ab7002908	MagicEffect: Put magnitude type into ESM::MagicEffect helper.	2013-10-07 22:28:55 -05:00
graffy76	4c72a9ffdf	Fixed non-loading files	2013-10-06 22:10:38 -05:00
graffy76	217a4d75b4	Implemented profile function in launcher datafiles page Implemented dependency sorting to ensure dependent files appear latest in the list.	2013-10-06 21:13:47 -05:00
Emanuel Guevel	496f786c2a	Implement Disable/EnableLevitation script functions Totally copied on Disable/EnableTeleporting implementation. Thanks KittyCat!	2013-10-02 15:33:20 +02:00
graffy76	a5a0f61533	Fixed missing profiles combobox	2013-10-01 22:36:49 -05:00
graffy76	00c78a4aa1	Implementing ContentSelector class in DataFilesPage Moved AdjusterWidget / FileWidget to ContentSelectorView	2013-10-01 21:29:45 -05:00
graffy76	24b167b755	Implemented ContentSelector as a singleton "charm" modifier for FileDialog...	2013-09-29 12:19:07 -05:00
Marc Zinnschlag	baae548106	added project scope filter saving	2013-09-27 13:56:40 +02:00
Marc Zinnschlag	4ea5191d7d	fixed write function for ESM variant type	2013-09-27 13:17:04 +02:00
Marc Zinnschlag	5779f799ab	create project file when saving content file	2013-09-27 11:36:06 +02:00
Marc Zinnschlag	c42e74dadf	make 4 byte record type accessable from record struct	2013-09-24 13:17:28 +02:00
graffy76	3b40192e90	Merge branch 'master' into esxSelector	2013-09-23 22:03:42 -05:00
graffy76	9d358dd44c	Further implemented auto-checking / unchecking of dependencies	2013-09-23 22:01:44 -05:00
graffy76	d7cff6361e	Fixed filter issue (all addons for a gamefile are enabled for checking). Note: Other dependencies are not yet automatically selected when an addon is checked.	2013-09-23 06:51:49 -05:00
Marc Zinnschlag	d4b2a6b9f1	Merge remote-tracking branch 'graffy76/esxSelector' into saving	2013-09-23 10:09:43 +02:00
graffy76	513f0c4b3e	Implemented file/adjuster widgets into new addon creation dialog	2013-09-22 23:52:53 -05:00
Xethik	9f533dbbe4	Fixed "most vexing parse" issue.	2013-09-22 04:57:01 -04:00
graffy76	cfdc19c427	Renamed esxSelector to contentSelector Fixed datafilespage model implementation in launcher Filtered addons in table view by selected game file	2013-09-21 23:06:29 -05:00
graffy76	7b7dfa122d	Merge branch 'master' into esxSelector	2013-09-19 16:24:28 -05:00
graffy76	244e581952	Finished implementing drag / drop refactored datafilesmodel (now contentmodel) refactored esmfil	2013-09-19 06:53:09 -05:00
graffy76	0eb06ada39	Implemneting drag and drop	2013-09-18 02:36:23 -05:00
Marc Zinnschlag	bf0fba68af	added save stage for globals	2013-09-16 12:51:57 +02:00
Marc Zinnschlag	874ce26bef	added missing consts to record save functions	2013-09-16 12:32:35 +02:00
Nikolay Kasyanov	25cd9ebf45	Plugins are frameworks in Ogre 1.9. Version hack removed.	2013-09-15 21:56:47 +04:00
Marc Zinnschlag	1ee228a566	fix for the ESMWriter fix	2013-09-15 15:30:17 +02:00
Marc Zinnschlag	bcd36bd378	various ESMWriter fixes	2013-09-15 15:00:15 +02:00
Marc Zinnschlag	bf8a25c2c6	Merge remote-tracking branch 'mckibbenta/tgm'	2013-09-12 19:07:35 +02:00
gus	f9bfbc8764	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat	2013-09-10 16:18:39 +02:00
gus	46a734852b	adding script instruction getLOS + some test about AI	2013-09-10 16:16:13 +02:00
Marc Zinnschlag	25b7cd33ea	added FileWidget; fixed OpenCS configuration	2013-09-08 14:31:20 +02:00
graffy76	a6e7cf9a8c	Implementing drag and drop	2013-09-07 15:57:40 -05:00
Marc Zinnschlag	9332684335	allow the use of value types in string filters	2013-09-05 15:05:49 +02:00
scrawl	188df341c3	Replaced log2 to make VC happy	2013-08-27 16:08:58 +02:00
scrawl	839d251cc5	Renamed Terrain::Terrain to Terrain::World to make VC happy	2013-08-27 16:01:16 +02:00
scrawl	d3d6dfbde8	Refactored loading screen - Add loading progress for data files, global map, terrain - Refactored and improved cell loading progress	2013-08-27 15:48:13 +02:00
mckibbenta	06701467ab	Merge branch 'master' into tgm	2013-08-24 21:28:26 -04:00
mckibbenta	8998b90e8b	initial do-nothing implementation; registered opcode	2013-08-24 21:19:12 -04:00
Marc Zinnschlag	f605dcdd24	Merge branch 'filter'	2013-08-24 14:51:05 +02:00
Nikolay Kasyanov	dc6e15f38e	Replaced std::pow with shift since clang doesn't like int as a first argument (reports that call is ambiguous)	2013-08-21 23:59:33 +04:00
Marc Zinnschlag	e03e2f0817	Merge remote-tracking branch 'scrawl/master'	2013-08-21 19:50:08 +02:00
scrawl	d086346b07	Fix loading of some cells in TR	2013-08-21 17:26:11 +02:00
scrawl	5f7e6f7b10	Fix a material issue, layers per pass wasn't entirely correct	2013-08-21 17:26:11 +02:00
scrawl	43313437dc	Fix composite map for cells without land data	2013-08-21 17:26:11 +02:00
scrawl	ce5ea6d7d2	Use a proper node hierarchy; disconnect the root when entering interior	2013-08-21 17:26:11 +02:00
Chris Robinson	602be9bbe7	Avoid swimming into the air from underwater	2013-08-21 07:24:54 -07:00
graffy76	e6fdc7e7fd	...	2013-08-20 12:34:39 -05:00
graffy76	6898321676	Reenabling features Profile functions enabled New/load file functions partially enabled Layout reorganized	2013-08-20 08:16:56 -05:00
scrawl	fa76d1631b	Some terrain fixes	2013-08-20 12:08:46 +02:00
graffy76	b52645bf2a	Fixes to accommodate master/plugin loading	2013-08-20 03:23:32 -05:00
scrawl	8c8653160d	Crash fix, material fix	2013-08-20 09:52:27 +02:00
scrawl	b92da9ae93	Neighbour fix	2013-08-19 21:08:44 +02:00
scrawl	ebf9debb80	Enabled terrain self shadows, implemented getHeightAt, some optimizations	2013-08-19 20:39:37 +02:00
scrawl	e27437f8ed	New terrain renderer - improvements: - Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now. - Fixes several blending issues and cell border seams - Fix map render to use the terrain bounding box instead of an arbitrary height - Different LODs are now properly connected instead of using skirts - Support self shadowing - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better - Support a fixed function fallback (though the splatting shader usually performs better) - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance	2013-08-19 20:34:20 +02:00
scrawl	a41a23c90a	Deleted old code	2013-08-19 20:34:19 +02:00
graffy76	e614ec3353	Fixing profile code in progress...	2013-08-18 17:11:23 -05:00
graffy76	f6217f9c6a	Moved esx selector classes out of global namespace	2013-08-18 15:11:29 -05:00
graffy76	a14e0b32d8	Restructured esxselector directory Added ./view Removed ./utils and ./model/esm Relocated code accordingly.	2013-08-18 09:48:13 -05:00
graffy76	d0363b037c	Renamed components/fileorderlist to components/esxselector	2013-08-18 09:41:02 -05:00
graffy76	45277c0082	Minor changes Stretched table columns to fit widget width Reduced width of opencs file dialog Hid the file size column for launcher Added alternating row colors in table view	2013-08-18 09:34:33 -05:00
graffy76	66e50343ad	Fixed row-selection/check feature	2013-08-18 08:54:51 -05:00
graffy76	a9db983233	Fixing row-click selection	2013-08-18 07:29:48 -05:00
graffy76	2878f51cd3	Reimplemented dependency selection feature Moved more code to ContentSelector Added support for omwgame and omwaddon files	2013-08-17 19:40:28 -05:00
graffy76	b24dd5c6ac	Continued migration of code to ContentSelector	2013-08-17 05:55:43 -05:00
graffy76	0087b0d67c	Removed checkboxes from master list Moved checkbox code from datafilesmodel to pluginsproxymodel	2013-08-17 05:37:23 -05:00
graffy76	61602789e1	Began migrating code to ContentSelector base	2013-08-16 22:23:21 -05:00
graffy76	4c8c6d6971	Moved init code to master / plugin proxy classes	2013-08-16 21:20:48 -05:00
graffy76	7389507eb5	Created masterproxylist class	2013-08-16 21:12:30 -05:00
graffy76	b850fe0289	Removed vertical headers from plugin view	2013-08-16 18:59:01 -05:00
graffy76	84e5c2610a	Implemented combobox for game file selection	2013-08-16 18:00:23 -05:00
graffy76	bfb71f23c9	Changed filter mechanism for game / addons Filters by number of master references, regardless of extension	2013-08-16 17:26:23 -05:00
Chris Robinson	73437dfdca	GetEffect can accept an effect ID string as well	2013-08-13 19:18:21 -07:00
Chris Robinson	30973352e8	Implement ShowVars (SV) console function	2013-08-13 04:54:41 -07:00
Chris Robinson	6fd4cdb5fb	Play randomized werewolf sounds	2013-08-11 00:53:17 -07:00
Chris Robinson	5968165de0	Merge remote-tracking branch 'zini/master' into werewolf Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2013-08-09 07:00:00 -07:00
Chris Robinson	db1036e5e5	Handle SetWerewolfAcrobatics	2013-08-09 05:37:56 -07:00
Chris Robinson	ae183cb3e4	Handle werewolf stats	2013-08-09 05:14:58 -07:00
Marc Zinnschlag	a95715b61d	added description field to filter record	2013-08-09 13:45:50 +02:00
Marc Zinnschlag	bf839d19cf	Merge branch 'columns'	2013-08-08 12:50:57 +02:00
Chris Robinson	2bac4566c0	Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf Conflicts: apps/openmw/mwmechanics/actors.cpp apps/openmw/mwscript/statsextensions.cpp	2013-08-08 00:09:29 -07:00
Alex	b9579e085f	cleanup	2013-08-07 15:40:57 -04:00
Alex	a0931b01fe	Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg	2013-08-07 13:19:23 -04:00
Alex	c3ca5b7c32	mild cleanup	2013-08-07 13:16:20 -04:00
Chris Robinson	57fb065a86	Add Ogre::Light objects to the object list Note that NIFs actually have NiLight-based light records which could be used to create Ogre::Light objects. However, no Morrowind NIF uses them, as far as I can tell.	2013-08-06 19:49:01 -07:00
Alex	de1f423bd7	initial move of script opcodes and registerExtensions functions to components/compiler	2013-08-06 20:38:41 -04:00
Marc Zinnschlag	501753c01b	Merge remote-tracking branch 'scrawl/master' into columns	2013-08-03 15:06:30 +02:00
scrawl	7dc30a01cd	Some changes suggested by cppcheck	2013-07-31 18:46:32 +02:00
Marc Zinnschlag	adb05737ee	Merge branch 'master' into filter Conflicts: apps/opencs/model/world/universalid.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/subviews.cpp	2013-07-30 15:55:50 +02:00
Chris Robinson	b7e81dbc5b	Ignore controllers on the root NiNode I wonder if we should ignore the root NiNode completely.	2013-07-28 04:20:33 -07:00
Chris Robinson	fb0ee7f2fc	Improve constness of the Nif RecordPtr structs	2013-07-24 23:58:35 -07:00
Chris Robinson	8e24cab935	Strip trailing whitespace from textkeys	2013-07-24 23:21:19 -07:00
Marc Zinnschlag	6f90e071f4	added filter record (will not be used in OpenMW prior to 1.1)	2013-07-22 20:50:04 +02:00
Marc Zinnschlag	47f7bbd48a	fixed OpenCS crash during cell loading when loading multiple ESX files	2013-07-16 12:08:35 +02:00
Marc Zinnschlag	0fd49f10a9	Merge branch 'minus'	2013-07-07 16:09:44 +02:00
Marc Zinnschlag	4a75c7dcc0	allow backticks in names	2013-07-07 16:09:26 +02:00
Marc Zinnschlag	4986b7d65d	Merge branch 'master' into ref	2013-07-06 17:54:19 +02:00
graffy76	a73b97d125	Fixed broken references and other bugs Removed references to CSVSettings::SamplePage class Removed multiple QDebug references Fixed custom LineEdits (window size user pref) would not accept data	2013-06-21 23:23:43 -05:00
Marc Zinnschlag	a2aa3aaa0e	workaround for - in names	2013-06-21 14:20:52 +02:00
Marc Zinnschlag	744198fc44	added blank function to CellRef and moved a function that was in the wrong file	2013-06-08 15:49:59 +02:00
scrawl	daab4f55a3	Use Morrowind's fonts	2013-06-06 22:26:06 +02:00
Miroslav Puda	dc17fa1636	Removal of duplicit enumeration and unnecessary conditions.	2013-05-29 00:01:18 +02:00
Miroslav Puda	b40e24c50c	Refactorization	2013-05-27 20:23:04 +02:00
Miroslav Puda	cfbdf3f779	Enum Type renamed to CastingStyle	2013-05-27 15:37:31 +02:00
Miroslav Puda	9e1eb8b3b1	Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics	2013-05-27 14:45:22 +02:00
Miroslav Puda	4788b5e226	Better formula for enchantment cost and code refactorization.	2013-05-27 14:42:08 +02:00
eroen	886bc7e2f6	libc++ fixes: don't rely on tr1 libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11. Since this is the only tr1 header used in openmw, add a check for c++11 unordered_map and fallback to tr1 unordered_map if it's not found.	2013-05-26 12:44:30 +02:00
Miroslav Puda	7149439ace	Replacement of empty() method by assertion.	2013-05-22 13:23:49 +02:00
Miroslav Puda	cd57523601	Merge branch 'master' of https://github.com/zinnschlag/openmw	2013-05-20 14:01:47 +02:00
Marc Zinnschlag	c626e2b257	Merge branch 'ref' Conflicts: apps/opencs/view/doc/view.hpp	2013-05-19 14:59:01 +02:00
Miroslav Puda	d5689730eb	Removal of unnecessary variable. empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.	2013-05-18 22:57:27 +02:00
Chris Robinson	53d1c3939c	Merge remote-tracking branch 'zini/master' into animations	2013-05-17 06:26:34 -07:00
scrawl	ca81335319	Fix bug loading attribute values	2013-05-16 21:45:49 +02:00
scrawl	8a3d3f954b	NPC/creature persistence flag	2013-05-16 18:50:26 +02:00
Chris Robinson	822f130f79	Merge remote-tracking branch 'zini/master' into animations	2013-05-13 04:09:56 -07:00
Marc Zinnschlag	e2620a1edf	Issue #694 : allow float literals starting with .	2013-05-13 11:38:35 +02:00
Chris Robinson	eb4daaf512	Build a skeleton for Nifs that have a matching .kf file	2013-05-08 01:03:57 -07:00
Chris Robinson	bf94ffb839	Only support NiSequenceStreamHelper as a Kf root Newer versions of the Nif foramt may have other record types, but we don't support those.	2013-05-07 18:26:22 -07:00
Chris Robinson	8e38dc410f	Allow loading multiple animation sources Animation sources are treated differently from base objects. When given "path\file.nif", base objects will look for "path\xfile.nif" and use that if it exists (falling back to the original name if not found). Animation sources will instead use "path\xfile.kf", ignoring it if the file doesn't exist.	2013-05-07 16:59:32 -07:00
Chris Robinson	6a3ba41170	Don't store camera nodes, we don't need them.	2013-05-06 21:46:11 -07:00
scrawl	757a26794a	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-06 15:35:38 +02:00
Marc Zinnschlag	b21dae8d75	added blank function to all referencable record structs	2013-05-06 14:10:43 +02:00
scrawl	f0354ea04c	Fix member variable case problem	2013-05-04 19:14:19 +02:00
scrawl	78e6dab9d2	Dialogue history rewrite WIP	2013-05-04 14:15:47 +02:00
scrawl	1f58edb9db	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-03 18:17:27 +02:00
Marc Zinnschlag	fe038cef03	turned redeclartion of local variables from an error into a warning	2013-05-01 14:20:09 +02:00
Marc Zinnschlag	63407a662c	allow <== and >== as alternative for <= and >= in scripts	2013-05-01 14:08:05 +02:00
scrawl	3c68c87923	Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries	2013-05-01 10:28:59 +02:00
scrawl	2a42556aa5	Merge branch 'master' into HEAD	2013-04-30 14:54:10 +02:00
scrawl	20d5ba0eec	Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs" This reverts commit `6dbb53493b`.	2013-04-30 14:54:07 +02:00
scrawl	24f968623f	Revert "reworked Nif::KeyListT into Nif::CurveT" This reverts commit `e7665582ad`.	2013-04-30 14:53:51 +02:00
scrawl	de3c76a54b	Revert "reworked NIFStream to use a type-handler" This reverts commit `03ee7663a3`.	2013-04-30 14:53:41 +02:00
Chris Robinson	15a2eeebb8	Merge remote-tracking branch 'zini/master' into animations Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-04-29 10:16:29 -07:00
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
scrawl	d5c7a26041	Fix broken loose file resources when using Ogre 1.9	2013-04-29 12:32:24 +02:00
scrawl	78596cad83	Fix enchantment points value	2013-04-29 10:19:09 +02:00
Chris Robinson	4cedf0fbab	Avoid colliding with AvoidNodes These are placed under the RootCollisionNode hierarchy, but the shapes they hold aren't collided with. Their exact function is unknown, but seems to be related to lava? Maybe damage avoidance info for the AI.	2013-04-28 11:12:55 -07:00
Glorf	6ea82333d4	Headers cleanup	2013-04-28 16:38:33 +02:00
Glorf	98baf9fac1	Bugfix #718	2013-04-28 16:36:12 +02:00
Marc Zinnschlag	90b38cbfbe	fixed parsing of end statements in scripts with IDs matching keywords	2013-04-27 14:06:23 +02:00
Nathan Jeffords	c7ede9b523	port code to C++03	2013-04-24 20:22:57 -07:00
Nathan Jeffords	6e7c9ebbe6	fix for gcc not handling static constant initialized in class definition	2013-04-24 20:22:57 -07:00
Nathan Jeffords	75757cb675	Created a class to represent a stream of UTF8 characters.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	6dbb53493b	enable move construction/assignment to key ESM data structure to reduce sorting costs	2013-04-24 20:20:00 -07:00
Nathan Jeffords	e7665582ad	reworked Nif::KeyListT into Nif::CurveT Renamed Nif:KeyListT to Nif::CurveT, moved it into its own file and changed its implementation so that on compatible platforms, the entire array of key-frames can be read in a single read call. Added a helper class called Nif::CurveT::interpolator to allow other code to easily evaluate the curve. Reworked part of the skeletonLoader code to use the interpolator to simplify its own logic.	2013-04-24 20:20:00 -07:00
Nathan Jeffords	03ee7663a3	reworked NIFStream to use a type-handler Reworked NIFStream to use a type-handler system to decide how to extract data from the NIF. It also has the capability to perform bulk reads on compatible platforms, thus improving cell-load performance.	2013-04-24 20:20:00 -07:00
Chris Robinson	68a9a4de5f	Fix setting and getting KeyframeController transforms	2013-04-24 04:12:27 -07:00
Chris Robinson	26cc86ffdc	Use the Nif node's transform for skinned fixups	2013-04-24 00:42:45 -07:00
Chris Robinson	6f0b9a5f2c	Avoid unnecessary multimap copies	2013-04-23 21:42:59 -07:00
Chris Robinson	512ff3687a	Don't create Ogre animations for skeletons	2013-04-23 20:42:54 -07:00
Chris Robinson	634b0fd067	Fix for controller delta time going below start time	2013-04-23 17:57:40 -07:00
Chris Robinson	020bc410bf	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-23 16:57:59 -07:00
scrawl	44ac0a7c18	Use one vertex buffer for all UV coordinates	2013-04-23 22:47:57 +02:00
Chris Robinson	adc6a948c7	Add methods to get the rotation, translation, and scale from a NodeTargetValue	2013-04-22 03:41:38 -07:00
Chris Robinson	59137d93c9	Partially handle NiGeomMorpherController The morphs aren't actually applied yet, but the Ogre controller is set up so all that has to be done is to implement the setValue method.	2013-04-22 03:24:02 -07:00
Chris Robinson	d936291dbf	Remove an unused ostream operator<<	2013-04-22 02:53:32 -07:00
Chris Robinson	a3511c62cf	Don't store textkeys in user object bindings It's a bit unwieldy to have them stored in the 'skeleton master' instead of the skeleton instance. And although the text keys are extracted for each created instance now, this shouldn't be much worse than the multimap copying going on before. Plus, proper serialization can help for future optimizations.	2013-04-22 00:01:30 -07:00
Chris Robinson	2345b5e8b3	Avoid storing text keys for each animation	2013-04-21 22:56:40 -07:00
Chris Robinson	7d59340ed6	Don't clip out the group name from the textkeys	2013-04-21 22:13:49 -07:00
Chris Robinson	ace7d647e5	Add a method to apply a NodeTargetValue-based controller to a specified node.	2013-04-20 15:35:19 -07:00
Chris Robinson	f37a71f025	Use a separate method to build node-based controllers	2013-04-19 23:56:47 -07:00
Chris Robinson	1051fa51a7	Recognize NiFlipController	2013-04-19 15:07:08 -07:00
Chris Robinson	6d59325bff	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-17 23:21:17 -07:00
scrawl	c519fc360d	Move away from fixed record names for body parts	2013-04-18 00:19:34 +02:00
Chris Robinson	3def2a0f45	Treat the particle random values as the max differential	2013-04-16 19:16:45 -07:00
Chris Robinson	cac793758b	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-16 11:52:19 -07:00
Chris Robinson	36170c5374	Use flag enums instead of hard-coded hex values	2013-04-16 01:20:32 -07:00
Chris Robinson	1b1f9f7921	Allow multiple ObjectLists to be created for Animations. addObjectList may not currently be called outside of the related constructor.	2013-04-15 18:55:28 -07:00
Chris Robinson	7000a1aa3e	Add a ParticleSystemController	2013-04-14 13:50:55 -07:00
Chris Robinson	bf8bc989fc	Recognize and partly handle NiBSParticleNode	2013-04-14 12:52:20 -07:00
Marc Zinnschlag	f692fc1093	Merge branch 'cell'	2013-04-14 19:35:19 +02:00
Marc Zinnschlag	0c33dd86d5	added basic cell table	2013-04-14 17:04:55 +02:00
Chris Robinson	f4695ec4ac	Cleanup NIFObjectLoader some	2013-04-14 00:06:40 -07:00
Chris Robinson	acb1b5f002	Try to handle NiBSAnimationNode This is still incomplete guess work. Currently it seems as though flag 0x20 specifies whether the controllers auto-play (if on), rather than follow the object's animation time.	2013-04-13 22:54:32 -07:00
Chris Robinson	0b363ba36e	Handle NiParticleColorModifier with Ogre's ColourInterpolator Note that Ogre's ColourInterpolator has a maximum of six color stages. This seems to be fine so far, but if we want anything better, we'll need a custom affector for it.	2013-04-13 16:42:32 -07:00
Chris Robinson	80a4345787	Keep particles in local space	2013-04-13 16:26:34 -07:00
Chris Robinson	dd981077b9	Handle the vertical and horizontal parameters of Nif particles Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif particle parameters seem to be set up to expect a normal OpenGL (Direct3D?) orientation, rather than the 90-degree pitch offset of the game.	2013-04-13 16:16:57 -07:00
Chris Robinson	7191f6ed2a	Start a Nif-style particle emitter Not complete yet (doesn't handle the vertical or horizontal direction/angle), and should probably be renamed.	2013-04-13 14:36:24 -07:00
Chris Robinson	07c24e0382	Don't create entities and particles when only the skeleton base is needed	2013-04-13 13:13:09 -07:00
Chris Robinson	4a42f89e08	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-13 13:04:41 -07:00
Chris Robinson	5b30677e41	Add the start of a custom gravity affector	2013-04-12 14:39:06 -07:00
Marc Zinnschlag	a1ece7de30	Bug #613 : fixed assert in string literal access function	2013-04-12 14:48:53 +02:00
scrawl	23b477a938	Fix normal maps with spaces in filename not getting loaded	2013-04-12 04:36:28 +02:00
Marc Zinnschlag	5bfa691f14	Merge branch 'script'	2013-04-11 10:50:46 +02:00
Marc Zinnschlag	6d3a2cd5a0	added comment token (for use in syntax colouring)	2013-04-11 10:50:22 +02:00
Chris Robinson	d26ffe9de0	Move a method to the Node class	2013-04-10 23:19:47 -07:00
Chris Robinson	62e0abd945	Move the mesh loader to its own source file	2013-04-10 22:38:46 -07:00
Chris Robinson	75489b1e9d	Move NIFMaterialLoader to a separate file	2013-04-10 20:24:44 -07:00
Chris Robinson	3970407772	Use actual classes for properties	2013-04-10 20:22:13 -07:00
Chris Robinson	caff28e20a	Move NIFSkeletonLoader to a separate file	2013-04-10 19:58:17 -07:00
Marc Zinnschlag	74145410f2	basic syntax highlighting in script subview	2013-04-10 22:49:22 +02:00
Chris Robinson	6c6750342c	Specified particle size is actually the radius	2013-04-10 13:37:20 -07:00
Chris Robinson	9d29921913	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-09 15:12:19 -07:00
Marc Zinnschlag	ec6dff38b1	added basic spell table	2013-04-09 11:40:36 +02:00
Chris Robinson	973fdeb2e0	Improve particle system placement when no emitters are specified	2013-04-08 15:21:28 -07:00
Chris Robinson	e7c0f2a211	Minor cleanup to loading texture UV coords	2013-04-08 14:54:13 -07:00
Chris Robinson	01a1a0b846	Merge remote-tracking branch 'zini/master' into nifogre Conflicts: components/nifogre/ogrenifloader.cpp	2013-04-08 11:46:57 -07:00
Marc Zinnschlag	85e5bd212b	Merge remote-tracking branch 'scrawl/master'	2013-04-08 20:05:52 +02:00
Chris Robinson	23097ac9dc	Minor cleanup of NiMorphData	2013-04-08 09:47:03 -07:00
scrawl	343e2027af	Support NIF detail maps	2013-04-08 15:17:30 +02:00
scrawl	a5c868c9f5	Create a separate vertex buffer for each UV set	2013-04-08 14:54:19 +02:00
Chris Robinson	c6c67a1bb4	Read NiGravity fields	2013-04-07 18:15:23 -07:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
Chris Robinson	dba7308248	Recognize NiParticleRotation	2013-04-07 17:16:49 -07:00
Chris Robinson	3c633e275e	Don't create a controller for empty keyframe data	2013-04-07 15:42:07 -07:00
Chris Robinson	261ea1fe5e	Implement a KeyframeController	2013-04-07 14:56:23 -07:00
Chris Robinson	f69a8259e1	Update animation source controller targets	2013-04-07 13:51:04 -07:00
Chris Robinson	44a59e1b87	Fix a couple messages	2013-04-07 13:03:41 -07:00
Chris Robinson	2362e920f3	Use an unconnected object list for animation sources We'll want the controllers, as the plan is to use their keyframe controllers to animate the actual skeleton used for the meshes.	2013-04-07 12:41:27 -07:00
scrawl	f3c8cd2065	Don't buy/sell keys which are set to open a lock	2013-04-07 21:38:53 +02:00
scrawl	2d2196b0d6	Implemented levelled items	2013-04-07 21:01:02 +02:00
Marc Zinnschlag	60cc95305d	added basic birthsign table	2013-04-07 20:26:39 +02:00
Chris Robinson	399394ff10	Don't restrict animations to the keyframe time limits	2013-04-07 10:03:13 -07:00
Chris Robinson	ab5980ae18	Let the default controller function use absolute input And convert the VisController to use it.	2013-04-07 08:29:56 -07:00
Chris Robinson	fe9a7f12b6	Material fixes	2013-04-07 07:53:01 -07:00
Marc Zinnschlag	e25f5c6dfe	added basic region table	2013-04-07 16:32:06 +02:00
Chris Robinson	2e067e95a9	Handle NiWireframeProperty	2013-04-07 07:12:52 -07:00
Chris Robinson	ebff64a7a4	Fix UVController and add warn about unhandled material controllers	2013-04-07 06:56:12 -07:00
Marc Zinnschlag	ff1d908af4	added script table	2013-04-07 15:17:35 +02:00
Chris Robinson	be419bc891	Handle NiCamera nodes	2013-04-07 02:28:15 -07:00
Chris Robinson	2db72ae607	Rename EntityList to ObjectList	2013-04-07 01:52:35 -07:00
Chris Robinson	834a6a1f00	Remove old, unused code	2013-04-07 01:14:26 -07:00
Chris Robinson	d97b341dc6	Rename NIFMeshLoader to NIFObjectLoader	2013-04-07 01:02:21 -07:00
Marc Zinnschlag	ec7a8f1add	small fix	2013-04-06 21:58:28 +02:00
Chris Robinson	63cbf7ddeb	Specify a default return for failed lookups	2013-04-06 12:41:40 -07:00
Chris Robinson	ca289a317c	Separate the UVController function out and make it generic Also fix a timing bug in it.	2013-04-06 12:26:58 -07:00
Marc Zinnschlag	8bf569d58a	added basic sound table	2013-04-06 21:21:10 +02:00
Chris Robinson	6b151be3f4	Create particle systems even when MRK was specified	2013-04-06 11:26:51 -07:00
Chris Robinson	41e410347e	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 10:35:01 -07:00
Chris Robinson	c283991126	Remove an unneeded method	2013-04-06 10:33:07 -07:00
Marc Zinnschlag	0f34c79d0a	Merge branch 'race'	2013-04-06 19:21:38 +02:00
Chris Robinson	ebcb4c66c3	Properly read and use the NIF root record list	2013-04-06 10:17:09 -07:00
Chris Robinson	59f1d4b047	Add support for NiUVController on meshes	2013-04-06 09:44:10 -07:00
Chris Robinson	e0da265972	Use accurate bone lookups for attaching objects NIFs don't requires nodes to have unique names, which means looking up a bone by name may get the wrong one. Instead, use a NifIndex:BoneHandle map to make sure we can get the proper bone from a given Nif::Node.	2013-04-06 08:15:12 -07:00
Chris Robinson	95730cc127	Create entities and particle systems for hidden objects They're set as (in)visible as appropriate.	2013-04-06 06:53:08 -07:00
Chris Robinson	f764f243d2	Fix the particle quota	2013-04-06 06:44:34 -07:00
Chris Robinson	41ce5464c9	Recognize NiBSAnimationNode as a record type And don't warn about animated nodes without textkeys	2013-04-06 05:00:19 -07:00
Chris Robinson	99b915e652	Fix some material warnings	2013-04-06 00:54:53 -07:00
Chris Robinson	af756bfa9c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 00:22:31 -07:00
Chris Robinson	b5017e0543	Implement NiParticleGrowFade	2013-04-06 00:19:05 -07:00
Chris Robinson	aa9df818a5	Add support for NiVisController	2013-04-05 10:38:27 -07:00
Chris Robinson	0631b28646	Prepare for supporting controller objects	2013-04-05 10:13:54 -07:00
scrawl	75b462b974	If alpha rejection was forced, we also need to force depth_write and depth_check	2013-04-05 18:24:12 +02:00
Chris Robinson	bf0ae3ae72	Read NiVisData info	2013-04-05 06:29:14 -07:00
Chris Robinson	12fada2862	Don't offset the animation time to 0	2013-04-05 05:34:59 -07:00
Chris Robinson	dc9f5f93e7	Use a helper function to get node properties	2013-04-05 05:14:24 -07:00
Marc Zinnschlag	73da794d77	added basic race table	2013-04-04 14:34:39 +02:00
Chris Robinson	b5719e0ec7	Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes Very incomplete, but it's something to work with.	2013-04-04 05:10:53 -07:00
Chris Robinson	77ba0fbe73	Prepare for creating particles This adds a vector of ParticleSystems to the EntityList, and modifies corresponding code to handle it. It also loads the ParticleFX plugin so particles can be created (although they aren't yet).	2013-04-04 05:10:52 -07:00
Chris Robinson	ac10c5f05c	Even more particle information	2013-04-04 05:10:52 -07:00
Chris Robinson	2f6ae4a915	Read more particle information	2013-04-04 05:10:51 -07:00
Chris Robinson	ee0a20f9ce	Read some missing particle data from NIFs	2013-04-04 05:10:50 -07:00
Chris Robinson	97d617d43f	Use more appropriate VBO settings Unskinned meshes don't need dynamic VBOs; they aren't rewritten since their transformations are handled by the modelview matrix. They also don't need the local RAM copy (the "shadow buffer") since it's really only useful for skinning purposes (though this means the VBO has to be readable for static geometry to work).	2013-04-04 05:10:49 -07:00
Marc Zinnschlag	18e046e628	cleaned up race record struct	2013-04-04 13:50:36 +02:00
Marc Zinnschlag	8c7d578ddc	moved the CellRef struct to its own header	2013-04-04 12:13:15 +02:00
Marc Zinnschlag	7136ac0079	added missing attribute columns to faction table	2013-04-04 10:58:53 +02:00
scrawl	a9b56eedc3	Support NIF "glow maps", which are basically an emissive channel.	2013-04-03 18:51:40 +02:00
scrawl	5625d73d84	Bump texture support	2013-04-03 17:16:34 +02:00
Chris Robinson	095daca058	Create entities when iterating through the NIF	2013-04-03 03:27:41 -07:00
Chris Robinson	512534be11	Read the correct texture resource for other layers	2013-04-02 22:58:07 -07:00
Chris Robinson	f6f165852d	Better handle material texture layers	2013-04-02 21:09:44 -07:00
Marc Zinnschlag	384c88182d	dealing with unset attribute fields	2013-04-02 14:15:22 +02:00
Marc Zinnschlag	f9f520df34	adjusted faction record to increase consistency with other records	2013-04-02 13:59:45 +02:00
Marc Zinnschlag	c71edb613d	added faction table	2013-04-02 12:00:45 +02:00
Marc Zinnschlag	fd0aa1a4b8	Issue #685 : Treat : as a whitespace	2013-03-31 14:46:46 +02:00
Marc Zinnschlag	607435aaf2	Merge branch 'class'	2013-03-31 10:49:56 +02:00
scrawl	e27e53f607	Fix not playable body parts appearing in the race selection menu.	2013-03-30 20:04:05 +01:00
scrawl	6f1575d42a	CELL record corrections	2013-03-27 17:27:43 +01:00
Marc Zinnschlag	ea3b14f2d2	added skill columns to class	2013-03-26 09:43:13 +01:00
Marc Zinnschlag	c7275965b8	added basic class record table	2013-03-25 13:22:06 +01:00
Marc Zinnschlag	1078386fd7	Merge branch 'skills' into next	2013-03-25 11:07:14 +01:00
Marc Zinnschlag	114f99ddbf	add skill records when creating a new base file	2013-03-24 15:10:03 +01:00
scrawl	8e2f9f5186	Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips	2013-03-22 12:24:09 +01:00
scrawl	918cdcffc2	Split up components/esm/loadlocks	2013-03-22 05:50:54 +01:00
Marc Zinnschlag	7df0f6aaee	prepared skill record for use in editor	2013-03-21 14:30:27 +01:00
Marc Zinnschlag	1d1471b81c	fixed a bug in ESM::Variant::write (was affecting string values)	2013-03-21 12:57:10 +01:00
scrawl	6c1ff8caca	Merge branch 'master' into next Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp	2013-03-20 02:29:03 +01:00
Marc Zinnschlag	4711135e7f	workaround for faulty endif in Morrowind scripts	2013-03-18 12:05:54 +01:00
Marc Zinnschlag	6ef754c451	Merge remote-tracking branch 'scrawl/armorrating' into next	2013-03-18 07:53:20 +01:00
Marc Zinnschlag	46bde604f9	Issue #601 : unary minus was interpreted as binary minus when used in an argument list without comma	2013-03-17 17:13:25 +01:00
scrawl	dd57eabc3e	Better use an enum for magic effect IDs	2013-03-16 23:28:26 +01:00
scrawl	e30af28860	Markers should still have collision if they have a NiRootCollisionNode	2013-03-14 19:03:42 +01:00
scrawl	84afd87321	Placeable objects should not collide unless they have a NiRootCollisionNode	2013-03-14 03:04:02 +01:00
Marc Zinnschlag	1a809b1cec	Merge remote-tracking branch 'scrawl/master'	2013-03-13 08:32:44 +01:00
scrawl	599207a92d	Transparency sorting should be enabled only when alpha blending is enabled	2013-03-13 01:00:47 +01:00
Marc Zinnschlag	170451cb79	Merge remote-tracking branch 'graffy76/saveOnClose' into next	2013-03-12 14:47:42 +01:00
Marc Zinnschlag	75bd30844d	added optional format sub-record to tes3 record	2013-03-12 14:33:35 +01:00
graffy76	50abb22162	Fix to allow application closing from multiple views and a single view.	2013-03-12 06:28:13 -05:00
Marc Zinnschlag	16570ce87b	moved header record struct to separate file	2013-03-12 09:16:03 +01:00
Marc Zinnschlag	731ac6a160	removed redundant copy of Header::Data	2013-03-12 08:30:51 +01:00
Marc Zinnschlag	9e68a420ae	restructuring tes3 record structs	2013-03-12 08:15:20 +01:00
pvdk	b2d522aa4d	Added support for non-latin characters in esx metadata	2013-03-12 04:01:05 +01:00
Marc Zinnschlag	b085c4f749	removing more leftovers	2013-03-11 16:53:42 +01:00
Marc Zinnschlag	2e1a1fd11a	removing some remains of the removed GMST fixing feature	2013-03-11 16:30:47 +01:00
Marc Zinnschlag	64d517dd79	removed unused file type information from esm component	2013-03-11 14:42:49 +01:00
Emanuel Guevel	289bbc64f7	Load fallback archives listed in openmw.cfg at startup	2013-03-09 21:14:11 +01:00
Marc Zinnschlag	b255472cc6	fixed a spelling mistake	2013-03-09 15:39:49 +01:00
Marc Zinnschlag	2cc20c67cb	Merge remote-tracking branch 'scrawl/raycasting'	2013-03-09 14:34:29 +01:00
scrawl	14964e9fcd	Only build a box shape for collision nodes; use StringUtils	2013-03-09 10:28:10 +01:00
scrawl	d7c4a622cf	Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack	2013-03-08 23:46:25 +01:00
Emanuel Guevel	3adf3f5121	Revive bsatool	2013-03-07 21:13:10 +01:00
Pieter van der Kloet	9145fb210b	Merge remote-tracking branch 'upstream/master' into opencsui	2013-03-07 03:02:03 +01:00
Pieter van der Kloet	7504ae675b	Implemented a file dialog for the editor using launcher .ui	2013-03-07 03:00:59 +01:00
Marc Zinnschlag	e7e8bd655f	Merge remote-tracking branch 'scrawl/graphics'	2013-03-05 17:44:28 +01:00
greye	9133182f2f	restore loading CELL records in esmtool	2013-03-05 20:25:20 +04:00
scrawl	7f8d659f3c	Fix transparency sorting	2013-03-05 17:09:20 +01:00
Marc Zinnschlag	d839a4c6c2	Merge remote-tracking branch 'scrawl/graphics'	2013-03-05 16:31:22 +01:00
scrawl	c9f7f1b994	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-05 14:37:38 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
Marc Zinnschlag	dc3edc6024	Merge branch 'vartype'	2013-03-05 10:59:08 +01:00
Marc Zinnschlag	1489570b09	change variant in info record to new type	2013-03-05 10:34:03 +01:00
Marc Zinnschlag	1b19ab6028	fixed gmst integers	2013-03-05 08:15:03 +01:00
Marc Zinnschlag	ba4907fbaf	use new Variant type for GMSTs	2013-03-05 08:02:27 +01:00
Marc Zinnschlag	ce49ad54a1	some cleanup and fixing	2013-03-05 08:02:05 +01:00
Pieter van der Kloet	4c9d0563fe	WIP: Implementing the .ui for the DataFilesPage	2013-03-05 03:13:39 +01:00
Chris Robinson	2f14f26b96	Use the full unique mesh name for the material instead of the NIF name	2013-03-04 10:35:13 -08:00
Marc Zinnschlag	a1ac20c6f3	changed global variable records to new variant type	2013-03-04 14:32:59 +01:00
Marc Zinnschlag	65081f5520	added variant class	2013-03-04 14:32:23 +01:00
Chris Robinson	4e1e0eaf62	Merge remote-tracking branch 'zini/master' into material-fix Conflicts: components/nifogre/ogrenifloader.cpp	2013-03-03 14:24:05 -08:00
Chris Robinson	5e50436a94	Convert some BooleanValues to StringValues	2013-03-03 14:19:02 -08:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
scrawl	0f6fd80294	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout	2013-03-03 11:02:38 +01:00
Chris Robinson	21e2c287eb	Fix/workaround specular issues The glossiness should not be multiplied by 255, however the values set in many of Bloodmoon's meshes would look horrible otherwise. Now we can let the NiSpecularProperty specify when to enable specular (which is supposed to default to on, but due to the aforementioned meshes, we default to off).	2013-03-02 19:30:23 -08:00
Chris Robinson	7930aa82b2	Add missing depthFlags to the hash	2013-03-02 19:09:15 -08:00
Chris Robinson	8e35159ad4	Handle NiSpecularProperty	2013-03-02 19:06:28 -08:00
Chris Robinson	8c0326a49c	Handle NiZBufferProperty	2013-03-02 18:30:28 -08:00
Chris Robinson	03785f3ecd	Handle NiVertexColorProperty	2013-03-02 16:28:32 -08:00
Pieter van der Kloet	a3c5c868ec	Merge remote-tracking branch 'upstream/master' into launcherui	2013-03-02 23:01:53 +01:00
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00
Chris Robinson	fdfcd5bb47	Material properties are accumulative along the node tree	2013-03-02 12:23:29 -08:00
Nathan Jeffords	d3c1f5e7b2	renamed low-level NIF related files and include guards to conform to naming convention	2013-03-02 10:46:12 -08:00
Nathan Jeffords	0ed2015319	refactored NIFFile parse to get better code/data seperation	2013-03-02 10:07:57 -08:00
Nathan Jeffords	6de6d9ff6e	Factored a NIFStream class out of the NIFFile class. Split NIFFile into two parts, NIFFile which is cached and is a container for a parsed NIF, and NIFStream which is a class specialized for parsing NIFs. This required a semi-sweeping change to make all record classes accept a NIFStream instead of a NIFFile as an agurment to their read functions.	2013-03-02 09:56:41 -08:00
Chris Robinson	e3fd4b8429	Fix restoring the original texture name when the DDS check fails	2013-03-01 17:57:34 -08:00
Chris Robinson	e6b547b9ba	Merge remote-tracking branch 'zini/master' into transparency-fixes	2013-03-01 13:32:30 -08:00
Chris Robinson	166d529c50	Ensure the material is properly built after creating it	2013-03-01 13:26:31 -08:00
Chris Robinson	2c05a7477c	Improve checks for texture resource names that include the "textures\" prefix	2013-02-28 17:16:28 -08:00
Chris Robinson	ae5c0663f5	Merge remote-tracking branch 'zini/master' into nif-fixes	2013-02-28 14:04:41 -08:00
Chris Robinson	eaa6813917	Workaround for meshes without any vertices	2013-02-28 13:54:53 -08:00
Chris Robinson	2786cc67f6	Fix loading empty NiTriShapeData records	2013-02-28 13:38:48 -08:00
Marc Zinnschlag	230136438b	minor cleanup	2013-02-28 22:17:07 +01:00
lazydev	60f2219450	fixed zini's norices	2013-03-01 00:46:05 +04:00
Chris Robinson	1168f15361	Don't disable depth writes when blending is enabled	2013-02-28 12:17:58 -08:00
lazydev	169a1ff1ce	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-02-28 23:02:19 +04:00
Marc Zinnschlag	1f24763881	Merge remote-tracking branch 'vorenon/licensefix'	2013-02-28 19:48:35 +01:00
vorenon	06e077c07c	Removing all traces of "Open Morrowind". pvdk said it was ok to remove the header entirely	2013-02-28 19:36:10 +01:00
scrawl	6683e43efc	Removed commented code	2013-02-28 12:35:18 +01:00
scrawl	f75681d89b	Ignore ESX header version	2013-02-28 12:12:51 +01:00
Marc Zinnschlag	3bd228f71b	fix for global variables of type short	2013-02-28 11:50:29 +01:00
lazydev	b93eb84401	fix for https://bugs.openmw.org/issues/573	2013-02-28 02:43:03 +04:00
Chris Robinson	a7220518b6	Merge remote-tracking branch 'zini/master' into skeleton-fixes	2013-02-27 13:22:33 -08:00
Chris Robinson	3ed0bf97a8	Share the space with the parent entity only when there's real skinned meshes The existence of a base skeleton doesn't mean it shares the same bone structure. If there isn't an actual skinned entity besides the base, simply attach it to the bone like unskinned meshes should be.	2013-02-27 13:16:27 -08:00
Chris Robinson	bfe80bb8dc	Avoid duplicating skeletons due to casing issues Manually created resource names are apparently always case sensitive, causing some skeletons to get loaded multiple times.	2013-02-27 12:33:36 -08:00
Sergey Shambir	03ca7f6123	NIF: added NiStencilProperty record handling NiStencilProperty appears in Better Clothes plugin. If it not handled, some parts of NPCs bodies will be not rendered.	2013-02-27 23:45:09 +04:00
scrawl	b82ee4872d	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-02-27 12:25:34 +01:00
Marc Zinnschlag	53953b23f9	Merge remote-tracking branch 'chris/materials'	2013-02-27 10:04:42 +01:00
Marc Zinnschlag	f175f8327f	Merge remote-tracking branch 'lazydev/master'	2013-02-27 10:01:50 +01:00
scrawl	369f881170	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-27 09:25:44 +01:00
Chris Robinson	b4b20622c6	Properly handle NiAlphaProperty values	2013-02-26 15:24:20 -08:00
lazydev	f717fe0254	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-02-27 01:47:30 +04:00
Marc Zinnschlag	70b6b68005	Merge remote-tracking branch 'sergeyshambir/BBfix'	2013-02-26 22:37:45 +01:00
lazydev	759b2e96bf	fix for https://bugs.openmw.org/issues/577	2013-02-27 01:37:40 +04:00
Marc Zinnschlag	a7102c143f	ESX variable type cleanup	2013-02-26 14:37:11 +01:00
Chris Robinson	aefd12dfe0	Don't create meshes for collision shapes	2013-02-25 15:44:59 -08:00
Chris Robinson	9679daa6a4	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 13:10:21 -08:00
Chris Robinson	429bc23cf6	Convert the 0-1 glossiness parameter to 0-255 for shininess	2013-02-25 13:08:40 -08:00
Pieter van der Kloet	469d608f51	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 21:26:54 +01:00
Marc Zinnschlag	a535d51cbf	Merge branch 'brokenendfix'	2013-02-25 19:52:22 +01:00
Chris Robinson	5f2c897001	Better handle which collision shapes to load	2013-02-25 10:29:48 -08:00
Chris Robinson	ff1ecb85c6	Don't bother storing the shape name for the submesh name The submesh name Ogre has is completely useless to us	2013-02-25 08:22:57 -08:00
scrawl	cacdb33b42	Merge branch 'master' into graphics Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/sky.cpp	2013-02-25 15:12:03 +01:00
Marc Zinnschlag	151ecaad04	workaround for garbage after an end statement	2013-02-25 10:32:38 +01:00
Chris Robinson	53eb553c57	Be a little more aggressive when looking to skip generating a skeleton This is needed to handle the insane number of nodes and trishapes in in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit sketchy, but it works.	2013-02-24 18:12:15 -08:00
Sergey Shambir	b1381ddd69	Nif loader: workaround for missed textures in BB/BH Works for Better Bodies / Better Heads addons.	2013-02-25 04:12:41 +04:00
Pieter van der Kloet	6eaaf20c94	Merge remote-tracking branch 'upstream/master' into launchernext	2013-02-25 00:56:23 +01:00
Chris Robinson	c60e858b02	Create bones for NiTriShape nodes, and attach the entities to them Otherwise some models don't connect properly. NiTriShapes are more guaranteed to have unique names than their parent nodes.	2013-02-24 12:42:32 -08:00
scrawl	2e6c63d9cd	Disable specular on NIF's	2013-02-24 17:18:22 +01:00
Chris Robinson	db9a3aeddf	Merge remote-tracking branch 'zini/master' into animation2	2013-02-24 03:32:35 -08:00
scrawl	3135482cee	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-24 10:06:04 +01:00
Nathan Jeffords	44b1c66c4b	fixed various warnings about converting size_t to int	2013-02-23 10:23:38 -08:00
scrawl	db9e49968e	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 04:13:51 +01:00
Chris Robinson	3c0b29de45	Merge remote-tracking branch 'zini/master' into animation2	2013-02-22 01:34:22 -08:00
greye	82595e66b2	another missing header for #576	2013-02-21 22:47:18 +04:00
Marc Zinnschlag	9b7957cf20	fixed a missing inlcude	2013-02-21 19:27:07 +01:00
Chris Robinson	6ae00be8a3	Fix nifbullet shape transformation	2013-02-19 22:28:15 -08:00
scrawl	f4749f10da	NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this)	2013-02-20 05:35:52 +01:00
Pieter van der Kloet	35b68a3c40	Fixed accidental profile deletion and added sorting by date	2013-02-19 15:58:01 +01:00
Pieter van der Kloet	37fe31e858	Merge remote-tracking branch 'upstream/next' into settings_selwidget	2013-02-19 01:12:47 +01:00
scrawl	32b837ebd4	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-19 00:15:54 +01:00
Pieter van der Kloet	178cf2154e	Made checking/unchecking work with the new datafiles model	2013-02-18 17:59:08 +01:00
Chris Robinson	e2d7cc49e3	Merge remote-tracking branch 'zini/next' into animation2	2013-02-17 03:42:37 -08:00
Douglas Mencken	df5919f2c5	Use `signed char' explicitly where needed. It is important because: - It is implementation-dependent if plain `char' signed or not. - C standard defines three distinct types: char, signed char, and unsigned char. - Assuming that char is always unsigned or signed can lead to compile-time and run-time errors. You can also use int8_t, but then it would be less obvious for developers to never assume that char is always unsigned (or always signed). Conflicts: components/esm/loadcell.hpp	2013-02-15 20:28:14 +01:00
Pieter van der Kloet	fd430dc5a9	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp	2013-02-15 15:38:30 +01:00

... 20 21 22 23 24 ...

3060 commits