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
Chris Robinson
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
12 years ago
Michal Sciubidlo
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
12 years ago
Michal Sciubidlo
0df7c7e5c1
Rename mPlugins* to mFiles*
12 years ago
Michal Sciubidlo
e4ed397b2d
Merge plugins and masters list view in openDialog. Simplify datafilesmodel.
12 years ago
Chris Robinson
f4e587c72c
Always create a skeleton from a NIF when there's more than one NiNode
12 years ago
Chris Robinson
f197c67e95
Fix a circular include
12 years ago
Chris Robinson
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
scrawl
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Marc Zinnschlag
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
12 years ago
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.
12 years ago
Marc Zinnschlag
d5dd0640c7
basic gmst support
12 years ago
Chris Robinson
8b1e7b95ba
Attempt to load the skeleton source if it doesn't yet exist
12 years ago
Michal Sciubidlo
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
12 years ago
Michal Sciubidlo
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
12 years ago
Chris Robinson
bd4fdf47a3
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/sky.cpp
12 years ago
Michal Sciubidlo
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
12 years ago
Chris Robinson
bec538bfa1
Always declare operator<< for using a TextKeyMap with Ogre::Any
12 years ago
scrawl
109d0a942f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
Mark Siewert
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
12 years ago
Chris Robinson
c45b4d6072
Clean up some NIF warning reports
12 years ago
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.
12 years ago
Chris Robinson
e6e7c69013
Fix handling of filtered entities
12 years ago
Marc Zinnschlag
85697e4628
reverted to C++03
12 years ago
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
Michal Sciubidlo
492482de7f
Add "open" option in opencs.
12 years ago
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.
12 years ago
Michal Sciubidlo
ac62dd050d
Rename datafilespage to datafileslist
12 years ago
Michal Sciubidlo
f029a9011a
Move datafilespage to shared space.
12 years ago
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.
12 years ago
Chris Robinson
0853fa335c
Avoid redundant string concatenations
12 years ago
Chris Robinson
487c83e943
Rename nonaccum to animroot
12 years ago
Chris Robinson
e1d3933145
Remove an unused struct
12 years ago
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).
12 years ago
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.
12 years ago
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).
12 years ago
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.
12 years ago
Chris Robinson
8e8900e422
Use the first bone with text keys as the nonaccum root.
12 years ago
Chris Robinson
536f8104e6
Do not create an 'all' animation.
12 years ago
Mark Siewert
713d324eeb
- Minor code cleanup
12 years ago
Mark Siewert
a8e02779b2
- Add support for multiple plugins trying to modify the same reference
...
- Fix a small signed/unsigned warning
12 years ago
Chris Robinson
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
12 years ago
Chris Robinson
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
12 years ago
Chris Robinson
e5f040a06f
Improve filename pattern matching
12 years ago
scrawl
6c6ce4a05c
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
Chris Robinson
b23fcb260c
Use the record index for finding the NiTriShape instead of the name
12 years ago
Chris Robinson
660d73fd88
Store the NIF index in the Record object
12 years ago
scrawl
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago