mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 18:26:38 +00:00
Code Issues Releases Wiki Activity
8188 commits 115 branches 76 tags 128 MiB
Commit graph

1336 commits

Author SHA1 Message Date
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