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

1542 commits

Author SHA1 Message Date
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05:00
graffy76
9d358dd44c Further implemented auto-checking / unchecking of dependencies 2013-09-23 22:01:44 -05:00
graffy76
d7cff6361e Fixed filter issue (all addons for a gamefile are enabled for checking). 
Note:  Other dependencies are not yet automatically selected when an
addon is checked.
 2013-09-23 06:51:49 -05:00
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
Xethik
9f533dbbe4 Fixed "most vexing parse" issue. 2013-09-22 04:57:01 -04:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
graffy76
244e581952 Finished implementing drag / drop 
refactored datafilesmodel (now contentmodel)
refactored esmfil
 2013-09-19 06:53:09 -05:00
graffy76
0eb06ada39 Implemneting drag and drop 2013-09-18 02:36:23 -05:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
Marc Zinnschlag
874ce26bef added missing consts to record save functions 2013-09-16 12:32:35 +02:00
Nikolay Kasyanov
25cd9ebf45 Plugins are frameworks in Ogre 1.9. Version hack removed. 2013-09-15 21:56:47 +04:00
Marc Zinnschlag
1ee228a566 fix for the ESMWriter fix 2013-09-15 15:30:17 +02:00
Marc Zinnschlag
bcd36bd378 various ESMWriter fixes 2013-09-15 15:00:15 +02:00
Marc Zinnschlag
bf8a25c2c6 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-12 19:07:35 +02:00
gus
f9bfbc8764 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 2013-09-10 16:18:39 +02:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
scrawl
188df341c3 Replaced log2 to make VC happy 2013-08-27 16:08:58 +02:00
scrawl
839d251cc5 Renamed Terrain::Terrain to Terrain::World to make VC happy 2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
mckibbenta
06701467ab Merge branch 'master' into tgm 2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
Marc Zinnschlag
f605dcdd24 Merge branch 'filter' 2013-08-24 14:51:05 +02:00
Nikolay Kasyanov
dc6e15f38e Replaced std::pow with shift since clang doesn't like int as a first argument 
(reports that call is ambiguous)
 2013-08-21 23:59:33 +04:00
Marc Zinnschlag
e03e2f0817 Merge remote-tracking branch 'scrawl/master' 2013-08-21 19:50:08 +02:00
scrawl
d086346b07 Fix loading of some cells in TR 2013-08-21 17:26:11 +02:00
scrawl
5f7e6f7b10 Fix a material issue, layers per pass wasn't entirely correct 2013-08-21 17:26:11 +02:00
scrawl
43313437dc Fix composite map for cells without land data 2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2 Use a proper node hierarchy; disconnect the root when entering interior 2013-08-21 17:26:11 +02:00
Chris Robinson
602be9bbe7 Avoid swimming into the air from underwater 2013-08-21 07:24:54 -07:00
graffy76
e6fdc7e7fd ... 2013-08-20 12:34:39 -05:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
scrawl
fa76d1631b Some terrain fixes 2013-08-20 12:08:46 +02:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
scrawl
8c8653160d Crash fix, material fix 2013-08-20 09:52:27 +02:00
scrawl
b92da9ae93 Neighbour fix 2013-08-19 21:08:44 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
scrawl
a41a23c90a Deleted old code 2013-08-19 20:34:19 +02:00
graffy76
e614ec3353 Fixing profile code in progress... 2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
graffy76
a14e0b32d8 Restructured esxselector directory 
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
 2013-08-18 09:48:13 -05:00
graffy76
d0363b037c Renamed components/fileorderlist to components/esxselector 2013-08-18 09:41:02 -05:00
graffy76
45277c0082 Minor changes 
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
 2013-08-18 09:34:33 -05:00
