Commit Graph

1258 Commits (c5acfbf1337cf753c5be5d32877238d6ab67a7bd)

Author SHA1 Message Date
Chris Robinson e7c0f2a211 Minor cleanup to loading texture UV coords 12 years ago
Chris Robinson 01a1a0b846 Merge remote-tracking branch 'zini/master' into nifogre
Conflicts:
	components/nifogre/ogrenifloader.cpp
12 years ago
Marc Zinnschlag 85e5bd212b Merge remote-tracking branch 'scrawl/master' 12 years ago
Chris Robinson 23097ac9dc Minor cleanup of NiMorphData 12 years ago
scrawl 343e2027af Support NIF detail maps 12 years ago
scrawl a5c868c9f5 Create a separate vertex buffer for each UV set 12 years ago
Chris Robinson c6c67a1bb4 Read NiGravity fields 12 years ago
Chris Robinson 3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 12 years ago
Chris Robinson dba7308248 Recognize NiParticleRotation 12 years ago
Chris Robinson 3c633e275e Don't create a controller for empty keyframe data 12 years ago
Chris Robinson 261ea1fe5e Implement a KeyframeController 12 years ago
Chris Robinson f69a8259e1 Update animation source controller targets 12 years ago
Chris Robinson 44a59e1b87 Fix a couple messages 12 years ago
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.
12 years ago
scrawl f3c8cd2065 Don't buy/sell keys which are set to open a lock 12 years ago
scrawl 2d2196b0d6 Implemented levelled items 12 years ago
Marc Zinnschlag 60cc95305d added basic birthsign table 12 years ago
Chris Robinson 399394ff10 Don't restrict animations to the keyframe time limits 12 years ago
Chris Robinson ab5980ae18 Let the default controller function use absolute input
And convert the VisController to use it.
12 years ago
Chris Robinson fe9a7f12b6 Material fixes 12 years ago
Marc Zinnschlag e25f5c6dfe added basic region table 12 years ago
Chris Robinson 2e067e95a9 Handle NiWireframeProperty 12 years ago
Chris Robinson ebff64a7a4 Fix UVController and add warn about unhandled material controllers 12 years ago
Marc Zinnschlag ff1d908af4 added script table 12 years ago
Chris Robinson be419bc891 Handle NiCamera nodes 12 years ago
Chris Robinson 2db72ae607 Rename EntityList to ObjectList 12 years ago
Chris Robinson 834a6a1f00 Remove old, unused code 12 years ago
Chris Robinson d97b341dc6 Rename NIFMeshLoader to NIFObjectLoader 12 years ago
Marc Zinnschlag ec7a8f1add small fix 12 years ago
Chris Robinson 63cbf7ddeb Specify a default return for failed lookups 12 years ago
Chris Robinson ca289a317c Separate the UVController function out and make it generic
Also fix a timing bug in it.
12 years ago
Marc Zinnschlag 8bf569d58a added basic sound table 12 years ago
Chris Robinson 6b151be3f4 Create particle systems even when MRK was specified 12 years ago
Chris Robinson 41e410347e Merge remote-tracking branch 'zini/master' into nifogre 12 years ago
Chris Robinson c283991126 Remove an unneeded method 12 years ago
Marc Zinnschlag 0f34c79d0a Merge branch 'race' 12 years ago
Chris Robinson ebcb4c66c3 Properly read and use the NIF root record list 12 years ago
Chris Robinson 59f1d4b047 Add support for NiUVController on meshes 12 years ago
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.
12 years ago
Chris Robinson 95730cc127 Create entities and particle systems for hidden objects
They're set as (in)visible as appropriate.
12 years ago
Chris Robinson f764f243d2 Fix the particle quota 12 years ago
Chris Robinson 41ce5464c9 Recognize NiBSAnimationNode as a record type
And don't warn about animated nodes without textkeys
12 years ago
Chris Robinson 99b915e652 Fix some material warnings 12 years ago
Chris Robinson af756bfa9c Merge remote-tracking branch 'zini/master' into nifogre 12 years ago
Chris Robinson b5017e0543 Implement NiParticleGrowFade 12 years ago
Chris Robinson aa9df818a5 Add support for NiVisController 12 years ago
Chris Robinson 0631b28646 Prepare for supporting controller objects 12 years ago
scrawl 75b462b974 If alpha rejection was forced, we also need to force depth_write and depth_check 12 years ago
Chris Robinson bf0ae3ae72 Read NiVisData info 12 years ago
Chris Robinson 12fada2862 Don't offset the animation time to 0 12 years ago
Chris Robinson dc9f5f93e7 Use a helper function to get node properties 12 years ago
Marc Zinnschlag 73da794d77 added basic race table 12 years ago
Chris Robinson b5719e0ec7 Create particle systems for NiAutoNormalParticles and NiRotatingParticles nodes
Very incomplete, but it's something to work with.
12 years ago
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).
12 years ago
Chris Robinson ac10c5f05c Even more particle information 12 years ago
Chris Robinson 2f6ae4a915 Read more particle information 12 years ago
Chris Robinson ee0a20f9ce Read some missing particle data from NIFs 12 years ago
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).
12 years ago
Marc Zinnschlag 18e046e628 cleaned up race record struct 12 years ago
Marc Zinnschlag 8c7d578ddc moved the CellRef struct to its own header 12 years ago
Marc Zinnschlag 7136ac0079 added missing attribute columns to faction table 12 years ago
scrawl a9b56eedc3 Support NIF "glow maps", which are basically an emissive channel. 12 years ago
scrawl 5625d73d84 Bump texture support 12 years ago
Chris Robinson 095daca058 Create entities when iterating through the NIF 12 years ago
Chris Robinson 512534be11 Read the correct texture resource for other layers 12 years ago
Chris Robinson f6f165852d Better handle material texture layers 12 years ago
Marc Zinnschlag 384c88182d dealing with unset attribute fields 12 years ago
Marc Zinnschlag f9f520df34 adjusted faction record to increase consistency with other records 12 years ago
Marc Zinnschlag c71edb613d added faction table 12 years ago
Marc Zinnschlag fd0aa1a4b8 Issue #685: Treat : as a whitespace 12 years ago
Marc Zinnschlag 607435aaf2 Merge branch 'class' 12 years ago
scrawl e27e53f607 Fix not playable body parts appearing in the race selection menu. 12 years ago
scrawl 6f1575d42a CELL record corrections 12 years ago
Marc Zinnschlag ea3b14f2d2 added skill columns to class 12 years ago
Marc Zinnschlag c7275965b8 added basic class record table 12 years ago
Marc Zinnschlag 1078386fd7 Merge branch 'skills' into next 12 years ago
Marc Zinnschlag 114f99ddbf add skill records when creating a new base file 12 years ago
scrawl 8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 12 years ago
scrawl 918cdcffc2 Split up components/esm/loadlocks 12 years ago
Marc Zinnschlag 7df0f6aaee prepared skill record for use in editor 12 years ago
Marc Zinnschlag 1d1471b81c fixed a bug in ESM::Variant::write (was affecting string values) 12 years ago
scrawl 6c1ff8caca Merge branch 'master' into next
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
12 years ago
Marc Zinnschlag 4711135e7f workaround for faulty endif in Morrowind scripts 12 years ago
Marc Zinnschlag 6ef754c451 Merge remote-tracking branch 'scrawl/armorrating' into next 12 years ago
Marc Zinnschlag 46bde604f9 Issue #601: unary minus was interpreted as binary minus when used in an argument list without comma 12 years ago
scrawl dd57eabc3e Better use an enum for magic effect IDs 12 years ago
scrawl e30af28860 Markers should still have collision if they have a NiRootCollisionNode 12 years ago
scrawl 84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 12 years ago
Marc Zinnschlag 1a809b1cec Merge remote-tracking branch 'scrawl/master' 12 years ago
scrawl 599207a92d Transparency sorting should be enabled only when alpha blending is enabled 12 years ago
Marc Zinnschlag 170451cb79 Merge remote-tracking branch 'graffy76/saveOnClose' into next 12 years ago
Marc Zinnschlag 75bd30844d added optional format sub-record to tes3 record 12 years ago
graffy76 50abb22162 Fix to allow application closing from multiple views and a single view. 12 years ago
Marc Zinnschlag 16570ce87b moved header record struct to separate file 12 years ago
Marc Zinnschlag 731ac6a160 removed redundant copy of Header::Data 12 years ago
Marc Zinnschlag 9e68a420ae restructuring tes3 record structs 12 years ago
pvdk b2d522aa4d Added support for non-latin characters in esx metadata 12 years ago
Marc Zinnschlag b085c4f749 removing more leftovers 12 years ago
Marc Zinnschlag 2e1a1fd11a removing some remains of the removed GMST fixing feature 12 years ago
Marc Zinnschlag 64d517dd79 removed unused file type information from esm component 12 years ago
Emanuel Guevel 289bbc64f7 Load fallback archives listed in openmw.cfg at startup 12 years ago
Marc Zinnschlag b255472cc6 fixed a spelling mistake 12 years ago
Marc Zinnschlag 2cc20c67cb Merge remote-tracking branch 'scrawl/raycasting' 12 years ago
scrawl 14964e9fcd Only build a box shape for collision nodes; use StringUtils 12 years ago
scrawl d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 12 years ago
Emanuel Guevel 3adf3f5121 Revive bsatool 12 years ago
Pieter van der Kloet 9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 12 years ago
Pieter van der Kloet 7504ae675b Implemented a file dialog for the editor using launcher .ui 12 years ago
Marc Zinnschlag e7e8bd655f Merge remote-tracking branch 'scrawl/graphics' 12 years ago
greye 9133182f2f restore loading CELL records in esmtool 12 years ago
scrawl 7f8d659f3c Fix transparency sorting 12 years ago
Marc Zinnschlag d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 12 years ago
scrawl c9f7f1b994 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 2486ec6cb9 Material fixes (vertex colors, alpha) 12 years ago
Marc Zinnschlag dc3edc6024 Merge branch 'vartype' 12 years ago
Marc Zinnschlag 1489570b09 change variant in info record to new type 12 years ago
Marc Zinnschlag 1b19ab6028 fixed gmst integers 12 years ago
Marc Zinnschlag ba4907fbaf use new Variant type for GMSTs 12 years ago
Marc Zinnschlag ce49ad54a1 some cleanup and fixing 12 years ago
Pieter van der Kloet 4c9d0563fe WIP: Implementing the .ui for the DataFilesPage 12 years ago
Chris Robinson 2f14f26b96 Use the full unique mesh name for the material instead of the NIF name 12 years ago
Marc Zinnschlag a1ac20c6f3 changed global variable records to new variant type 12 years ago
Marc Zinnschlag 65081f5520 added variant class 12 years ago
Chris Robinson 4e1e0eaf62 Merge remote-tracking branch 'zini/master' into material-fix
Conflicts:
	components/nifogre/ogrenifloader.cpp
