teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
4741 commits 34 branches 0 tags 66 MiB
Commit graph

770 commits

Author SHA1 Message Date
greye
2d5ddd104b Land::loadData rework 2012-09-21 12:12:16 +04:00
greye
bd94f257bf a bit formatting 2012-09-21 09:36:18 +04:00
greye
e69880f77e almost perfect byte copies, has redundant data 2012-09-20 20:33:30 +04:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
e8bba2b833 disabled loading of land normals again, didn't need them after all 2012-09-20 14:06:30 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
greye
597b88e95a update saving AI packages 2012-09-18 19:30:19 +04:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00
scrawl
b5ddc8d4fb Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision. 2012-09-13 13:10:02 +02:00
Marc Zinnschlag
677158c477 added typesafe access functions for GMST values 2012-09-13 10:41:55 +02:00
Marc Zinnschlag
f2ab4c929d Issue #356: added hardcoded magic effect flags *grumble* 2012-09-13 09:26:17 +02:00
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. 2012-09-12 12:41:12 +02:00
Jason Hooks
c5b25ef70b Very basic actor physics (no set scale/rotate functions) 2012-09-10 20:29:24 -04:00
Alexander "Ace" Olofsson
7934d8abd9 Fixed an issue with some paths not concatenating properly. 2012-09-09 16:28:02 +02:00
Alexander "Ace" Olofsson
bc6d87ba32 Oops, that would've broken getUserPath() on Linux... 2012-09-08 23:04:53 +02:00
Alexander "Ace" Olofsson
cd3e780614 Removing the unnecessary local variables 2012-09-08 20:34:43 +02:00
Alexander "Ace" Olofsson
97f1be2b05 Testing a third way to solve the path issue 2012-09-08 18:47:31 +02:00
Alexander "Ace" Olofsson
6e317f00eb Fix the problem in a different way 2012-09-08 15:57:12 +02:00
Alexander "Ace" Olofsson
b6fcd337df Modified the cache path to work on windows 2012-09-08 15:08:24 +02:00
Marc Zinnschlag
e3d893b001 Merge remote-tracking branch 'jhooks/animationsmooth' 2012-09-06 09:09:46 +02:00
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
 2012-09-05 23:39:58 +02:00
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
scrawl
950bf66334 throw an exception if default value for a setting is not found 2012-09-02 11:39:54 +02:00
scrawl
4f1bcb749f turned off redundant edge list building 2012-09-02 10:09:41 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
greye
a90547bbbe code formatting 2012-08-29 21:35:06 +04:00
greye
75fa0288a3 fix creatures has spells, creatures ai data 2012-08-29 14:35:43 +04:00
greye
02d7aa4135 npc ai packages 2012-08-29 14:35:43 +04:00
Marc Zinnschlag
34c30b132c Issue #378: workaround for bad ingredient records in Morrowind.esm 2012-08-28 10:12:22 +02:00
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.
 2012-08-27 10:55:39 -04:00
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.
 2012-08-22 16:42:53 -04:00
Jason Hooks
5202b11235 just moving a comment 2012-08-18 15:31:54 -04:00
Jason Hooks
4a219404fc Super smooth animations; 100 PERCENT COMPLETE 2012-08-18 15:21:43 -04:00
Jason Hooks
f21df64808 changing a few things around 2012-08-18 14:48:18 -04:00
Marc Zinnschlag
98219323b7 Merge remote-tracking branch 'mmd/vsdebugfixes' 2012-08-18 12:56:59 +02:00
Jason Hooks
cc776810e2 smoother animations 2012-08-17 17:10:21 -04:00
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.
 2012-08-17 10:47:20 -04:00
Marc Zinnschlag
1da56e2832 removed some unused variables 2012-08-17 15:37:14 +02:00
Marc Zinnschlag
2a11a28e81 Revert "Use debug dlls when debugging in vs2010" 
This reverts commit ebe131b326.
 2012-08-17 10:05:29 +02:00
Jason Hooks
d14cc5a435 update master 2012-08-16 18:20:26 -04:00
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.
 2012-08-16 11:18:16 -04:00
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04:00
Jason Hooks
38c2c5d480 Creatures now use object physics 2012-08-09 18:09:11 -04:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
Marc Zinnschlag
7cc2de3e21 boost filesystem compatibility fix 2012-08-08 08:52:08 +02:00
Marc Zinnschlag
dbcd4a8b5b compatibility fix 2012-08-05 00:06:19 +02:00
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
 2012-08-04 23:14:53 +02:00
Edmondo Tommasina
c08e098d7f esm_reader.cpp: fix std::runtime_error compile error 2012-08-04 23:02:34 +02:00
Edmondo Tommasina
32b167ce2b Revert "nif_file.hpp: include type definitions to fix build" 
This reverts commit b0b3ebe123.
 2012-08-04 23:02:27 +02:00
Edmondo Tommasina
a63fd77ccc Revert "esm_reader.hpp: fix std::runtime_error compile error" 
This reverts commit 0f3cb5667f.
 2012-08-04 22:58:26 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
Edmondo Tommasina
b0b3ebe123 nif_file.hpp: include type definitions to fix build 2012-08-03 22:42:59 +02:00
Edmondo Tommasina
0f3cb5667f esm_reader.hpp: fix std::runtime_error compile error 2012-08-03 22:41:51 +02:00
Michael Mc Donnell
7f802a22b5 Compare with stream position instead of int. 
Fixes compilation of Debug build on Windows.
 2012-08-01 17:52:20 -04:00