graffy76
66e50343ad Fixed row-selection/check feature 2013-08-18 08:54:51 -05:00
graffy76
a9db983233 Fixing row-click selection 2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac Continued migration of code to ContentSelector 2013-08-17 05:55:43 -05:00
graffy76
0087b0d67c Removed checkboxes from master list 
Moved checkbox code from datafilesmodel to pluginsproxymodel
 2013-08-17 05:37:23 -05:00
graffy76
61602789e1 Began migrating code to ContentSelector base 2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971 Moved init code to master / plugin proxy classes 2013-08-16 21:20:48 -05:00
graffy76
7389507eb5 Created masterproxylist class 2013-08-16 21:12:30 -05:00
graffy76
b850fe0289 Removed vertical headers from plugin view 2013-08-16 18:59:01 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9 Changed filter mechanism for game / addons 
Filters by number of master references, regardless of extension
 2013-08-16 17:26:23 -05:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2013-08-09 07:00:00 -07:00
Chris Robinson
db1036e5e5 Handle SetWerewolfAcrobatics 2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4 Handle werewolf stats 2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d added description field to filter record 2013-08-09 13:45:50 +02:00
Marc Zinnschlag
bf839d19cf Merge branch 'columns' 2013-08-08 12:50:57 +02:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
Alex
b9579e085f cleanup 2013-08-07 15:40:57 -04:00
Alex
a0931b01fe Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg 2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32 mild cleanup 2013-08-07 13:16:20 -04:00
Chris Robinson
57fb065a86 Add Ogre::Light objects to the object list 
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
 2013-08-06 19:49:01 -07:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
Marc Zinnschlag
501753c01b Merge remote-tracking branch 'scrawl/master' into columns 2013-08-03 15:06:30 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Marc Zinnschlag
adb05737ee Merge branch 'master' into filter 
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
 2013-07-30 15:55:50 +02:00
Chris Robinson
b7e81dbc5b Ignore controllers on the root NiNode 
I wonder if we should ignore the root NiNode completely.
 2013-07-28 04:20:33 -07:00
Chris Robinson
fb0ee7f2fc Improve constness of the Nif RecordPtr structs 2013-07-24 23:58:35 -07:00
Chris Robinson
8e24cab935 Strip trailing whitespace from textkeys 2013-07-24 23:21:19 -07:00
Marc Zinnschlag
6f90e071f4 added filter record (will not be used in OpenMW prior to 1.1) 2013-07-22 20:50:04 +02:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
Marc Zinnschlag
0fd49f10a9 Merge branch 'minus' 2013-07-07 16:09:44 +02:00
Marc Zinnschlag
4a75c7dcc0 allow backticks in names 2013-07-07 16:09:26 +02:00
Marc Zinnschlag
4986b7d65d Merge branch 'master' into ref 2013-07-06 17:54:19 +02:00
graffy76
a73b97d125 Fixed broken references and other bugs 
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
 2013-06-21 23:23:43 -05:00
Marc Zinnschlag
a2aa3aaa0e workaround for - in names 2013-06-21 14:20:52 +02:00
Marc Zinnschlag
744198fc44 added blank function to CellRef and moved a function that was in the wrong file 2013-06-08 15:49:59 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
Miroslav Puda
dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 2013-05-29 00:01:18 +02:00
Miroslav Puda
b40e24c50c Refactorization 2013-05-27 20:23:04 +02:00
Miroslav Puda
cfbdf3f779 Enum Type renamed to CastingStyle 2013-05-27 15:37:31 +02:00
Miroslav Puda
9e1eb8b3b1 Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics 2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226 Better formula for enchantment cost and code refactorization. 2013-05-27 14:42:08 +02:00
eroen
886bc7e2f6 libc++ fixes: don't rely on tr1 
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.

Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
 2013-05-26 12:44:30 +02:00
Miroslav Puda
7149439ace Replacement of empty() method by assertion. 2013-05-22 13:23:49 +02:00
Miroslav Puda
cd57523601 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-05-20 14:01:47 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
Miroslav Puda
d5689730eb Removal of unnecessary variable. 
empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.
 2013-05-18 22:57:27 +02:00
