1898 commits

Author	SHA1	Message	Date
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
Pieter van der Kloet	ee27e3bb58	Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp	2013-02-15 15:21:14 +01:00
Chris Robinson	da5f11700f	Warn about unhandled node types before the controllers	2013-02-13 00:45:00 -08:00
Chris Robinson	5b2ca6fa7d	Don't complain about RootCollisionNode, it's handled in nifbullet	2013-02-13 00:43:29 -08:00
Michal Sciubidlo	f4d60ae7b2	Files sorting (masters then plugins). ... Remove unneeded includes.	2013-02-10 19:59:25 +01:00
Michal Sciubidlo	0df7c7e5c1	Rename mPlugins* to mFiles*	2013-02-10 14:08:54 +01:00
Michal Sciubidlo	e4ed397b2d	Merge plugins and masters list view in openDialog. Simplify datafilesmodel.	2013-02-10 14:02:06 +01:00
Chris Robinson	f4e587c72c	Always create a skeleton from a NIF when there's more than one NiNode	2013-02-09 17:48:23 -08:00
Chris Robinson	f197c67e95	Fix a circular include	2013-02-09 12:46:20 -08:00
Chris Robinson	34ddf69a31	Merge remote-tracking branch 'zini/next' into animation2	2013-02-09 09:46:57 -08:00
scrawl	d47090b312	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2013-02-09 16:40:10 +01:00
Marc Zinnschlag	f19fbaa293	Merge remote-tracking branch 'mark76/multiple_esm_esp' into next	2013-02-09 15:30:29 +01:00
Mark Siewert	eefbdde6de	- For pull request: remove all instances of maps used to track refnumbers. ... - new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.	2013-02-09 13:00:57 +01:00
Marc Zinnschlag	d5dd0640c7	basic gmst support	2013-02-08 09:58:19 +01:00
Chris Robinson	8b1e7b95ba	Attempt to load the skeleton source if it doesn't yet exist	2013-02-05 17:55:12 -08:00
Michal Sciubidlo	347a734364	Move OpenDialog to editor and use it in startup dialogue. ... Remove debug output from DataFilesList.	2013-02-05 22:06:36 +01:00
Michal Sciubidlo	f7e5ea24f4	Merge branch 'startup' into cs_load. ... Fix include in textinputdialog.cpp.	2013-02-05 21:23:49 +01:00
Chris Robinson	bd4fdf47a3	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/sky.cpp	2013-02-05 02:27:57 -08:00
Michal Sciubidlo	66ec4ca7d9	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00
Chris Robinson	bec538bfa1	Always declare operator<< for using a TextKeyMap with Ogre::Any	2013-02-04 09:19:59 -08:00
scrawl	109d0a942f	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-03 19:02:57 +01:00
Mark Siewert	3e43db5f76	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp	2013-02-03 16:14:41 +01:00
Chris Robinson	c45b4d6072	Clean up some NIF warning reports	2013-02-02 22:27:08 -08:00
Michal Sciubidlo	155cca0c9a	Upload missing files. ... Fix folder name. Keep Qt optional. Move open dialogue from doc to tools. Rename 'load' to 'open'. Deleted wrong comment.	2013-02-02 18:36:01 +01:00
Chris Robinson	e6e7c69013	Fix handling of filtered entities	2013-02-02 05:26:52 -08:00
Marc Zinnschlag	85697e4628	reverted to C++03	2013-02-02 13:24:28 +01:00
scrawl	3ec703e6af	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-02-01 16:25:54 +01:00
Michal Sciubidlo	492482de7f	Add "open" option in opencs.	2013-02-01 00:42:03 +01:00
Chris Robinson	c6a9ea5007	Use the skeleton as defined in the NIF model ... The avoids having to duplicate models that get attached to different character skeletons.	2013-01-30 22:37:39 -08:00
Michal Sciubidlo	ac62dd050d	Rename datafilespage to datafileslist	2013-01-30 21:08:27 +01:00
Michal Sciubidlo	f029a9011a	Move datafilespage to shared space.	2013-01-30 20:21:03 +01:00
Chris Robinson	b6354c6282	Don't share skeleton instances between bounded parts on an NPC ... However, a skeleton instance will still be shared between entities in an entity list.	2013-01-30 09:29:16 -08:00
Chris Robinson	0853fa335c	Avoid redundant string concatenations	2013-01-29 01:36:17 -08:00
Chris Robinson	487c83e943	Rename nonaccum to animroot	2013-01-28 22:09:41 -08:00
Chris Robinson	e1d3933145	Remove an unused struct	2013-01-28 01:27:12 -08:00
Chris Robinson	b1ffdf855f	Reset the initial state of animated nodes on the skeleton instances ... This is so the animation specifies node keyframe data based on the node's parent. This will also be necessary for applying animations from different skeleton sources, as they can have different binding positions (even native .skeleton resources will need to specify animation data this way).	2013-01-26 04:48:53 -08:00
Mark Siewert	dca8dc4fdb	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/store.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm/esmreader.hpp - Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.	2013-01-25 18:22:01 +01:00
Chris Robinson	d836b3d0ff	Don't try to create animations if there's no text keys and nonaccum node. ... Such meshes apparently use NiBSAnimationNode, a Bethesda-specific extension which has animation-related info in its flags (values currently unknown).	2013-01-22 00:24:57 -08:00
Chris Robinson	6905bd18ba	Filter out the group name from the text keys ... It's already in the animation name, and the text keys are animation-specific anyway.	2013-01-21 02:59:12 -08:00
Chris Robinson	8e8900e422	Use the first bone with text keys as the nonaccum root.	2013-01-20 22:51:39 -08:00
Chris Robinson	536f8104e6	Do not create an 'all' animation.	2013-01-20 17:24:43 -08:00
Mark Siewert	713d324eeb	- Minor code cleanup	2013-01-20 19:07:33 +01:00
Mark Siewert	a8e02779b2	- Add support for multiple plugins trying to modify the same reference ... - Fix a small signed/unsigned warning	2013-01-19 23:33:18 +01:00
Chris Robinson	1ce8eaf52c	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/actors.cpp apps/openmw/mwrender/actors.hpp	2013-01-16 07:36:56 -08:00
Chris Robinson	94e30199d1	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-15 14:59:30 -08:00
Chris Robinson	e5f040a06f	Improve filename pattern matching	2013-01-15 14:10:52 -08:00
scrawl	6c6ce4a05c	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-14 00:10:57 +01:00
Chris Robinson	b23fcb260c	Use the record index for finding the NiTriShape instead of the name	2013-01-13 08:00:04 -08:00
Chris Robinson	660d73fd88	Store the NIF index in the Record object	2013-01-13 06:56:58 -08:00
scrawl	e4f140841e	Make OpenMW work with Ogre 1.9	2013-01-12 08:23:15 +01:00
scrawl	3f4d8c08e4	Merge branch 'nif_file' into graphics	2013-01-12 06:41:13 +01:00
scrawl	31e6d28b19	Close NIF file resource after loading it into memory	2013-01-12 06:37:43 +01:00
scrawl	52516ca4b4	Merge branch 'master' into graphics	2013-01-12 01:22:01 +01:00
Marc Zinnschlag	db48017c36	Merge remote-tracking branch 'blunted2night/nif_cache_v6'	2013-01-11 11:07:45 +01:00
Michal Sciubidlo	85bdb49d1b	Mix debug and release if necessary under non Windows systems.	2013-01-11 09:10:48 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads ... Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	0989b44b41	spread some const around NIF loading	2013-01-10 21:32:47 -08:00
Nathan Jeffords	9d4f8c6722	changed bullet_nif_loader to not modifiy NIF file ... The code in bullet_nif_loader was modifing the loaded NIF file as part of processing. Currently this is OK since the NIF file will be thrown away immediately, but it causes problems when trying to share loaded NIF files.	2013-01-10 21:32:32 -08:00
scrawl	6ef85c46fd	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-01-10 19:35:40 +01:00
Chris Robinson	23ac1c2de5	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2013-01-09 20:52:12 -08:00
scrawl	455ec0996d	Shaders & textures are now loaded upon loading the NIF, instead of when the object becomes visible in the camera frustum. Should improve responsiveness.	2013-01-09 22:27:58 +01:00
Marc Zinnschlag	4defb1a476	Merge remote-tracking branch 'trombonecot/lowerstring' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2013-01-09 22:13:59 +01:00
eduard	2dc0064cc2	more string lowercase	2013-01-09 20:51:52 +01:00
Chris Robinson	a14132b5a0	Merge remote-tracking branch 'zini/master' into animation2	2013-01-09 11:12:26 -08:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Nathan Jeffords	44031ec3d7	fleshed out BSAArchive and DirArchive. ... Implemented both lists & finds, with pattern matching. Conflicts: components/bsa/bsa_archive.cpp	2013-01-09 08:53:27 -08:00
Chris Robinson	4b7cc1372f	Some cleanup	2013-01-09 06:32:31 -08:00
Chris Robinson	a9bcbfd8d3	Use Node::_getFullTransform instead of building the matrix manually	2013-01-09 05:11:32 -08:00
Chris Robinson	015bb0bf1f	Use the calculated max time for the "all" animation	2013-01-09 04:30:32 -08:00
Chris Robinson	465fd9c8af	Offset animation times to start at 0	2013-01-09 04:21:56 -08:00
Marc Zinnschlag	d1e51ebf42	silenced some warnings	2013-01-09 12:25:45 +01:00
Chris Robinson	4054934f16	Store text keys for each animation	2013-01-09 02:51:25 -08:00
Chris Robinson	bb98542c5a	Build separate animations for each group	2013-01-09 01:40:38 -08:00
Chris Robinson	e44729cd43	Make the text keys lower-case when extracting them ... I think it's safe to assume all text keys are treated in a case-insensitive manner. So far the only known NiTextKeyExtraData records are for animation keys, which effectively are.	2013-01-09 00:17:42 -08:00
Nathan Jeffords	67491f6c49	reworked DirArchive to improve performance ... Replaced old file index with a simple map. The map works by storing the file's relative path with path seperators normalized, and in lower case if not in strict mode. Incoming searches are normalized in the same way then the name is searched in the map. The value in the map is the original full path to the file which is then used to created a ConstrainedDataStream. In addition to changing the index, the commonly used Archive methods are implemented so that they don't fall back on the default FileSystemArchive implementations.	2013-01-08 22:51:05 -08:00
Nathan Jeffords	43cd88a24e	include members of BSAArchives in Ogres resource indices	2013-01-08 22:51:05 -08:00
Chris Robinson	14d814d1d3	Avoid creating bones for NiTriShape nodes ... The offset specified for them can be just as easilly handled by the tag point they get connected to, and as such it's just needless extra nodes.	2013-01-07 04:21:25 -08:00
Chris Robinson	921ae76ea9	Merge remote-tracking branch 'zini/master' into animation2	2013-01-06 21:20:49 -08:00
Chris Robinson	7ba09ff025	Catch errors from buildBones	2013-01-06 20:05:50 -08:00
Marc Zinnschlag	e31cd1c805	Merge remote-tracking branch 'corristo/master'	2013-01-06 18:40:30 +01:00
Nikolay Kasyanov	1d3f3bcce3	clang build fix	2013-01-06 19:19:12 +04:00
Marc Zinnschlag	25815ab8f7	Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'	2013-01-06 13:31:01 +01:00
Emanuel Guevel	0b7d11d38d	to_utf8 test: fix Utf8Encoder constructor	2013-01-06 11:39:18 +01:00
Chris Robinson	8ebf49a35b	Only lower-case the model name ... The skeleton name will already be lower-case	2013-01-05 20:54:57 -08:00
Chris Robinson	18389c7b04	Set non-bone nodes as manually controlled	2013-01-05 17:50:22 -08:00
Emanuel Guevel	63f09462fd	to_utf8, Utf8Encoder: pass encoding as constructor parameter ... Edit other files accordingly.	2013-01-06 01:37:58 +01:00
Chris Robinson	e5ce55b6a4	Remove a hack	2013-01-05 06:20:21 -08:00
Marc Zinnschlag	043e6c09fe	Merge remote-tracking branch 'chris/animation2'	2013-01-05 13:34:46 +01:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
Chris Robinson	761914bdaa	Use a separate method to build the animation	2013-01-05 03:31:51 -08:00
Jordan Milne	3ed77ca189	Include C++ header instead	2013-01-05 01:17:07 -04:00
Chris Robinson	8a086e3afb	Cache the mesh names from the mesh/skeleton pairs	2013-01-04 20:58:35 -08:00
Chris Robinson	3131e8dae6	Don't get the text keys if they're not being requested	2013-01-04 20:33:26 -08:00
Chris Robinson	683ced54a0	Store and retrieve the node text keys in the bones' user object bindings	2013-01-04 19:41:37 -08:00
Chris Robinson	a3d33db415	Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone	2013-01-04 15:55:47 -08:00
Jordan Milne	b52904a6ea	Include headers necessary for compilation under VS2010	2013-01-04 19:52:27 -04:00
Chris Robinson	1d4d67f811	Avoid underflows if the texture name doesn't include a '.'	2013-01-04 15:03:57 -08:00
Chris Robinson	3f19b13695	Merge remote-tracking branch 'zini/master' into animation2	2013-01-04 14:47:01 -08:00
Marc Zinnschlag	215b43cc7b	Merge remote-tracking branch 'blunted2night/texname_fix'	2013-01-04 23:19:51 +01:00
Marc Zinnschlag	b4d63814cc	post merge fix	2013-01-04 23:12:56 +01:00
Nathan Jeffords	fec9a59237	changed EMSLoader to use ConstrainedDataStream ... Changed the EMSLoader class to use the ConstrainedDataStream so that future changes may benifit from its increased performance.	2013-01-04 13:41:03 -08:00
Nathan Jeffords	278337116b	increased performance of ConstrainedDataStream ... Reimplemented ConstrainedDataStream to use low-level IO calls and a custom buffering scheme to avoid using C++ iostreams.	2013-01-04 13:40:00 -08:00
Nathan Jeffords	5c7f1bd497	moved ConstrainedDataStream into its own file ... moved the ConstrainedDataStream into its own source file and changed BSAFile to use it though the exposed factory function. This is in preperation foreimplementing it based on feedback from profiling that (at least on windows) the C++ iostreams library is quite slow.	2013-01-04 13:39:10 -08:00
Nathan Jeffords	2181393518	change texture renaming logic to increase performance ... ResourceGroupManager::resourceExistsInAnyGroup is slow (at least on windows) if the tested path does not exist, but is fast if it does (due to finding it in the index). This change tries the '.dds' version of the name first, and reverts to the original if the '.dds' version was not found.	2013-01-04 11:36:22 -08:00
Emanuel Guevel	cc792da858	Fix to_utf8 test: add test data directory and remove unused include	2013-01-04 15:24:07 +01:00
Emanuel Guevel	c947d87ab9	Add a test for to_utf8 component	2013-01-04 15:10:30 +01:00
Chris Robinson	61ad8bb3dd	Use a list of mesh names instead of mesh objects	2013-01-04 00:14:41 -08:00
Chris Robinson	019893b5c6	Get rid of some unnecessary case-insensitive compares	2013-01-03 23:44:58 -08:00
Emanuel Guevel	0bdf52a071	components/to_utf8: keep only Utf8Encoder	2013-01-04 01:58:30 +01:00
Emanuel Guevel	02bf02f288	ESMReader, ESMWriter: use Utf8Encoder	2013-01-04 01:52:03 +01:00
Emanuel Guevel	9906c3051d	components/translation: use Utf8Encoder	2013-01-04 01:52:02 +01:00
Emanuel Guevel	740e2b5769	components/to_utf8: add class Utf8Encoder	2013-01-04 01:52:02 +01:00
Mark Siewert	d6377fb2e3	- Support deleting references from a plugin ... - Add preliminary support for loading some unique fields appearing only in savegames - Add a few lines required for supporting respawning references. Incomplete.	2013-01-03 18:51:04 +01:00
Marc Zinnschlag	80a0be3264	Merge remote-tracking branch 'blunted2night/msvcbuild'	2013-01-01 21:19:27 +01:00
Nathan Jeffords	08fa9dcd3e	replaced std::string concatenation with std::ostringstream ... Changed a block of code that was performing a series of string concatenations to use an ostringstream instead. This allowed the removal of calls to std::to_string (not C++03 compliant) and fixes an compile error in MSVC 2010 (ambigous overload when calling std::to_string).	2013-01-01 11:59:05 -08:00
Nathan Jeffords	7228f5d696	added missing reference to <cctype> ... added missing reference to <cctype> that was causing Visual Studio 2010 to fail to compile stringops.hpp	2013-01-01 10:58:30 -08:00
lazydev	7cd1e87fe8	Merge branch 'master' of git://github.com/zinnschlag/openmw ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp	2013-01-01 22:18:21 +04:00
lazydev	cd5d95ed22	1. Dialogs in Russian version now works. ... 2. Destination names it travel window are now translated	2012-12-31 04:15:47 +04:00
eduard	69d9d22579	comparestring	2012-12-30 19:56:38 +01:00
eduard	98103e15eb	conflict resolution	2012-12-30 13:46:07 +01:00
eduard	c85400b809	Merge https://github.com/zinnschlag/openmw into comparestring ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwworld/worldimp.cpp components/esm_store/reclists.hpp components/misc/stringops.hpp	2012-12-30 13:09:37 +01:00
Marc Zinnschlag	334588bf1c	Merge branch 'editor2'	2012-12-28 23:31:43 +01:00
eduard	c75a5ae212	string compare and tolower	2012-12-28 18:05:52 +01:00
eduard	8545667bbd	string compare and tolower	2012-12-28 17:54:56 +01:00
Mark Siewert	2cef65a056	- Remove some files that are no longer in upstream/master	2012-12-27 20:11:58 +01:00
Tom Mason	a14b7e4a0f	small fixes on text defines	2012-12-26 18:07:56 +00:00
Marc Zinnschlag	e9ba7339f3	improved error handling	2012-12-26 17:15:53 +01:00
Marc Zinnschlag	afc2e840ae	renamed namespace TranslationData to Translation	2012-12-26 17:06:33 +01:00
Marc Zinnschlag	206c613b52	moved translation storage from GUI manager to engine	2012-12-26 17:03:37 +01:00
Marc Zinnschlag	2d468fec02	made previous commits naming standard compliant	2012-12-26 16:19:59 +01:00
Marc Zinnschlag	4c28f3211b	Merge remote-tracking branch 'lazydev/master'	2012-12-26 15:50:03 +01:00
Mark Siewert	049b0e66e0	- Restore ability to generate references in the same cell from multiple plugins ... - Disable some code related to deleting entries in the store so that it builds again	2012-12-25 20:27:30 +01:00
lazydev	1f71395660	renaming of translation component; removing of C++11 features	2012-12-25 23:20:39 +04:00
lazydev	74ae479780	Cell names localization fix	2012-12-23 23:23:24 +04:00
Tom Mason	8ac8fdff47	implemented all text defines except a few for keybindings that don't exist yet	2012-12-21 18:09:31 +00:00
Tom Mason	f2c6907244	Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work	2012-12-20 23:16:34 +00:00
Thoronador	5a7a8629b6	remove unnecessary include directive	2012-12-17 23:20:43 +01:00
Thoronador	32f051d61d	Remove 'GMST fixing' for dirty GMST records ... The 'fixing' for so-called dirty GMSTs does not work properly in its current state anyway, so it should be removed. Fixing the 'GMST fixing' might not be possible, because whether or not a GMST is 'dirty' depends on the language version of MW. Therefore different 'fixing' algorithms would be required for the different MW localisations, and I do not see a good reason why GMST values should be hard-coded in the GMST load procedure. In my opinion, it only clutters the code. Last but not least, I believe that it is not the task of the engine to clean ESM files from dirty entries. That is a job for the modders, who should only release clean ESM/ESP files in the first place. The engine should not need to worry about whether a file is 'dirty' or not. That is why I believe a feature for cleaning ESM/ESP files shall not be part of the engine.	2012-12-17 23:13:33 +01:00
Marc Zinnschlag	5cd2fe00ab	initialise blank global records	2012-12-03 22:16:02 +01:00
Marc Zinnschlag	8a09e03d5c	global variable editing (no undo support yet)	2012-11-29 14:45:34 +01:00
Marc Zinnschlag	ef9575498f	basic (non-editable) subview for global variables	2012-11-26 12:29:22 +01:00
Mark Siewert	b103426cf0	- Partially reimplement deleting objects defined in a parent esX file. ... - Try to reimplement multiple esX files dropping references in the same file. NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.	2012-11-25 19:07:16 +01:00
Mark Siewert	896ab44d1e	- Add some updated files missing from last commit. ... - Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.	2012-11-25 17:19:29 +01:00
Mark Siewert	8ea9f00e6f	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp apps/openmw/mwworld/cells.cpp apps/openmw/mwworld/cells.hpp apps/openmw/mwworld/cellstore.cpp apps/openmw/mwworld/cellstore.hpp apps/openmw/mwworld/containerstore.cpp apps/openmw/mwworld/localscripts.cpp apps/openmw/mwworld/scene.cpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp components/esm_store/reclists.hpp components/esm_store/store.cpp extern/shiny - Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp. - NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.	2012-11-25 14:12:44 +01:00
Marc Zinnschlag	d684b3ae11	fixed getString function in NIF loader	2012-11-22 10:35:03 +01:00
Mark Siewert	31fb715bd7	- Add support for moving existing references by plugin files. No cell changing yet. ... - Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber. - Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers. - Many small tweaks so that the new CellRefList does not conflict with existing code.	2012-11-17 21:50:25 +01:00
Mark Siewert	2175f13b67	- Add tracking for dependencies between plugins. ... - Add reference number mangling required for moving references around.	2012-11-17 00:21:51 +01:00
scrawl	5f7d349126	several missing includes	2012-11-14 05:32:23 +01:00
Mark Siewert	42eefaf36f	- Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). ... - Reference loader now (partially) supports MVRF tag.	2012-11-10 21:43:41 +01:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
Marc Zinnschlag	4994a253da	Merge branch 'bountydisease' into dialogue	2012-11-09 18:17:14 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	00a2de432a	fix BulletShapeLoader namespace	2012-11-08 18:48:07 +01:00
Marc Zinnschlag	662054acf4	Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter	2012-11-08 14:55:31 +01:00
Mark Siewert	7f77bf76c7	- Add support for multiple esm contexts in cell store. This will allow to generate references from multiple esX files. Currently, only the first context is used. ... - Add many TODOs to mark points where more work is required to fully implement this feature.	2012-11-06 22:13:19 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	5ac54d1fff	alter ESM::Script for storing id as std::string	2012-11-05 17:18:01 +04:00
greye	d5628c678f	add mId field to every record indexed by id	2012-11-05 17:18:01 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	f0a3ee0ef9	gmst id should be lowercase, wipe RecIdListT	2012-11-05 17:14:02 +04:00
scrawl	4ca0eb93ee	fix markers used for raycasting and blocking activation	2012-10-24 17:47:03 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	510674aa5e	Merge branch 'master' into alchemy ... Conflicts: components/esm/loadmgef.hpp	2012-10-18 14:37:05 +02:00
Marc Zinnschlag	5fbca239dd	Issue #61: potion creation (1st part; still missing some implementations)	2012-10-18 14:02:06 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	84a4fd56c3	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
scrawl	8ccb0907e6	assertion -> exception; added the old effect flags again	2012-10-12 14:26:10 +02:00
Marc Zinnschlag	3fd887c030	silenced some warnings	2012-10-09 17:11:41 +02:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
Mark Siewert	1f961d575e	Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ... Conflicts: apps/openmw/mwrender/terrain.cpp components/esm/loadland.hpp components/esm_store/reclists.hpp	2012-10-07 20:35:54 +02:00
Mark Siewert	28d4d7ea3f	Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. ... - Remove check for 255 master/plugin files.	2012-10-07 20:00:55 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
greye	31f7325e1f	fix land loading	2012-10-01 15:46:32 +04:00
greye	93078bb0dc	move record ids to defs.hpp	2012-10-01 00:55:27 +04:00
greye	3494e17b7c	wipe record superclass	2012-10-01 00:51:54 +04:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Chris Robinson	cd8515396a	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
Chris Robinson	9b491edbf8	Small cleanup for loading animation keyframes	2012-09-28 18:53:24 -07:00
scrawl	d163f8203c	change books to RecListWithIDT	2012-09-25 21:38:34 +02:00
greye	1339787863	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
greye	7368e7b655	rename getASCII() to getLegacyEnc()	2012-09-23 22:20:18 +04:00
greye	c54750977f	remove underscores in guards	2012-09-23 22:11:08 +04:00
scrawl	bf3aad8be0	handle NCC flag	2012-09-23 18:30:13 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
greye	09195894cf	restore INGR and MGEF	2012-09-21 12:30:08 +04:00
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
greye	bd94f257bf	a bit formatting	2012-09-21 09:36:18 +04:00
greye	e69880f77e	almost perfect byte copies, has redundant data	2012-09-20 20:33:30 +04:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	e8bba2b833	disabled loading of land normals again, didn't need them after all	2012-09-20 14:06:30 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
greye	597b88e95a	update saving AI packages	2012-09-18 19:30:19 +04:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Marc Zinnschlag	835c530e06	Merge branch 'ingredients'	2012-09-13 13:31:46 +02:00
scrawl	b5ddc8d4fb	Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.	2012-09-13 13:10:02 +02:00
Marc Zinnschlag	677158c477	added typesafe access functions for GMST values	2012-09-13 10:41:55 +02:00
Marc Zinnschlag	f2ab4c929d	Issue #356: added hardcoded magic effect flags *grumble*	2012-09-13 09:26:17 +02:00
scrawl	906d290935	Markers are actually hidden now. Inspecting the markers in NifSkope revealed why it didn't work previously: the flag that is being looked for is not present in any of the markers, nor any other flag or extra data to identify them. However, the root node name always starts with "marker", making it possible to do a string search.	2012-09-12 12:41:12 +02:00
Jason Hooks	c5b25ef70b	Very basic actor physics (no set scale/rotate functions)	2012-09-10 20:29:24 -04:00
Alexander "Ace" Olofsson	7934d8abd9	Fixed an issue with some paths not concatenating properly.	2012-09-09 16:28:02 +02:00
Alexander "Ace" Olofsson	bc6d87ba32	Oops, that would've broken getUserPath() on Linux...	2012-09-08 23:04:53 +02:00
Alexander "Ace" Olofsson	cd3e780614	Removing the unnecessary local variables	2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson	97f1be2b05	Testing a third way to solve the path issue	2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson	6e317f00eb	Fix the problem in a different way	2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson	b6fcd337df	Modified the cache path to work on windows	2012-09-08 15:08:24 +02:00
Marc Zinnschlag	e3d893b001	Merge remote-tracking branch 'jhooks/animationsmooth'	2012-09-06 09:09:46 +02:00
Edmondo Tommasina	7b73bfb099	settings.cpp: fix std::runtime_error compile error ... Fix following error: [ 11%] Building CXX object components/CMakeFiles/components.dir/nifoverrides/nifoverrides.cpp.o /home/edmondo/src/openmw/components/settings/settings.cpp: In static member function ‘static const std::string Settings::Manager::getString(const std::string&, const std::string&)’: /home/edmondo/src/openmw/components/settings/settings.cpp:82:15: error: ‘runtime_error’ is not a member of ‘std’ make[2]: *** [components/CMakeFiles/components.dir/settings/settings.cpp.o] Error 1	2012-09-05 23:39:58 +02:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
scrawl	4f1bcb749f	turned off redundant edge list building	2012-09-02 10:09:41 +02:00
Jason Hooks	0697c7f7f4	Finally merged in master	2012-09-01 17:28:12 -04:00
greye	a90547bbbe	code formatting	2012-08-29 21:35:06 +04:00
greye	75fa0288a3	fix creatures has spells, creatures ai data	2012-08-29 14:35:43 +04:00
greye	02d7aa4135	npc ai packages	2012-08-29 14:35:43 +04:00
Marc Zinnschlag	34c30b132c	Issue #378: workaround for bad ingredient records in Morrowind.esm	2012-08-28 10:12:22 +02:00
Michael Mc Donnell	eff2799c1b	Update UTF 8 table generator to print char values ... This patch is in relation to commit 25fa8165f97 (Use char literals in UTF 8 conversion to fix 798 warnings), which changed the UTF 8 table to have char integer values instead of unsigned chars. Those values were converted using a custom Python script. This patch changes the original table generator so it can now output the same format.	2012-08-27 10:55:39 -04:00
Michael Mc Donnell	5fa8165f97	Use char literals in UTF 8 conversion to fix 798 warnings ... The data type is specified as char but the literals are unsigned char. This results in 798 truncation warnings in vs2010. The literals were converted with a simple python script to signed char while taking two's complement and the overflow into account. Also tested on Ubuntu 12.04 with gcc 4.6.	2012-08-22 16:42:53 -04:00
Jason Hooks	5202b11235	just moving a comment	2012-08-18 15:31:54 -04:00
Jason Hooks	4a219404fc	Super smooth animations; 100 PERCENT COMPLETE	2012-08-18 15:21:43 -04:00
Jason Hooks	f21df64808	changing a few things around	2012-08-18 14:48:18 -04:00
Marc Zinnschlag	98219323b7	Merge remote-tracking branch 'mmd/vsdebugfixes'	2012-08-18 12:56:59 +02:00
Jason Hooks	cc776810e2	smoother animations	2012-08-17 17:10:21 -04:00
Michael Mc Donnell	7952d38e6c	Use debug dlls when debugging in vs2010 (try 2) ... Using the Debug build in vs2010 is not working because the debug dlls are not loaded when debugging. The reason they are not loaded is that CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging. It also defines DEBUG to make it easier turn things on and off when debugging. There are still other bugs that have broken Debug mode in vs2010 but those will be addressed in other patches.	2012-08-17 10:47:20 -04:00
Marc Zinnschlag	1da56e2832	removed some unused variables	2012-08-17 15:37:14 +02:00
Marc Zinnschlag	2a11a28e81	Revert "Use debug dlls when debugging in vs2010" ... This reverts commit ebe131b326.	2012-08-17 10:05:29 +02:00
Jason Hooks	d14cc5a435	update master	2012-08-16 18:20:26 -04:00
Michael Mc Donnell	ebe131b326	Use debug dlls when debugging in vs2010 ... Using the Debug build in vs2010 is not working because the debug dlls are not loaded when debugging. The reason they are not loaded is that CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging. There are still other bugs that have broken Debug mode in vs2010 but those will be addressed in other patches.	2012-08-16 11:18:16 -04:00
Jason Hooks	8762f4a47a	boxrotation nif field; commented functions	2012-08-15 16:47:26 -04:00
Jason Hooks	1f5bc229e0	Separate adjustRigidBody function	2012-08-14 18:04:58 -04:00
Jason Hooks	e7329d5f8b	Creatures now have a properly positioned box shape	2012-08-12 00:36:49 -04:00
Jason Hooks	38c2c5d480	Creatures now use object physics	2012-08-09 18:09:11 -04:00
Jason Hooks	083e3537b4	post merge	2012-08-09 17:21:59 -04:00
Marc Zinnschlag	7cc2de3e21	boost filesystem compatibility fix	2012-08-08 08:52:08 +02:00
Marc Zinnschlag	dbcd4a8b5b	compatibility fix	2012-08-05 00:06:19 +02:00
Edmondo Tommasina	20deb97a09	nif_file.hpp: add stdint.h include to fix build ... It fixes such compile errors as: * error: ‘uint8_t’ does not name a type * error: ‘uint16_t’ does not name a type * error: ‘uint32_t’ does not name a type	2012-08-04 23:14:53 +02:00
Edmondo Tommasina	c08e098d7f	esm_reader.cpp: fix std::runtime_error compile error	2012-08-04 23:02:34 +02:00
Edmondo Tommasina	32b167ce2b	Revert "nif_file.hpp: include type definitions to fix build" ... This reverts commit b0b3ebe123.	2012-08-04 23:02:27 +02:00
Edmondo Tommasina	a63fd77ccc	Revert "esm_reader.hpp: fix std::runtime_error compile error" ... This reverts commit 0f3cb5667f.	2012-08-04 22:58:26 +02:00
Jason Hooks	cacf0bd10d	Basic collision with npcs	2012-08-04 15:43:33 -04:00
Edmondo Tommasina	b0b3ebe123	nif_file.hpp: include type definitions to fix build	2012-08-03 22:42:59 +02:00
Edmondo Tommasina	0f3cb5667f	esm_reader.hpp: fix std::runtime_error compile error	2012-08-03 22:41:51 +02:00
Michael Mc Donnell	7f802a22b5	Compare with stream position instead of int. ... Fixes compilation of Debug build on Windows.	2012-08-01 17:52:20 -04:00
Marc Zinnschlag	f8e54b401b	fixed linkage problem	2012-08-01 09:09:00 +02:00
Nikolay Kasyanov	32d2326b4d	Update components/files/ogreplugin.hpp ... removed #error directive	2012-07-31 18:15:09 +04:00
Nikolay Kasyanov	03cccee0e4	bug #348: workaround for boost older than 1.44	2012-07-31 10:51:34 +04:00
Nikolay Kasyanov	defab0e4b5	Merge remote-tracking branch 'upstream/master' into osx_fix ... Conflicts: CMakeLists.txt	2012-07-31 01:06:18 +04:00
Nikolay Kasyanov	b05dfeae70	bug #348: cleanup ... moved files to appropriate component, moved function to namespace, added docs	2012-07-31 01:01:00 +04:00
Nikolay Kasyanov	a84d8e83cd	add const specifier to first argument, also made it reference	2012-07-28 02:39:49 +04:00
Nikolay Kasyanov	b0b2064232	always add debug suffix in plugin loader ... also removed cout spam	2012-07-28 02:31:30 +04:00
Nikolay Kasyanov	fbe9a94568	bug #348: fixed OS X deployment ... just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search plugins inside application bundle instead of Ogre prefix	2012-07-28 01:55:37 +04:00
scrawl	281e15f58e	consider all material properties for nif material sharing, instead of just the texture	2012-07-26 23:40:55 +02:00
Chris Robinson	4f46c8a8db	Use a functor for the mismatch compare function	2012-07-24 14:59:25 -07:00
Chris Robinson	36be1536d9	Return text keys from NIFs when creating entities	2012-07-23 17:20:47 -07:00
scrawl	1fef086088	Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" ... This reverts commit 546b640022, reversing changes made to fcaa8aae06.	2012-07-23 15:36:12 +02:00
scrawl	f8d6a36196	Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp	2012-07-23 15:35:31 +02:00
Marc Zinnschlag	2c5d3d8df9	Merge remote branch 'scrawl/shadersystem' into shadersystem ... Attention: We have submodules again. Don't forget to update! Conflicts: components/files/configurationmanager.cpp	2012-07-23 14:12:21 +02:00
scrawl	1dbfd60305	Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup	2012-07-23 13:48:12 +02:00
Lukasz Gromanowski	1dde806add	Fixes #313: openmw without a ~/.config/openmw folder segfault. ... Added creation of $HOME/.config/openmw directory. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-07-22 14:52:55 +03:00
Chris Robinson	4035d7370e	Fix name/filter comparison	2012-07-21 22:04:05 -07:00
Chris Robinson	d8cb685543	Interpolate keyframes when creating them ... Probably not fully correct, but better than nothing.	2012-07-21 18:03:01 -07:00
Chris Robinson	c5b9098517	Remove an unused field from EntityList	2012-07-21 17:09:16 -07:00
scrawl	546b640022	Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup	2012-07-21 23:50:56 +02:00
Chris Robinson	4bc93ecd1a	Use the skeleton name for the main animation	2012-07-20 11:09:05 -07:00
scrawl	014396e80c	remove the plugins.cfg files, do not enforce CG plugin	2012-07-20 16:44:03 +02:00
Chris Robinson	4210880c06	Load the animation tracks into Ogre	2012-07-19 21:46:16 -07:00
Chris Robinson	0986cd5962	Get the animation controller target names	2012-07-19 20:48:12 -07:00
Chris Robinson	c2acf47d88	Store the list of keyframe controllers when building the bones	2012-07-19 20:30:10 -07:00
Chris Robinson	f6c837468f	Load the proper NIF skeleton	2012-07-19 11:44:08 -07:00
Chris Robinson	e760219953	Use a unique loader for each skeleton resource	2012-07-19 11:36:36 -07:00
Chris Robinson	c9b1f72d81	Use a case-insensitive compare for the part filter	2012-07-18 22:31:07 -07:00
Chris Robinson	bd74ab027a	Mirror left-sided parts	2012-07-18 21:21:49 -07:00
Chris Robinson	4af1bce659	Restore and fix some missing parts	2012-07-18 20:14:23 -07:00
Chris Robinson	d9b64b77ec	Attach skinned parts to the scene node instead of the named bone	2012-07-18 18:38:55 -07:00
Chris Robinson	5154188110	Allow specifying an alternate skeleton for mesh skinning	2012-07-18 18:29:25 -07:00
Chris Robinson	626dcd54dc	Store the skeleton name with the mesh resource loader instead of a flag	2012-07-18 17:26:51 -07:00
Chris Robinson	04b244cf9e	Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes	2012-07-18 17:18:21 -07:00
Chris Robinson	2890904fb5	Use lowercase names for the mesh and skeleton resources ... To reduce the risk of duplicates due to different capitalizations.	2012-07-18 15:27:33 -07:00
Chris Robinson	e8ff304562	Fix the initial normal vector for vertex fixups	2012-07-18 12:53:45 -07:00
Chris Robinson	3b29d280b9	Filter out skinned shapes that don't match the bone name	2012-07-18 12:47:16 -07:00
Chris Robinson	db948969c9	Attach NPC parts to the proper bone	2012-07-18 11:14:13 -07:00
Chris Robinson	a32740cf5e	Remove an unused parameter	2012-07-17 22:41:26 -07:00
Chris Robinson	b04c3cbcac	Store the entities' root node in the EntityList	2012-07-17 21:42:47 -07:00
Chris Robinson	92546ca18d	Move the last bits of code to createEntities	2012-07-17 20:23:09 -07:00
Chris Robinson	1c544682d5	Stub handling for NiTextKeyExtraData to suppress some spam	2012-07-17 16:45:01 -07:00
Chris Robinson	496343b714	Use the proper member for the NIF type string	2012-07-17 16:36:43 -07:00
Chris Robinson	3efd2030e2	Create entities when loading NIFs for creatures	2012-07-17 14:11:07 -07:00
Chris Robinson	3dedac5cb1	Create mesh entities for objects when loading the NIF	2012-07-17 13:40:03 -07:00
Chris Robinson	6047dc6a0c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp	2012-07-17 10:57:15 -07:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Chris Robinson	93f0043afc	Set the mesh's attach point as the NiTriShape's node	2012-07-17 10:04:21 -07:00
Marc Zinnschlag	2c70a93553	Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp	2012-07-17 10:32:18 +02:00
Marc Zinnschlag	4bfed952bc	Merge remote branch 'guidoj/master'	2012-07-17 10:17:06 +02:00
guidoj	a021165d9f	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
Chris Robinson	65c20f128f	Build bones for non-NiNode nodes (NiTriShapes, etc)	2012-07-16 21:18:33 -07:00
Chris Robinson	ada88596dc	Fix an abort at shutdown ... Ogre uses a special method to delete the stream object, so it needs to be allocated properly.	2012-07-16 15:30:09 -07:00
Chris Robinson	fefbf86531	Use Ogre's matrix ops to transform normals	2012-07-16 14:30:23 -07:00
Chris Robinson	bf26f029f9	Fix some skinning-related transformations	2012-07-16 13:47:19 -07:00
Chris Robinson	df76c324a4	Handle the MRK text string marker	2012-07-16 13:34:56 -07:00
Chris Robinson	63e40d6e92	Fix world transform calculation	2012-07-16 13:16:11 -07:00
Chris Robinson	12f1785882	Use default bone names for duplicate names	2012-07-16 11:43:16 -07:00
Chris Robinson	75ce10c580	Don't load data for hidden meshes	2012-07-16 11:31:45 -07:00
Chris Robinson	ad75b47472	Build and set up a skeleton for meshes	2012-07-15 19:07:31 -07:00
Chris Robinson	b1f7fd9f7b	Pre-transform the mesh vertices when there's no skinning or skeleton	2012-07-15 17:00:27 -07:00
Chris Robinson	61f32eca77	Add methods to get a node's local and full transform as a 4x4 matrix	2012-07-15 15:23:49 -07:00
Chris Robinson	441a5c2da2	Load NiTriShapes into Ogre meshes	2012-07-15 14:12:12 -07:00
Chris Robinson	3029c221ef	Create materials when creating meshes	2012-07-15 12:59:39 -07:00
scrawl	509e9d7034	Merge branch 'master' into shadersystem	2012-07-15 21:58:45 +02:00
scrawl	fb1f8082d2	fix link error with recent glibc versions	2012-07-15 21:27:57 +02:00
Chris Robinson	b4c8375f3c	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: components/bsa/bsa_archive.cpp	2012-07-15 12:04:43 -07:00
Chris Robinson	9028cfe83c	Look for the NiTriShape when the mesh resource wants to load ... It's still not loaded yet.	2012-07-15 12:02:47 -07:00
Chris Robinson	69ed73399a	Avoid exposing the NIF mesh resource loading class	2012-07-15 11:40:48 -07:00
Chris Robinson	300730a834	Create the skeleton resource from NIFs ... Note they are not loaded yet.	2012-07-15 11:13:48 -07:00
Marc Zinnschlag	871b1d1c9b	silenced a warning	2012-07-15 19:20:59 +02:00
Chris Robinson	bc0a6bffcf	Remove outdated comment	2012-07-15 09:03:35 -07:00
Chris Robinson	bd68f7bd33	Remove final direct uses of Mangle::Stream	2012-07-15 08:51:51 -07:00
Chris Robinson	7734771245	Use Ogre to load ESM data instead of Mangle	2012-07-15 08:31:03 -07:00
Chris Robinson	a8ebb39883	Avoid Mangle for BSA accesses ... The way it was set up was not very efficient, and we're using Ogre for resource management anyway, so it's best to just use that.	2012-07-15 07:50:24 -07:00
Chris Robinson	6a447c88fb	Create meshes from the NiTriShapes in the NIF. ... This doesn't actually load them yet. It's also very slow for certain NIFs.	2012-07-15 06:45:21 -07:00
Chris Robinson	9caa264074	Merge remote branch 'zini/master' into nif-cleanup	2012-07-14 17:27:36 -07:00
scrawl	5e8bf28212	Merge branch 'master' into shadersystem	2012-07-14 18:46:11 +02:00
scrawl	5345d4eeef	fix a warning	2012-07-14 18:45:03 +02:00
Chris Robinson	5a381006e5	Fix parsing of some key lists ... It seems some still want you to read the interpolation type even when there's no keys.	2012-07-14 09:20:09 -07:00
scrawl	d41050fb79	merge	2012-07-14 11:21:40 +02:00
scrawl	7d5b94709d	Merge branch 'master' into shadersystem ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2012-07-14 11:16:35 +02:00
Chris Robinson	939d0d2fc5	Return a list of meshes and the skeleton from NIFLoader::load	2012-07-13 20:01:15 -07:00
Chris Robinson	fdfe40a55a	Use a different loader object for each NIF mesh	2012-07-13 13:41:08 -07:00
Chris Robinson	9436ca4b0c	Use vectors for ShapeData properties	2012-07-13 09:32:58 -07:00
Marc Zinnschlag	182017b8e9	Issue #314: Moved ingredients and potions to a different type of record list	2012-07-13 13:08:48 +02:00
Chris Robinson	ecdd4ee23f	Load NiMorphData and NiKeyframeData using proper key lists	2012-07-12 20:56:47 -07:00
Chris Robinson	386ac56bda	Remove the NIF loader and code to manually transform the vertices ... This currently breaks just about everything. They should come back as it's all reimplemented, though.	2012-07-12 20:12:18 -07:00
Chris Robinson	9995dff943	Use a key list for NiColorData	2012-07-12 14:33:50 -07:00
Chris Robinson	3f11b6b1ae	Cleanup a couple unneeded misc component references	2012-07-12 12:01:11 -07:00
Chris Robinson	86b37c6c11	Move the velocity out of the transformation object	2012-07-12 11:21:52 -07:00
Chris Robinson	b292665de9	Use key lists to store some NIF data types	2012-07-12 08:00:26 -07:00
Chris Robinson	b7b9f11333	Add generic classes to help deal with NIF keys	2012-07-12 06:47:38 -07:00
Chris Robinson	645b507ba0	Return a reference to the RecordPtr from operator[] for consistency ... RecordListT is supposed to be a list of RecordPtrT objects.	2012-07-12 05:37:56 -07:00
Chris Robinson	7e8c146de6	Constify some RecordListT methods	2012-07-11 06:39:03 -07:00
Chris Robinson	8e324c90dc	Constify some RecordPtrT methods	2012-07-11 06:37:17 -07:00
Chris Robinson	395a7600fd	Initialize identify transform when declaring the identity object	2012-07-10 23:13:03 -07:00
Chris Robinson	348b5fa207	Merge remote branch 'zini/master' into nif-cleanup ... Conflicts: components/nifbullet/bullet_nif_loader.cpp	2012-07-10 06:16:16 -07:00
Chris Robinson	dddf1b4ee5	Rename getMatrix->getMatrix3 and getVector->getVector3	2012-07-10 04:45:14 -07:00
Marc Zinnschlag	f11bf49a90	cmake fix; silenced some warnings	2012-07-10 13:23:41 +02:00
Chris Robinson	d30f64650a	Make the read_* methods private and remove the generic load() methods	2012-07-10 04:21:47 -07:00
Chris Robinson	930459365b	Rename getShort->getUShort and getByte->getChar	2012-07-10 03:52:01 -07:00
Chris Robinson	95b804a104	Remove NIFFile::getArrayLen	2012-07-10 03:02:37 -07:00
Chris Robinson	ca37706b34	Use Ogre types for Matrix and Vector objects	2012-07-10 02:38:35 -07:00
Chris Robinson	10072f74b4	Remove NIFFile::getType	2012-07-10 00:27:13 -07:00
Chris Robinson	98ae7168b1	Fix double-incrementing a pointer	2012-07-10 00:24:18 -07:00
Chris Robinson	b3aa453f9a	Use Ogre data streams for loading NIFs	2012-07-09 22:02:12 -07:00
Chris Robinson	0143cacd2b	Avoid returning pointers from NIFFile	2012-07-09 21:35:36 -07:00
Chris Robinson	d3a31a24ce	Use proper strings and vectors instead of slice arrays for NIF files ... Slice arrays use pre-allocated pointers whose memory is managed externally. This is unnecessary and ultimately detrimental since it prevents any kind of data fixup (e.g. little endian to big endian, p[adding handling), and it also makes it difficult to use Ogre data streams.	2012-07-09 21:08:23 -07:00
scrawl	b803d0e949	converted shadow caster shader	2012-07-09 19:46:36 +02:00
scrawl	81d30ff63a	temp commit	2012-07-09 19:20:41 +02:00
gugus	03f7740474	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp	2012-07-09 10:39:57 +02:00
Jason Hooks	b5edad790d	merge	2012-07-07 15:27:04 -04:00