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