Chris Robinson
53d1c3939c Merge remote-tracking branch 'zini/master' into animations 2013-05-17 06:26:34 -07:00
scrawl
ca81335319 Fix bug loading attribute values 2013-05-16 21:45:49 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Chris Robinson
822f130f79 Merge remote-tracking branch 'zini/master' into animations 2013-05-13 04:09:56 -07:00
Marc Zinnschlag
e2620a1edf Issue #694: allow float literals starting with . 2013-05-13 11:38:35 +02:00
Chris Robinson
eb4daaf512 Build a skeleton for Nifs that have a matching .kf file 2013-05-08 01:03:57 -07:00
Chris Robinson
bf94ffb839 Only support NiSequenceStreamHelper as a Kf root 
Newer versions of the Nif foramt may have other record types, but we don't
support those.
 2013-05-07 18:26:22 -07:00
Chris Robinson
8e38dc410f Allow loading multiple animation sources 
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
 2013-05-07 16:59:32 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
Marc Zinnschlag
b21dae8d75 added blank function to all referencable record structs 2013-05-06 14:10:43 +02:00
scrawl
f0354ea04c Fix member variable case problem 2013-05-04 19:14:19 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Marc Zinnschlag
fe038cef03 turned redeclartion of local variables from an error into a warning 2013-05-01 14:20:09 +02:00
Marc Zinnschlag
63407a662c allow <== and >== as alternative for <= and >= in scripts 2013-05-01 14:08:05 +02:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
scrawl
20d5ba0eec Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs" 
This reverts commit 6dbb53493b.
 2013-04-30 14:54:07 +02:00
scrawl
24f968623f Revert "reworked Nif::KeyListT into Nif::CurveT" 
This reverts commit e7665582ad.
 2013-04-30 14:53:51 +02:00
scrawl
de3c76a54b Revert "reworked NIFStream to use a type-handler" 
This reverts commit 03ee7663a3.
 2013-04-30 14:53:41 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
scrawl
d5c7a26041 Fix broken loose file resources when using Ogre 1.9 2013-04-29 12:32:24 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
4cedf0fbab Avoid colliding with AvoidNodes 
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
 2013-04-28 11:12:55 -07:00
Glorf
6ea82333d4 Headers cleanup 2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
Marc Zinnschlag
90b38cbfbe fixed parsing of end statements in scripts with IDs matching keywords 2013-04-27 14:06:23 +02:00
Nathan Jeffords
c7ede9b523 port code to C++03 2013-04-24 20:22:57 -07:00
Nathan Jeffords
6e7c9ebbe6 fix for gcc not handling static constant initialized in class definition 2013-04-24 20:22:57 -07:00
Nathan Jeffords
75757cb675 Created a class to represent a stream of UTF8 characters. 2013-04-24 20:20:00 -07:00
Nathan Jeffords
6dbb53493b enable move construction/assignment to key ESM data structure to reduce sorting costs 2013-04-24 20:20:00 -07:00
Nathan Jeffords
e7665582ad reworked Nif::KeyListT into Nif::CurveT 
Renamed Nif:KeyListT to Nif::CurveT, moved it into its own file and
changed its implementation so that on compatible platforms, the entire
array of key-frames can be read in a single read call. Added a helper
class called Nif::CurveT::interpolator to allow other code to easily
evaluate the curve. Reworked part of the skeletonLoader code to use
the interpolator to simplify its own logic.
 2013-04-24 20:20:00 -07:00
Nathan Jeffords
03ee7663a3 reworked NIFStream to use a type-handler 
Reworked NIFStream to use a type-handler system to decide how to extract
data from the NIF. It also has the capability to perform bulk reads on
compatible platforms, thus improving cell-load performance.
 2013-04-24 20:20:00 -07:00
