d14cc5a435
update master
13 years ago
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
8762f4a47a
boxrotation nif field; commented functions
13 years ago
1f5bc229e0
Separate adjustRigidBody function
13 years ago
e7329d5f8b
Creatures now have a properly positioned box shape
13 years ago
38c2c5d480
Creatures now use object physics
13 years ago
083e3537b4
post merge
13 years ago
7cc2de3e21
boost filesystem compatibility fix
13 years ago
dbcd4a8b5b
compatibility fix
13 years ago
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
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
13 years ago
32b167ce2b
Revert "nif_file.hpp: include type definitions to fix build"
...
This reverts commit b0b3ebe123
13 years ago
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
13 years ago
cacf0bd10d
Basic collision with npcs
13 years ago
b0b3ebe123
nif_file.hpp: include type definitions to fix build
13 years ago
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
13 years ago
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
13 years ago
f8e54b401b
fixed linkage problem
13 years ago
32d2326b4d
Update components/files/ogreplugin.hpp
...
removed #error directive
13 years ago
03cccee0e4
bug #348 : workaround for boost older than 1.44
13 years ago
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
13 years ago
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
13 years ago
a84d8e83cd
add const specifier to first argument, also made it reference
13 years ago
b0b2064232
always add debug suffix in plugin loader
...
also removed cout spam
13 years ago
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
281e15f58e
consider all material properties for nif material sharing, instead of just the texture
13 years ago
4f46c8a8db
Use a functor for the mismatch compare function
13 years ago
36be1536d9
Return text keys from NIFs when creating entities
13 years ago
1fef086088
Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup"
...
This reverts commit 546b640022fcaa8aae06
13 years ago
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
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
1dbfd60305
Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup
13 years ago
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
4035d7370e
Fix name/filter comparison
13 years ago
d8cb685543
Interpolate keyframes when creating them
...
Probably not fully correct, but better than nothing.
13 years ago
c5b9098517
Remove an unused field from EntityList
13 years ago
546b640022
Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup
13 years ago
4bc93ecd1a
Use the skeleton name for the main animation
13 years ago
014396e80c
remove the plugins.cfg files, do not enforce CG plugin
13 years ago
4210880c06
Load the animation tracks into Ogre
13 years ago
0986cd5962
Get the animation controller target names
13 years ago
c2acf47d88
Store the list of keyframe controllers when building the bones
13 years ago
f6c837468f
Load the proper NIF skeleton
13 years ago
e760219953
Use a unique loader for each skeleton resource
13 years ago
c9b1f72d81
Use a case-insensitive compare for the part filter
13 years ago
bd74ab027a
Mirror left-sided parts
13 years ago
4af1bce659
Restore and fix some missing parts
13 years ago
d9b64b77ec
Attach skinned parts to the scene node instead of the named bone
13 years ago
5154188110
Allow specifying an alternate skeleton for mesh skinning
13 years ago
626dcd54dc
Store the skeleton name with the mesh resource loader instead of a flag
13 years ago
04b244cf9e
Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes
13 years ago
2890904fb5
Use lowercase names for the mesh and skeleton resources
...
To reduce the risk of duplicates due to different capitalizations.
13 years ago
e8ff304562
Fix the initial normal vector for vertex fixups
13 years ago
3b29d280b9
Filter out skinned shapes that don't match the bone name
13 years ago
db948969c9
Attach NPC parts to the proper bone
13 years ago
a32740cf5e
Remove an unused parameter
13 years ago
b04c3cbcac
Store the entities' root node in the EntityList
13 years ago
92546ca18d
Move the last bits of code to createEntities
13 years ago
1c544682d5
Stub handling for NiTextKeyExtraData to suppress some spam
13 years ago
496343b714
Use the proper member for the NIF type string
13 years ago
3efd2030e2
Create entities when loading NIFs for creatures
13 years ago
3dedac5cb1
Create mesh entities for objects when loading the NIF
13 years ago
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
4434fb640e
Merge branch 'master' into shadersystem
13 years ago
93f0043afc
Set the mesh's attach point as the NiTriShape's node
13 years ago
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
13 years ago
4bfed952bc
Merge remote branch 'guidoj/master'
13 years ago
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
13 years ago
65c20f128f
Build bones for non-NiNode nodes (NiTriShapes, etc)
13 years ago
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
fefbf86531
Use Ogre's matrix ops to transform normals
13 years ago
bf26f029f9
Fix some skinning-related transformations
13 years ago
df76c324a4
Handle the MRK text string marker
13 years ago
63e40d6e92
Fix world transform calculation
13 years ago
12f1785882
Use default bone names for duplicate names
13 years ago
75ce10c580
Don't load data for hidden meshes
13 years ago
ad75b47472
Build and set up a skeleton for meshes
13 years ago
b1f7fd9f7b
Pre-transform the mesh vertices when there's no skinning or skeleton
13 years ago
61f32eca77
Add methods to get a node's local and full transform as a 4x4 matrix
13 years ago
441a5c2da2
Load NiTriShapes into Ogre meshes
13 years ago
3029c221ef
Create materials when creating meshes
13 years ago
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
fb1f8082d2
fix link error with recent glibc versions
13 years ago
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
9028cfe83c
Look for the NiTriShape when the mesh resource wants to load
...
It's still not loaded yet.
13 years ago
69ed73399a
Avoid exposing the NIF mesh resource loading class
13 years ago
300730a834
Create the skeleton resource from NIFs
...
Note they are not loaded yet.
13 years ago
871b1d1c9b
silenced a warning
13 years ago
bc0a6bffcf
Remove outdated comment
13 years ago
bd68f7bd33
Remove final direct uses of Mangle::Stream
13 years ago
7734771245
Use Ogre to load ESM data instead of Mangle
13 years ago
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
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
9caa264074
Merge remote branch 'zini/master' into nif-cleanup
13 years ago
5e8bf28212
Merge branch 'master' into shadersystem
13 years ago
5345d4eeef
fix a warning
13 years ago
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
d41050fb79
merge
13 years ago
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
13 years ago
fdfe40a55a
Use a different loader object for each NIF mesh
13 years ago
9436ca4b0c
Use vectors for ShapeData properties
13 years ago
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
13 years ago
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
13 years ago
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
9995dff943
Use a key list for NiColorData
13 years ago
3f11b6b1ae
Cleanup a couple unneeded misc component references
13 years ago
86b37c6c11
Move the velocity out of the transformation object
13 years ago
b292665de9
Use key lists to store some NIF data types
13 years ago
b7b9f11333
Add generic classes to help deal with NIF keys
13 years ago
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
13 years ago
7e8c146de6
Constify some RecordListT methods
13 years ago
8e324c90dc
Constify some RecordPtrT methods
13 years ago
395a7600fd
Initialize identify transform when declaring the identity object
13 years ago
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
13 years ago
dddf1b4ee5
Rename getMatrix->getMatrix3 and getVector->getVector3
13 years ago
f11bf49a90
cmake fix; silenced some warnings
13 years ago
d30f64650a
Make the read_* methods private and remove the generic load() methods
13 years ago
930459365b
Rename getShort->getUShort and getByte->getChar
13 years ago
95b804a104
Remove NIFFile::getArrayLen
13 years ago
ca37706b34
Use Ogre types for Matrix and Vector objects
13 years ago
10072f74b4
Remove NIFFile::getType
13 years ago
98ae7168b1
Fix double-incrementing a pointer
13 years ago
b3aa453f9a
Use Ogre data streams for loading NIFs
13 years ago
0143cacd2b
Avoid returning pointers from NIFFile
13 years ago
d3a31a24ce
Use proper strings and vectors instead of slice arrays for NIF files
...
Slice arrays use pre-allocated pointers whose memory is managed externally. This is
unnecessary and ultimately detrimental since it prevents any kind of data fixup
(e.g. little endian to big endian, p[adding handling), and it also makes it difficult
to use Ogre data streams.
13 years ago
b803d0e949
converted shadow caster shader
13 years ago
81d30ff63a
temp commit
13 years ago
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
13 years ago
b5edad790d
merge
13 years ago
e517e75d09
update
13 years ago
a095572205
fixed some textures, started with sky
13 years ago
33c48b9481
update
13 years ago
8e683c2e05
vertex colors
13 years ago
9bd888d9a1
transparency
13 years ago
19ecc7f890
fix performance
13 years ago
d8d00123ea
Watch for empty children node refs when setting parents
13 years ago
832247bff2
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nif/data.hpp
13 years ago
4ea6530772
hello world.
13 years ago
c85aaafac2
more include cleanup (most removing Ogre.h)
13 years ago
291599c609
Store the parents of NIF's nodes
13 years ago
046e9686f9
Cleanup RecordPtrT
...
This moves the index resolution into a separate post method instead of always
checking when access. As a result, it reduces the size of it down to the size
of a pointer, as opposed to 2 pointers + 1 int. The appropriate methods are
added to the various node types to make sure they're resolved.
13 years ago
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
797c2c538d
fix some settings bugs
13 years ago
fbde798968
merge
13 years ago
50d81e99fb
possible fix for script execution bug
13 years ago
fe85de5ea7
Issue #181 : assignment to member variables
13 years ago
10b27e582b
Issue #181 : various fixed to member variable access
13 years ago
8b19de17b6
Iisue #181 : enable member variable access from expressions in console
13 years ago
6c5b21fa42
Issue #181 : Member variable access in expressions; error reporting fix for the previous commit
13 years ago
d1441d79e7
Issue #181 : added code generation for member variable access
13 years ago
050559d2e2
Issue #181 : added member variable access token
13 years ago
c4c8288af8
Seven digit scales
13 years ago
5028f9926d
Bullet scale solution
13 years ago
20288de685
Post merge
13 years ago
76c4aa41bb
More land and cell work
13 years ago
f675d8d039
Merge branch 'master'
13 years ago
595b0729da
Few things changed
13 years ago
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
13 years ago
fb0a52809d
Changing transformation processing
13 years ago
ce43ff8d05
Issue #181 : added member variable access opcodes
13 years ago
eb0be10e80
Merge branch 'script' into xdoty
13 years ago
6ec2a2091c
Issue #305 : Allow the use of = as a synonym for ==
13 years ago
72fca40090
Issue #181 : member variable access in interpreter context
13 years ago
4ff36a9018
Bullet loader trafos changed to match NIFLoader
13 years ago
c85c794c86
fixed some cppcheck issues
13 years ago
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
13 years ago
689cf7ce05
ConfirmationDialog
13 years ago
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
13 years ago
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
8f2c8bbea4
Merge branch 'master' into graphics
13 years ago
8ce4727424
skill tooltips
13 years ago
a284bfb4d0
Merge branch 'master' into inventoryGUI
13 years ago
6f87493df6
fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)
13 years ago
630241c8e2
load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.
13 years ago
471f6467ec
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
ddb0a91994
addition to last commit
13 years ago
d9e39bd90e
Changed order of plugins.cfg file paths.
...
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
13 years ago
b1af18e98d
Merged next
13 years ago
0c9dfcc017
Some changes
13 years ago
4ce83badc9
flickering lights
13 years ago
8231cab599
correct case for dialogue topics
13 years ago
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
a74aeace73
Can now save strings with proper encoding, byte-perfect clones up until land records
13 years ago
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
13 years ago
f16a9ce5ed
Working on making output identical to input.
13 years ago
7fce57f335
Getting started with a new branch
13 years ago
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
2a4fcf42a3
basic shadows
13 years ago
74deb5588d
Post merge
13 years ago
290d09de64
Switching creature and npc to using the same id storage as the rest of the records
13 years ago
f0c32ba7d3
Fixed saving cell ref data with wrong name
13 years ago
fc8c75ab89
Esmtool can now clone an esm file in such a way that it can read it back again afterwards.
13 years ago
0fd48c4229
Extended the esmtool a bit and prepared all records for saving.
13 years ago
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
13 years ago
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
13 years ago
044d649edd
Merge branch 'master' into water
13 years ago
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
13 years ago
e21e8c221d
Added explicit cast to char in ToUTF8::windows_XXXX tables.
...
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:
narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]
warnings.
13 years ago
Jason Hooks
Michael Mc Donnell
Marc Zinnschlag
Edmondo Tommasina
Nikolay Kasyanov
scrawl
Chris Robinson
Lukasz Gromanowski
guidoj
gugus
Alexander "Ace" Olofsson
Mark Siewert