Marc Zinnschlag
f8e54b401b fixed linkage problem 2012-08-01 09:09:00 +02:00
Nikolay Kasyanov
32d2326b4d Update components/files/ogreplugin.hpp 
removed #error directive
 2012-07-31 18:15:09 +04:00
Nikolay Kasyanov
03cccee0e4 bug #348: workaround for boost older than 1.44 2012-07-31 10:51:34 +04:00
Nikolay Kasyanov
defab0e4b5 Merge remote-tracking branch 'upstream/master' into osx_fix 
Conflicts:
	CMakeLists.txt
 2012-07-31 01:06:18 +04:00
Nikolay Kasyanov
b05dfeae70 bug #348: cleanup 
moved files to appropriate component, moved function to namespace,
added docs
 2012-07-31 01:01:00 +04:00
Nikolay Kasyanov
a84d8e83cd add const specifier to first argument, also made it reference 2012-07-28 02:39:49 +04:00
Nikolay Kasyanov
b0b2064232 always add debug suffix in plugin loader 
also removed cout spam
 2012-07-28 02:31:30 +04:00
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
 2012-07-28 01:55:37 +04:00
scrawl
281e15f58e consider all material properties for nif material sharing, instead of just the texture 2012-07-26 23:40:55 +02:00
Chris Robinson
4f46c8a8db Use a functor for the mismatch compare function 2012-07-24 14:59:25 -07:00
Chris Robinson
36be1536d9 Return text keys from NIFs when creating entities 2012-07-23 17:20:47 -07:00
scrawl
1fef086088 Revert "Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup" 
This reverts commit 546b640022, reversing
changes made to fcaa8aae06.
 2012-07-23 15:36:12 +02:00
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
 2012-07-23 15:35:31 +02:00
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
 2012-07-23 14:12:21 +02:00
scrawl
1dbfd60305 Merge branch 'nif-cleanup' of https://github.com/ChrisKCat/openmw into nif-cleanup 2012-07-23 13:48:12 +02:00
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>
 2012-07-22 14:52:55 +03:00
Chris Robinson
4035d7370e Fix name/filter comparison 2012-07-21 22:04:05 -07:00
Chris Robinson
d8cb685543 Interpolate keyframes when creating them 
Probably not fully correct, but better than nothing.
 2012-07-21 18:03:01 -07:00
Chris Robinson
c5b9098517 Remove an unused field from EntityList 2012-07-21 17:09:16 -07:00
scrawl
546b640022 Merge remote-tracking branch 'mark76/multiple_esm_esp' into nif-cleanup 2012-07-21 23:50:56 +02:00
Chris Robinson
4bc93ecd1a Use the skeleton name for the main animation 2012-07-20 11:09:05 -07:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
Chris Robinson
4210880c06 Load the animation tracks into Ogre 2012-07-19 21:46:16 -07:00
Chris Robinson
0986cd5962 Get the animation controller target names 2012-07-19 20:48:12 -07:00
Chris Robinson
c2acf47d88 Store the list of keyframe controllers when building the bones 2012-07-19 20:30:10 -07:00
Chris Robinson
f6c837468f Load the proper NIF skeleton 2012-07-19 11:44:08 -07:00
Chris Robinson
e760219953 Use a unique loader for each skeleton resource 2012-07-19 11:36:36 -07:00
Chris Robinson
c9b1f72d81 Use a case-insensitive compare for the part filter 2012-07-18 22:31:07 -07:00
Chris Robinson
bd74ab027a Mirror left-sided parts 2012-07-18 21:21:49 -07:00
Chris Robinson
4af1bce659 Restore and fix some missing parts 2012-07-18 20:14:23 -07:00
Chris Robinson
d9b64b77ec Attach skinned parts to the scene node instead of the named bone 2012-07-18 18:38:55 -07:00
Chris Robinson
5154188110 Allow specifying an alternate skeleton for mesh skinning 2012-07-18 18:29:25 -07:00
Chris Robinson
626dcd54dc Store the skeleton name with the mesh resource loader instead of a flag 2012-07-18 17:26:51 -07:00
Chris Robinson
04b244cf9e Use the mesh's skeleton to transform shapes into "bind pose" instead of the NIF nodes 2012-07-18 17:18:21 -07:00
Chris Robinson
2890904fb5 Use lowercase names for the mesh and skeleton resources 
To reduce the risk of duplicates due to different capitalizations.
 2012-07-18 15:27:33 -07:00
Chris Robinson
e8ff304562 Fix the initial normal vector for vertex fixups 2012-07-18 12:53:45 -07:00
Chris Robinson
3b29d280b9 Filter out skinned shapes that don't match the bone name 2012-07-18 12:47:16 -07:00
Chris Robinson
db948969c9 Attach NPC parts to the proper bone 2012-07-18 11:14:13 -07:00
Chris Robinson
a32740cf5e Remove an unused parameter 2012-07-17 22:41:26 -07:00
Chris Robinson
b04c3cbcac Store the entities' root node in the EntityList 2012-07-17 21:42:47 -07:00
Chris Robinson
92546ca18d Move the last bits of code to createEntities 2012-07-17 20:23:09 -07:00
Chris Robinson
1c544682d5 Stub handling for NiTextKeyExtraData to suppress some spam 2012-07-17 16:45:01 -07:00