Chris Robinson
68a9a4de5f Fix setting and getting KeyframeController transforms 2013-04-24 04:12:27 -07:00
Chris Robinson
26cc86ffdc Use the Nif node's transform for skinned fixups 2013-04-24 00:42:45 -07:00
Chris Robinson
6f0b9a5f2c Avoid unnecessary multimap copies 2013-04-23 21:42:59 -07:00
Chris Robinson
512ff3687a Don't create Ogre animations for skeletons 2013-04-23 20:42:54 -07:00
Chris Robinson
634b0fd067 Fix for controller delta time going below start time 2013-04-23 17:57:40 -07:00
Chris Robinson
020bc410bf Merge remote-tracking branch 'zini/master' into nifogre 2013-04-23 16:57:59 -07:00
scrawl
44ac0a7c18 Use one vertex buffer for all UV coordinates 2013-04-23 22:47:57 +02:00
Chris Robinson
adc6a948c7 Add methods to get the rotation, translation, and scale from a NodeTargetValue 2013-04-22 03:41:38 -07:00
Chris Robinson
59137d93c9 Partially handle NiGeomMorpherController 
The morphs aren't actually applied yet, but the Ogre controller is set up so
all that has to be done is to implement the setValue method.
 2013-04-22 03:24:02 -07:00
Chris Robinson
d936291dbf Remove an unused ostream operator<< 2013-04-22 02:53:32 -07:00
Chris Robinson
a3511c62cf Don't store textkeys in user object bindings 
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.

Plus, proper serialization can help for future optimizations.
 2013-04-22 00:01:30 -07:00
Chris Robinson
2345b5e8b3 Avoid storing text keys for each animation 2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6 Don't clip out the group name from the textkeys 2013-04-21 22:13:49 -07:00
Chris Robinson
ace7d647e5 Add a method to apply a NodeTargetValue-based controller to a specified node. 2013-04-20 15:35:19 -07:00
Chris Robinson
f37a71f025 Use a separate method to build node-based controllers 2013-04-19 23:56:47 -07:00
Chris Robinson
1051fa51a7 Recognize NiFlipController 2013-04-19 15:07:08 -07:00
Chris Robinson
6d59325bff Merge remote-tracking branch 'zini/master' into nifogre 2013-04-17 23:21:17 -07:00
scrawl
c519fc360d Move away from fixed record names for body parts 2013-04-18 00:19:34 +02:00
Chris Robinson
3def2a0f45 Treat the particle random values as the max differential 2013-04-16 19:16:45 -07:00
Chris Robinson
cac793758b Merge remote-tracking branch 'zini/master' into nifogre 2013-04-16 11:52:19 -07:00
Chris Robinson
36170c5374 Use flag enums instead of hard-coded hex values 2013-04-16 01:20:32 -07:00
Chris Robinson
1b1f9f7921 Allow multiple ObjectLists to be created for Animations. 
addObjectList may not currently be called outside of the related constructor.
 2013-04-15 18:55:28 -07:00
Chris Robinson
7000a1aa3e Add a ParticleSystemController 2013-04-14 13:50:55 -07:00
Chris Robinson
bf8bc989fc Recognize and partly handle NiBSParticleNode 2013-04-14 12:52:20 -07:00
Marc Zinnschlag
f692fc1093 Merge branch 'cell' 2013-04-14 19:35:19 +02:00
Marc Zinnschlag
0c33dd86d5 added basic cell table 2013-04-14 17:04:55 +02:00
Chris Robinson
f4695ec4ac Cleanup NIFObjectLoader some 2013-04-14 00:06:40 -07:00
Chris Robinson
acb1b5f002 Try to handle NiBSAnimationNode 
This is still incomplete guess work. Currently it seems as though flag 0x20
specifies whether the controllers auto-play (if on), rather than follow the
object's animation time.
 2013-04-13 22:54:32 -07:00
Chris Robinson
0b363ba36e Handle NiParticleColorModifier with Ogre's ColourInterpolator 
Note that Ogre's ColourInterpolator has a maximum of six color stages. This
seems to be fine so far, but if we want anything better, we'll need a custom
affector for it.
 2013-04-13 16:42:32 -07:00
Chris Robinson
80a4345787 Keep particles in local space 2013-04-13 16:26:34 -07:00
Chris Robinson
dd981077b9 Handle the vertical and horizontal parameters of Nif particles 
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
 2013-04-13 16:16:57 -07:00
Chris Robinson
7191f6ed2a Start a Nif-style particle emitter 
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
 2013-04-13 14:36:24 -07:00
Chris Robinson
07c24e0382 Don't create entities and particles when only the skeleton base is needed 2013-04-13 13:13:09 -07:00
Chris Robinson
4a42f89e08 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-13 13:04:41 -07:00
Chris Robinson
5b30677e41 Add the start of a custom gravity affector 2013-04-12 14:39:06 -07:00
Marc Zinnschlag
a1ece7de30 Bug #613: fixed assert in string literal access function 2013-04-12 14:48:53 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
Marc Zinnschlag
5bfa691f14 Merge branch 'script' 2013-04-11 10:50:46 +02:00
Marc Zinnschlag
6d3a2cd5a0 added comment token (for use in syntax colouring) 2013-04-11 10:50:22 +02:00
Chris Robinson
d26ffe9de0 Move a method to the Node class 2013-04-10 23:19:47 -07:00
Chris Robinson
62e0abd945 Move the mesh loader to its own source file 2013-04-10 22:38:46 -07:00
Chris Robinson
75489b1e9d Move NIFMaterialLoader to a separate file 2013-04-10 20:24:44 -07:00
Chris Robinson
3970407772 Use actual classes for properties 2013-04-10 20:22:13 -07:00
Chris Robinson
caff28e20a Move NIFSkeletonLoader to a separate file 2013-04-10 19:58:17 -07:00
Marc Zinnschlag
74145410f2 basic syntax highlighting in script subview 2013-04-10 22:49:22 +02:00
Chris Robinson
6c6750342c Specified particle size is actually the radius 2013-04-10 13:37:20 -07:00
Chris Robinson
9d29921913 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-09 15:12:19 -07:00
Marc Zinnschlag
ec6dff38b1 added basic spell table 2013-04-09 11:40:36 +02:00
Chris Robinson
973fdeb2e0 Improve particle system placement when no emitters are specified 2013-04-08 15:21:28 -07:00
Chris Robinson
e7c0f2a211 Minor cleanup to loading texture UV coords 2013-04-08 14:54:13 -07:00
Chris Robinson
01a1a0b846 Merge remote-tracking branch 'zini/master' into nifogre 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 2013-04-08 11:46:57 -07:00
Marc Zinnschlag
85e5bd212b Merge remote-tracking branch 'scrawl/master' 2013-04-08 20:05:52 +02:00
Chris Robinson
23097ac9dc Minor cleanup of NiMorphData 2013-04-08 09:47:03 -07:00
scrawl
343e2027af Support NIF detail maps 2013-04-08 15:17:30 +02:00
scrawl
a5c868c9f5 Create a separate vertex buffer for each UV set 2013-04-08 14:54:19 +02:00
Chris Robinson
c6c67a1bb4 Read NiGravity fields 2013-04-07 18:15:23 -07:00
Chris Robinson
3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-07 17:24:47 -07:00
Chris Robinson
dba7308248 Recognize NiParticleRotation 2013-04-07 17:16:49 -07:00
Chris Robinson
3c633e275e Don't create a controller for empty keyframe data 2013-04-07 15:42:07 -07:00
Chris Robinson
261ea1fe5e Implement a KeyframeController 2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1 Update animation source controller targets 2013-04-07 13:51:04 -07:00
Chris Robinson
44a59e1b87 Fix a couple messages 2013-04-07 13:03:41 -07:00
Chris Robinson
2362e920f3 Use an unconnected object list for animation sources 
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
 2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d added basic birthsign table 2013-04-07 20:26:39 +02:00