12 years ago
Chris Robinson 5e50436a94 Convert some BooleanValues to StringValues 12 years ago
scrawl 05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
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
12 years ago
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).
12 years ago
Chris Robinson 7930aa82b2 Add missing depthFlags to the hash 12 years ago
Chris Robinson 8e35159ad4 Handle NiSpecularProperty 12 years ago
Chris Robinson 8c0326a49c Handle NiZBufferProperty 12 years ago
Chris Robinson 03785f3ecd Handle NiVertexColorProperty 12 years ago
Pieter van der Kloet a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 12 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 12 years ago
Chris Robinson fdfcd5bb47 Material properties are accumulative along the node tree 12 years ago
Nathan Jeffords d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 12 years ago
Nathan Jeffords 0ed2015319 refactored NIFFile parse to get better code/data seperation 12 years ago
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.
12 years ago
Chris Robinson e3fd4b8429 Fix restoring the original texture name when the DDS check fails 12 years ago
Chris Robinson e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 12 years ago
Chris Robinson 166d529c50 Ensure the material is properly built after creating it 12 years ago
Chris Robinson 2c05a7477c Improve checks for texture resource names that include the "textures\" prefix 12 years ago
Chris Robinson ae5c0663f5 Merge remote-tracking branch 'zini/master' into nif-fixes 12 years ago
Chris Robinson eaa6813917 Workaround for meshes without any vertices 12 years ago
Chris Robinson 2786cc67f6 Fix loading empty NiTriShapeData records 12 years ago
Marc Zinnschlag 230136438b minor cleanup 12 years ago
lazydev 60f2219450 fixed zini's norices 12 years ago
Chris Robinson 1168f15361 Don't disable depth writes when blending is enabled 12 years ago
lazydev 169a1ff1ce Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag 1f24763881 Merge remote-tracking branch 'vorenon/licensefix' 12 years ago
vorenon 06e077c07c Removing all traces of "Open Morrowind".
pvdk said it was ok to remove the header entirely
12 years ago
scrawl 6683e43efc Removed commented code 12 years ago
scrawl f75681d89b Ignore ESX header version 12 years ago
Marc Zinnschlag 3bd228f71b fix for global variables of type short 12 years ago
lazydev b93eb84401 fix for https://bugs.openmw.org/issues/573 12 years ago
Chris Robinson a7220518b6 Merge remote-tracking branch 'zini/master' into skeleton-fixes 12 years ago
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.
12 years ago
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.
12 years ago
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.
12 years ago
scrawl b82ee4872d Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
12 years ago
Marc Zinnschlag 53953b23f9 Merge remote-tracking branch 'chris/materials' 12 years ago
Marc Zinnschlag f175f8327f Merge remote-tracking branch 'lazydev/master' 12 years ago
scrawl 369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson b4b20622c6 Properly handle NiAlphaProperty values 12 years ago
lazydev f717fe0254 Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag 70b6b68005 Merge remote-tracking branch 'sergeyshambir/BBfix' 12 years ago
lazydev 759b2e96bf fix for https://bugs.openmw.org/issues/577 12 years ago
Marc Zinnschlag a7102c143f ESX variable type cleanup 12 years ago
Chris Robinson aefd12dfe0 Don't create meshes for collision shapes 12 years ago
Chris Robinson 9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Chris Robinson 429bc23cf6 Convert the 0-1 glossiness parameter to 0-255 for shininess 12 years ago
Pieter van der Kloet 469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
Marc Zinnschlag a535d51cbf Merge branch 'brokenendfix' 12 years ago
Chris Robinson 5f2c897001 Better handle which collision shapes to load 12 years ago
Chris Robinson ff1ecb85c6 Don't bother storing the shape name for the submesh name
The submesh name Ogre has is completely useless to us
12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
12 years ago
Marc Zinnschlag 151ecaad04 workaround for garbage after an end statement 12 years ago
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.
12 years ago
Sergey Shambir b1381ddd69 Nif loader: workaround for missed textures in BB/BH
Works for Better Bodies / Better Heads addons.
12 years ago
Pieter van der Kloet 6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
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.
12 years ago
scrawl 2e6c63d9cd Disable specular on NIF's 12 years ago
Chris Robinson db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 12 years ago
scrawl 3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Nathan Jeffords 44b1c66c4b fixed various warnings about converting size_t to int 12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
greye 82595e66b2 another missing header for #576 12 years ago
Marc Zinnschlag 9b7957cf20 fixed a missing inlcude 12 years ago
Chris Robinson 6ae00be8a3 Fix nifbullet shape transformation 12 years ago
scrawl f4749f10da NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this) 12 years ago
Pieter van der Kloet 35b68a3c40 Fixed accidental profile deletion and added sorting by date 12 years ago
Pieter van der Kloet 37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 12 years ago
scrawl 32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Pieter van der Kloet 178cf2154e Made checking/unchecking work with the new datafiles model 12 years ago
Chris Robinson e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
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
12 years ago
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
12 years ago
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
12 years ago
Chris Robinson da5f11700f Warn about unhandled node types before the controllers 12 years ago