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.
12 years ago
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.
12 years ago
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.
12 years ago
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.
12 years ago
Emanuel Guevel
cc792da858
Fix to_utf8 test: add test data directory and remove unused include
12 years ago
Emanuel Guevel
c947d87ab9
Add a test for to_utf8 component
12 years ago
Chris Robinson
61ad8bb3dd
Use a list of mesh names instead of mesh objects
12 years ago
Chris Robinson
019893b5c6
Get rid of some unnecessary case-insensitive compares
12 years ago
Emanuel Guevel
0bdf52a071
components/to_utf8: keep only Utf8Encoder
12 years ago
Emanuel Guevel
02bf02f288
ESMReader, ESMWriter: use Utf8Encoder
12 years ago
Emanuel Guevel
9906c3051d
components/translation: use Utf8Encoder
12 years ago
Emanuel Guevel
740e2b5769
components/to_utf8: add class Utf8Encoder
12 years ago
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.
12 years ago
Marc Zinnschlag
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
12 years ago
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).
12 years ago
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
12 years ago
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
12 years ago
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
12 years ago
eduard
69d9d22579
comparestring
12 years ago
eduard
98103e15eb
conflict resolution
12 years ago
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
12 years ago
Marc Zinnschlag
334588bf1c
Merge branch 'editor2'
12 years ago
eduard
c75a5ae212
string compare and tolower
12 years ago
eduard
8545667bbd
string compare and tolower
12 years ago
Mark Siewert
2cef65a056
- Remove some files that are no longer in upstream/master
12 years ago
Tom Mason
a14b7e4a0f
small fixes on text defines
12 years ago
Marc Zinnschlag
e9ba7339f3
improved error handling
12 years ago
Marc Zinnschlag
afc2e840ae
renamed namespace TranslationData to Translation
12 years ago
Marc Zinnschlag
206c613b52
moved translation storage from GUI manager to engine
12 years ago
Marc Zinnschlag
2d468fec02
made previous commits naming standard compliant
12 years ago
Marc Zinnschlag
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
12 years ago
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
12 years ago
lazydev
1f71395660
renaming of translation component; removing of C++11 features
12 years ago
lazydev
74ae479780
Cell names localization fix
12 years ago
Tom Mason
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
12 years ago
Tom Mason
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
12 years ago
Thoronador
5a7a8629b6
remove unnecessary include directive
12 years ago
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.
12 years ago
Marc Zinnschlag
5cd2fe00ab
initialise blank global records
12 years ago
Marc Zinnschlag
8a09e03d5c
global variable editing (no undo support yet)
12 years ago
Marc Zinnschlag
ef9575498f
basic (non-editable) subview for global variables
12 years ago
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.
12 years ago
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.
12 years ago
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.
12 years ago
Marc Zinnschlag
d684b3ae11
fixed getString function in NIF loader
12 years ago
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.
12 years ago
Mark Siewert
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
12 years ago
scrawl
5f7d349126
several missing includes
12 years ago
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.
12 years ago
Marc Zinnschlag
75f64aa38b
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.hpp
apps/openmw/mwmechanics/npcstats.cpp
apps/openmw/mwmechanics/npcstats.hpp
12 years ago
greye
b1ef0026a9
race selection/inventory preview character model update
12 years ago
Marc Zinnschlag
4994a253da
Merge branch 'bountydisease' into dialogue
12 years ago
greye
c3f0dc0dfb
m prefix for NpcAnimation members
12 years ago
scrawl
00a2de432a
fix BulletShapeLoader namespace
12 years ago
Marc Zinnschlag
662054acf4
Issue #219 : moved checks for various dialogue info fields from DialogueManager to Filter
12 years ago
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.
12 years ago
Mark Siewert
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
12 years ago
greye
8691eac557
resolve Script::mData.mName -> mId, resolve moving ESMStore
12 years ago
greye
5ac54d1fff
alter ESM::Script for storing id as std::string
12 years ago
greye
d5628c678f
add mId field to every record indexed by id
12 years ago
greye
2057f5619e
move ESMStore to MWWorld
12 years ago
greye
f0a3ee0ef9
gmst id should be lowercase, wipe RecIdListT
12 years ago
scrawl
4ca0eb93ee
fix markers used for raycasting and blocking activation
12 years ago
Marc Zinnschlag
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
12 years ago
Marc Zinnschlag
18686614db
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
12 years ago
Marc Zinnschlag
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
12 years ago
Marc Zinnschlag
5fbca239dd
Issue #61 : potion creation (1st part; still missing some implementations)
12 years ago
scrawl
1a2034b4dd
training window
12 years ago
scrawl
84a4fd56c3
consider all files in Splash directory
12 years ago
Marc Zinnschlag
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
12 years ago
scrawl
8ccb0907e6
assertion -> exception; added the old effect flags again
12 years ago
Marc Zinnschlag
3fd887c030
silenced some warnings
12 years ago
Marc Zinnschlag
35d099a638
disabling gcc extensions
12 years ago
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
12 years ago
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.
12 years ago
scrawl
21493c2dbd
added magic effect flags from Research wiki page
12 years ago
greye
31f7325e1f
fix land loading
12 years ago
greye
93078bb0dc
move record ids to defs.hpp
12 years ago
greye
3494e17b7c
wipe record superclass
12 years ago
greye
2fa4ac177a
initial resolving
12 years ago
greye
721324c1db
rm record inheritance, rework esmtool accordingly
12 years ago
Chris Robinson
cd8515396a
Use a multimap to store the text keys
12 years ago
Chris Robinson
9b491edbf8
Small cleanup for loading animation keyframes
12 years ago
scrawl
d163f8203c
change books to RecListWithIDT
12 years ago
greye
1339787863
remove underscores from filenames in esm
12 years ago
greye
7368e7b655
rename getASCII() to getLegacyEnc()
12 years ago
greye
c54750977f
remove underscores in guards
12 years ago
scrawl
bf3aad8be0
handle NCC flag
12 years ago
scrawl
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
12 years ago
greye
18cc435aa1
resolving conflicts
12 years ago
greye
09195894cf
restore INGR and MGEF
12 years ago
greye
2d5ddd104b
Land::loadData rework
12 years ago
greye
bd94f257bf
a bit formatting
12 years ago
greye
e69880f77e
almost perfect byte copies, has redundant data
12 years ago
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
scrawl
e8bba2b833
disabled loading of land normals again, didn't need them after all
12 years ago
scrawl
86cfc91ef3
global map rendering
12 years ago
greye
597b88e95a
update saving AI packages
12 years ago
Marc Zinnschlag
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
greye
7606ebafd6
resolving conflicts, minor update
12 years ago
Marc Zinnschlag
835c530e06
Merge branch 'ingredients'
12 years ago
scrawl
b5ddc8d4fb
Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.
12 years ago
Marc Zinnschlag
677158c477
added typesafe access functions for GMST values
12 years ago
Marc Zinnschlag
f2ab4c929d
Issue #356 : added hardcoded magic effect flags *grumble*
12 years ago
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.
12 years ago
Jason Hooks
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
Alexander "Ace" Olofsson
7934d8abd9
Fixed an issue with some paths not concatenating properly.
12 years ago
Alexander "Ace" Olofsson
bc6d87ba32
Oops, that would've broken getUserPath() on Linux...
12 years ago
Alexander "Ace" Olofsson
cd3e780614
Removing the unnecessary local variables
12 years ago
Alexander "Ace" Olofsson
97f1be2b05
Testing a third way to solve the path issue
12 years ago
Alexander "Ace" Olofsson
6e317f00eb
Fix the problem in a different way
12 years ago
Alexander "Ace" Olofsson
b6fcd337df
Modified the cache path to work on windows
12 years ago
Marc Zinnschlag
e3d893b001
Merge remote-tracking branch 'jhooks/animationsmooth'
13 years ago
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
13 years ago
scrawl
c27ff546e4
shader cache
13 years ago
scrawl
950bf66334
throw an exception if default value for a setting is not found
13 years ago
scrawl
4f1bcb749f
turned off redundant edge list building
13 years ago
Jason Hooks
0697c7f7f4
Finally merged in master
13 years ago
greye
a90547bbbe
code formatting
13 years ago
greye
75fa0288a3
fix creatures has spells, creatures ai data
13 years ago
greye
02d7aa4135
npc ai packages
13 years ago
Marc Zinnschlag
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
13 years ago
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.
13 years ago
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.
13 years ago
Jason Hooks
5202b11235
just moving a comment
13 years ago
Jason Hooks
4a219404fc
Super smooth animations; 100 PERCENT COMPLETE
13 years ago
Jason Hooks
f21df64808
changing a few things around
13 years ago
Marc Zinnschlag
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
13 years ago
Jason Hooks
cc776810e2
smoother animations
13 years ago
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.
13 years ago
Marc Zinnschlag
1da56e2832
removed some unused variables
13 years ago
Marc Zinnschlag
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
.
13 years ago
Jason Hooks
d14cc5a435
update master
13 years ago
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.
13 years ago
Jason Hooks
8762f4a47a
boxrotation nif field; commented functions
13 years ago
Jason Hooks
1f5bc229e0
Separate adjustRigidBody function
13 years ago
Jason Hooks
e7329d5f8b
Creatures now have a properly positioned box shape
13 years ago
Jason Hooks
38c2c5d480
Creatures now use object physics
13 years ago
Jason Hooks
083e3537b4
post merge
13 years ago
Marc Zinnschlag
7cc2de3e21
boost filesystem compatibility fix
13 years ago
Marc Zinnschlag
dbcd4a8b5b
compatibility fix
13 years ago
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
13 years ago
Edmondo Tommasina
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
13 years ago
Edmondo Tommasina
32b167ce2b
Revert "nif_file.hpp: include type definitions to fix build"
...
This reverts commit b0b3ebe123
.
13 years ago
Edmondo Tommasina
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
.
13 years ago
Jason Hooks
cacf0bd10d
Basic collision with npcs
13 years ago
Edmondo Tommasina
b0b3ebe123
nif_file.hpp: include type definitions to fix build
13 years ago
Edmondo Tommasina
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
13 years ago
Michael Mc Donnell
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
13 years ago
Marc Zinnschlag
f8e54b401b
fixed linkage problem
13 years ago
Nikolay Kasyanov
32d2326b4d
Update components/files/ogreplugin.hpp
...
removed #error directive
13 years ago
Nikolay Kasyanov
03cccee0e4
bug #348 : workaround for boost older than 1.44
13 years ago
Nikolay Kasyanov
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
Nikolay Kasyanov
a84d8e83cd
add const specifier to first argument, also made it reference
13 years ago
Nikolay Kasyanov
b0b2064232
always add debug suffix in plugin loader
...
also removed cout spam
13 years ago
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
13 years ago
scrawl
281e15f58e
consider all material properties for nif material sharing, instead of just the texture
13 years ago
Chris Robinson
4f46c8a8db
Use a functor for the mismatch compare function
13 years ago
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
13 years ago
scrawl
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022
, reversing
changes made to fcaa8aae06
.
13 years ago
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
13 years ago
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
13 years ago
scrawl
1dbfd60305
Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup
13 years ago
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>
13 years ago
Chris Robinson
4035d7370e
Fix name/filter comparison
13 years ago
Chris Robinson
d8cb685543
Interpolate keyframes when creating them
...
Probably not fully correct, but better than nothing.
13 years ago
Chris Robinson
c5b9098517
Remove an unused field from EntityList
13 years ago
scrawl
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
13 years ago
Chris Robinson
4bc93ecd1a
Use the skeleton name for the main animation
13 years ago
scrawl
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
Chris Robinson
4210880c06
Load the animation tracks into Ogre
13 years ago
Chris Robinson
0986cd5962
Get the animation controller target names
13 years ago
Chris Robinson
c2acf47d88
Store the list of keyframe controllers when building the bones
13 years ago
Chris Robinson
f6c837468f
Load the proper NIF skeleton
13 years ago
Chris Robinson
e760219953
Use a unique loader for each skeleton resource
13 years ago
Chris Robinson
c9b1f72d81
Use a case-insensitive compare for the part filter
13 years ago
Chris Robinson
bd74ab027a
Mirror left-sided parts
13 years ago
Chris Robinson
4af1bce659
Restore and fix some missing parts
13 years ago
Chris Robinson
d9b64b77ec
Attach skinned parts to the scene node instead of the named bone
13 years ago
Chris Robinson
5154188110
Allow specifying an alternate skeleton for mesh skinning
13 years ago
Chris Robinson
626dcd54dc
Store the skeleton name with the mesh resource loader instead of a flag
13 years ago
Chris Robinson
04b244cf9e
Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes
13 years ago
Chris Robinson
2890904fb5
Use lowercase names for the mesh and skeleton resources
...
To reduce the risk of duplicates due to different capitalizations.
13 years ago
Chris Robinson
e8ff304562
Fix the initial normal vector for vertex fixups
13 years ago
Chris Robinson
3b29d280b9
Filter out skinned shapes that don't match the bone name
13 years ago
Chris Robinson
db948969c9
Attach NPC parts to the proper bone
13 years ago
Chris Robinson
a32740cf5e
Remove an unused parameter
13 years ago
Chris Robinson
b04c3cbcac
Store the entities' root node in the EntityList
13 years ago
Chris Robinson
92546ca18d
Move the last bits of code to createEntities
13 years ago
Chris Robinson
1c544682d5
Stub handling for NiTextKeyExtraData to suppress some spam
13 years ago
Chris Robinson
496343b714
Use the proper member for the NIF type string
13 years ago
Chris Robinson
3efd2030e2
Create entities when loading NIFs for creatures
13 years ago
Chris Robinson
3dedac5cb1
Create mesh entities for objects when loading the NIF
13 years ago
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
13 years ago
scrawl
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
Chris Robinson
93f0043afc
Set the mesh's attach point as the NiTriShape's node
13 years ago
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
13 years ago
Marc Zinnschlag
4bfed952bc
Merge remote branch 'guidoj/master'
13 years ago
guidoj
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
Chris Robinson
65c20f128f
Build bones for non-NiNode nodes (NiTriShapes, etc)
13 years ago
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.
13 years ago
Chris Robinson
fefbf86531
Use Ogre's matrix ops to transform normals
13 years ago
Chris Robinson
bf26f029f9
Fix some skinning-related transformations
13 years ago
Chris Robinson
df76c324a4
Handle the MRK text string marker
13 years ago
Chris Robinson
63e40d6e92
Fix world transform calculation
13 years ago
Chris Robinson
12f1785882
Use default bone names for duplicate names
13 years ago
Chris Robinson
75ce10c580
Don't load data for hidden meshes
13 years ago
Chris Robinson
ad75b47472
Build and set up a skeleton for meshes
13 years ago
Chris Robinson
b1f7fd9f7b
Pre-transform the mesh vertices when there's no skinning or skeleton
13 years ago
Chris Robinson
61f32eca77
Add methods to get a node's local and full transform as a 4x4 matrix
13 years ago
Chris Robinson
441a5c2da2
Load NiTriShapes into Ogre meshes
13 years ago
Chris Robinson
3029c221ef
Create materials when creating meshes
13 years ago
scrawl
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
scrawl
fb1f8082d2
fix link error with recent glibc versions
13 years ago
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
Chris Robinson
9028cfe83c
Look for the NiTriShape when the mesh resource wants to load
...
It's still not loaded yet.
13 years ago
Chris Robinson
69ed73399a
Avoid exposing the NIF mesh resource loading class
13 years ago
Chris Robinson
300730a834
Create the skeleton resource from NIFs
...
Note they are not loaded yet.
13 years ago
Marc Zinnschlag
871b1d1c9b
silenced a warning
13 years ago
Chris Robinson
bc0a6bffcf
Remove outdated comment
13 years ago
Chris Robinson
bd68f7bd33
Remove final direct uses of Mangle::Stream
13 years ago
Chris Robinson
7734771245
Use Ogre to load ESM data instead of Mangle
13 years ago
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.
13 years ago
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.
13 years ago
Chris Robinson
9caa264074
Merge remote branch 'zini/master' into nif-cleanup
13 years ago
scrawl
5e8bf28212
Merge branch 'master' into shadersystem
13 years ago
scrawl
5345d4eeef
fix a warning
13 years ago
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.
13 years ago
scrawl
d41050fb79
merge
13 years ago
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
13 years ago
Chris Robinson
fdfe40a55a
Use a different loader object for each NIF mesh
13 years ago
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
13 years ago
Marc Zinnschlag
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
13 years ago
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
13 years ago
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.
13 years ago
Chris Robinson
9995dff943
Use a key list for NiColorData
13 years ago
Chris Robinson
3f11b6b1ae
Cleanup a couple unneeded misc component references
13 years ago
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
13 years ago
Chris Robinson
b292665de9
Use key lists to store some NIF data types
13 years ago
Chris Robinson
b7b9f11333
Add generic classes to help deal with NIF keys
13 years ago
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
13 years ago
Chris Robinson
7e8c146de6
Constify some RecordListT methods
13 years ago
Chris Robinson
8e324c90dc
Constify some RecordPtrT methods
13 years ago
Chris Robinson
395a7600fd
Initialize identify transform when declaring the identity object
13 years ago
Chris Robinson
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
13 years ago
Chris Robinson
dddf1b4ee5
Rename getMatrix->getMatrix3 and getVector->getVector3
13 years ago
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
13 years ago