Chris Robinson
399394ff10 Don't restrict animations to the keyframe time limits 2013-04-07 10:03:13 -07:00
Chris Robinson
ab5980ae18 Let the default controller function use absolute input 
And convert the VisController to use it.
 2013-04-07 08:29:56 -07:00
Chris Robinson
fe9a7f12b6 Material fixes 2013-04-07 07:53:01 -07:00
Marc Zinnschlag
e25f5c6dfe added basic region table 2013-04-07 16:32:06 +02:00
Chris Robinson
2e067e95a9 Handle NiWireframeProperty 2013-04-07 07:12:52 -07:00
Chris Robinson
ebff64a7a4 Fix UVController and add warn about unhandled material controllers 2013-04-07 06:56:12 -07:00
Marc Zinnschlag
ff1d908af4 added script table 2013-04-07 15:17:35 +02:00
Chris Robinson
be419bc891 Handle NiCamera nodes 2013-04-07 02:28:15 -07:00
Chris Robinson
2db72ae607 Rename EntityList to ObjectList 2013-04-07 01:52:35 -07:00
Chris Robinson
834a6a1f00 Remove old, unused code 2013-04-07 01:14:26 -07:00
Chris Robinson
d97b341dc6 Rename NIFMeshLoader to NIFObjectLoader 2013-04-07 01:02:21 -07:00
Marc Zinnschlag
ec7a8f1add small fix 2013-04-06 21:58:28 +02:00
Chris Robinson
63cbf7ddeb Specify a default return for failed lookups 2013-04-06 12:41:40 -07:00
Chris Robinson
ca289a317c Separate the UVController function out and make it generic 
Also fix a timing bug in it.
 2013-04-06 12:26:58 -07:00
Marc Zinnschlag
8bf569d58a added basic sound table 2013-04-06 21:21:10 +02:00
Chris Robinson
6b151be3f4 Create particle systems even when MRK was specified 2013-04-06 11:26:51 -07:00
Chris Robinson
41e410347e Merge remote-tracking branch 'zini/master' into nifogre 2013-04-06 10:35:01 -07:00
Chris Robinson
c283991126 Remove an unneeded method 2013-04-06 10:33:07 -07:00
Marc Zinnschlag
0f34c79d0a Merge branch 'race' 2013-04-06 19:21:38 +02:00
Chris Robinson
ebcb4c66c3 Properly read and use the NIF root record list 2013-04-06 10:17:09 -07:00
Chris Robinson
59f1d4b047 Add support for NiUVController on meshes 2013-04-06 09:44:10 -07:00
Chris Robinson
e0da265972 Use accurate bone lookups for attaching objects 
NIFs don't requires nodes to have unique names, which means looking up a
bone by name may get the wrong one. Instead, use a NifIndex:BoneHandle
map to make sure we can get the proper bone from a given Nif::Node.
 2013-04-06 08:15:12 -07:00
Chris Robinson
95730cc127 Create entities and particle systems for hidden objects 
They're set as (in)visible as appropriate.
 2013-04-06 06:53:08 -07:00
Chris Robinson
f764f243d2 Fix the particle quota 2013-04-06 06:44:34 -07:00
Chris Robinson
41ce5464c9 Recognize NiBSAnimationNode as a record type 
And don't warn about animated nodes without textkeys
 2013-04-06 05:00:19 -07:00
Chris Robinson
99b915e652 Fix some material warnings 2013-04-06 00:54:53 -07:00
Chris Robinson
af756bfa9c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-06 00:22:31 -07:00
Chris Robinson
b5017e0543 Implement NiParticleGrowFade 2013-04-06 00:19:05 -07:00
Chris Robinson
aa9df818a5 Add support for NiVisController 2013-04-05 10:38:27 -07:00
Chris Robinson
0631b28646 Prepare for supporting controller objects 2013-04-05 10:13:54 -07:00
scrawl
75b462b974 If alpha rejection was forced, we also need to force depth_write and depth_check 2013-04-05 18:24:12 +02:00
Chris Robinson
bf0ae3ae72 Read NiVisData info 2013-04-05 06:29:14 -07:00
Chris Robinson
12fada2862 Don't offset the animation time to 0 2013-04-05 05:34:59 -07:00
Chris Robinson
dc9f5f93e7 Use a helper function to get node properties 2013-04-05 05:14:24 -07:00
Marc Zinnschlag
73da794d77 added basic race table 2013-04-04 14:34:39 +02:00
Chris Robinson
b5719e0ec7 Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes 
Very incomplete, but it's something to work with.
 2013-04-04 05:10:53 -07:00
Chris Robinson
77ba0fbe73 Prepare for creating particles 
This adds a vector of ParticleSystems to the EntityList, and modifies
corresponding code to handle it. It also loads the ParticleFX plugin so
particles can be created (although they aren't yet).
 2013-04-04 05:10:52 -07:00
Chris Robinson
ac10c5f05c Even more particle information 2013-04-04 05:10:52 -07:00
Chris Robinson
2f6ae4a915 Read more particle information 2013-04-04 05:10:51 -07:00
Chris Robinson
ee0a20f9ce Read some missing particle data from NIFs 2013-04-04 05:10:50 -07:00
Chris Robinson
97d617d43f Use more appropriate VBO settings 
Unskinned meshes don't need dynamic VBOs; they aren't rewritten since their
transformations are handled by the modelview matrix. They also don't need the
local RAM copy (the "shadow buffer") since it's really only useful for skinning
purposes (though this means the VBO has to be readable for static geometry to
work).
 2013-04-04 05:10:49 -07:00
Marc Zinnschlag
18e046e628 cleaned up race record struct 2013-04-04 13:50:36 +02:00
Marc Zinnschlag
8c7d578ddc moved the CellRef struct to its own header 2013-04-04 12:13:15 +02:00
Marc Zinnschlag
7136ac0079 added missing attribute columns to faction table 2013-04-04 10:58:53 +02:00
scrawl
a9b56eedc3 Support NIF "glow maps", which are basically an emissive channel. 2013-04-03 18:51:40 +02:00
scrawl
5625d73d84 Bump texture support 2013-04-03 17:16:34 +02:00
Chris Robinson
095daca058 Create entities when iterating through the NIF 2013-04-03 03:27:41 -07:00
Chris Robinson
512534be11 Read the correct texture resource for other layers 2013-04-02 22:58:07 -07:00
Chris Robinson
f6f165852d Better handle material texture layers 2013-04-02 21:09:44 -07:00
Marc Zinnschlag
384c88182d dealing with unset attribute fields 2013-04-02 14:15:22 +02:00
Marc Zinnschlag
f9f520df34 adjusted faction record to increase consistency with other records 2013-04-02 13:59:45 +02:00
Marc Zinnschlag
c71edb613d added faction table 2013-04-02 12:00:45 +02:00
Marc Zinnschlag
fd0aa1a4b8 Issue #685: Treat : as a whitespace 2013-03-31 14:46:46 +02:00
Marc Zinnschlag
607435aaf2 Merge branch 'class' 2013-03-31 10:49:56 +02:00
scrawl
e27e53f607 Fix not playable body parts appearing in the race selection menu. 2013-03-30 20:04:05 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
Marc Zinnschlag
ea3b14f2d2 added skill columns to class 2013-03-26 09:43:13 +01:00
Marc Zinnschlag
c7275965b8 added basic class record table 2013-03-25 13:22:06 +01:00
Marc Zinnschlag
1078386fd7 Merge branch 'skills' into next 2013-03-25 11:07:14 +01:00
Marc Zinnschlag
114f99ddbf add skill records when creating a new base file 2013-03-24 15:10:03 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
Marc Zinnschlag
7df0f6aaee prepared skill record for use in editor 2013-03-21 14:30:27 +01:00
Marc Zinnschlag
1d1471b81c fixed a bug in ESM::Variant::write (was affecting string values) 2013-03-21 12:57:10 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
Marc Zinnschlag
4711135e7f workaround for faulty endif in Morrowind scripts 2013-03-18 12:05:54 +01:00
Marc Zinnschlag
6ef754c451 Merge remote-tracking branch 'scrawl/armorrating' into next 2013-03-18 07:53:20 +01:00
Marc Zinnschlag
46bde604f9 Issue #601: unary minus was interpreted as binary minus when used in an argument list without comma 2013-03-17 17:13:25 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
e30af28860 Markers should still have collision if they have a NiRootCollisionNode 2013-03-14 19:03:42 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
Marc Zinnschlag
1a809b1cec Merge remote-tracking branch 'scrawl/master' 2013-03-13 08:32:44 +01:00
scrawl
599207a92d Transparency sorting should be enabled only when alpha blending is enabled 2013-03-13 01:00:47 +01:00
Marc Zinnschlag
170451cb79 Merge remote-tracking branch 'graffy76/saveOnClose' into next 2013-03-12 14:47:42 +01:00
Marc Zinnschlag
75bd30844d added optional format sub-record to tes3 record 2013-03-12 14:33:35 +01:00
graffy76
50abb22162 Fix to allow application closing from multiple views and a single view. 2013-03-12 06:28:13 -05:00
Marc Zinnschlag
16570ce87b moved header record struct to separate file 2013-03-12 09:16:03 +01:00
Marc Zinnschlag
731ac6a160 removed redundant copy of Header::Data 2013-03-12 08:30:51 +01:00
Marc Zinnschlag
9e68a420ae restructuring tes3 record structs 2013-03-12 08:15:20 +01:00
pvdk
b2d522aa4d Added support for non-latin characters in esx metadata 2013-03-12 04:01:05 +01:00
Marc Zinnschlag
b085c4f749 removing more leftovers 2013-03-11 16:53:42 +01:00
Marc Zinnschlag
2e1a1fd11a removing some remains of the removed GMST fixing feature 2013-03-11 16:30:47 +01:00
Marc Zinnschlag
64d517dd79 removed unused file type information from esm component 2013-03-11 14:42:49 +01:00
Emanuel Guevel
289bbc64f7 Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +01:00
Marc Zinnschlag
b255472cc6 fixed a spelling mistake 2013-03-09 15:39:49 +01:00
Marc Zinnschlag
2cc20c67cb Merge remote-tracking branch 'scrawl/raycasting' 2013-03-09 14:34:29 +01:00
scrawl
14964e9fcd Only build a box shape for collision nodes; use StringUtils 2013-03-09 10:28:10 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
Emanuel Guevel
3adf3f5121 Revive bsatool 2013-03-07 21:13:10 +01:00
Pieter van der Kloet
9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
Marc Zinnschlag
e7e8bd655f Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 17:44:28 +01:00
greye
9133182f2f restore loading CELL records in esmtool 2013-03-05 20:25:20 +04:00
scrawl
7f8d659f3c Fix transparency sorting 2013-03-05 17:09:20 +01:00
Marc Zinnschlag
d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 2013-03-05 16:31:22 +01:00
scrawl
c9f7f1b994 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-03-05 14:37:38 +01:00
scrawl
2486ec6cb9 Material fixes (vertex colors, alpha) 2013-03-05 13:51:48 +01:00
Marc Zinnschlag
dc3edc6024 Merge branch 'vartype' 2013-03-05 10:59:08 +01:00
Marc Zinnschlag
1489570b09 change variant in info record to new type 2013-03-05 10:34:03 +01:00