mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 00:19:56 +00:00
Code Issues Releases Wiki Activity
5912 commits 38 branches 54 tags 122 MiB
Commit graph

1009 commits

Author SHA1 Message Date
greye
c3f0dc0dfb m prefix for NpcAnimation members 2012-11-08 23:11:43 +04:00
scrawl
00a2de432a fix BulletShapeLoader namespace 2012-11-08 18:48:07 +01:00
Marc Zinnschlag
662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 2012-11-08 14:55:31 +01:00
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.
 2012-11-06 22:13:19 +01:00
Mark Siewert
64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
5ac54d1fff alter ESM::Script for storing id as std::string 2012-11-05 17:18:01 +04:00
greye
d5628c678f add mId field to every record indexed by id 2012-11-05 17:18:01 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
f0a3ee0ef9 gmst id should be lowercase, wipe RecIdListT 2012-11-05 17:14:02 +04:00
scrawl
4ca0eb93ee fix markers used for raycasting and blocking activation 2012-10-24 17:47:03 +02:00
Marc Zinnschlag
3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 2012-10-19 20:09:45 +02:00
Marc Zinnschlag
18686614db Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2012-10-18 15:46:43 +02:00
Marc Zinnschlag
510674aa5e Merge branch 'master' into alchemy 
Conflicts:
	components/esm/loadmgef.hpp
 2012-10-18 14:37:05 +02:00
Marc Zinnschlag
5fbca239dd Issue #61: potion creation (1st part; still missing some implementations) 2012-10-18 14:02:06 +02:00
scrawl
1a2034b4dd training window 2012-10-17 18:03:02 +02:00
scrawl
84a4fd56c3 consider all files in Splash directory 2012-10-17 12:39:45 +02:00
Marc Zinnschlag
e05e683da3 Merge remote-tracking branch 'scrawl/spellcreation' 2012-10-12 17:19:30 +02:00
scrawl
8ccb0907e6 assertion -> exception; added the old effect flags again 2012-10-12 14:26:10 +02:00
Marc Zinnschlag
3fd887c030 silenced some warnings 2012-10-09 17:11:41 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
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
 2012-10-07 20:35:54 +02:00
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.
 2012-10-07 20:00:55 +02:00
scrawl
21493c2dbd added magic effect flags from Research wiki page 2012-10-01 23:33:07 +02:00
greye
31f7325e1f fix land loading 2012-10-01 15:46:32 +04:00
greye
93078bb0dc move record ids to defs.hpp 2012-10-01 00:55:27 +04:00
greye
3494e17b7c wipe record superclass 2012-10-01 00:51:54 +04:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
Chris Robinson
cd8515396a Use a multimap to store the text keys 2012-09-28 23:20:15 -07:00
Chris Robinson
9b491edbf8 Small cleanup for loading animation keyframes 2012-09-28 18:53:24 -07:00
scrawl
d163f8203c change books to RecListWithIDT 2012-09-25 21:38:34 +02:00
greye
1339787863 remove underscores from filenames in esm 2012-09-23 23:12:10 +04:00
greye
7368e7b655 rename getASCII() to getLegacyEnc() 2012-09-23 22:20:18 +04:00
greye
c54750977f remove underscores in guards 2012-09-23 22:11:08 +04:00
scrawl
bf3aad8be0 handle NCC flag 2012-09-23 18:30:13 +02:00
scrawl
872fcf3e3d sleeping restoration of health, magicka, and fatigue 2012-09-21 17:53:16 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
greye
09195894cf restore INGR and MGEF 2012-09-21 12:30:08 +04:00
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
Chris Robinson
496343b714 Use the proper member for the NIF type string 2012-07-17 16:36:43 -07:00
Chris Robinson
3efd2030e2 Create entities when loading NIFs for creatures 2012-07-17 14:11:07 -07:00
Chris Robinson
3dedac5cb1 Create mesh entities for objects when loading the NIF 2012-07-17 13:40:03 -07:00
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
 2012-07-17 10:57:15 -07:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Chris Robinson
93f0043afc Set the mesh's attach point as the NiTriShape's node 2012-07-17 10:04:21 -07:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2012-07-17 10:32:18 +02:00
Marc Zinnschlag
4bfed952bc Merge remote branch 'guidoj/master' 2012-07-17 10:17:06 +02:00
guidoj
a021165d9f Changed standard C lib includes to C++ format 2012-07-17 09:44:24 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
Chris Robinson
65c20f128f Build bones for non-NiNode nodes (NiTriShapes, etc) 2012-07-16 21:18:33 -07:00
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.
 2012-07-16 15:30:09 -07:00
Chris Robinson
fefbf86531 Use Ogre's matrix ops to transform normals 2012-07-16 14:30:23 -07:00
Chris Robinson
bf26f029f9 Fix some skinning-related transformations 2012-07-16 13:47:19 -07:00
Chris Robinson
df76c324a4 Handle the MRK text string marker 2012-07-16 13:34:56 -07:00
Chris Robinson
63e40d6e92 Fix world transform calculation 2012-07-16 13:16:11 -07:00
Chris Robinson
12f1785882 Use default bone names for duplicate names 2012-07-16 11:43:16 -07:00
Chris Robinson
75ce10c580 Don't load data for hidden meshes 2012-07-16 11:31:45 -07:00
Chris Robinson
ad75b47472 Build and set up a skeleton for meshes 2012-07-15 19:07:31 -07:00
Chris Robinson
b1f7fd9f7b Pre-transform the mesh vertices when there's no skinning or skeleton 2012-07-15 17:00:27 -07:00
Chris Robinson
61f32eca77 Add methods to get a node's local and full transform as a 4x4 matrix 2012-07-15 15:23:49 -07:00
Chris Robinson
441a5c2da2 Load NiTriShapes into Ogre meshes 2012-07-15 14:12:12 -07:00
Chris Robinson
3029c221ef Create materials when creating meshes 2012-07-15 12:59:39 -07:00
scrawl
509e9d7034 Merge branch 'master' into shadersystem 2012-07-15 21:58:45 +02:00
scrawl
fb1f8082d2 fix link error with recent glibc versions 2012-07-15 21:27:57 +02:00
Chris Robinson
b4c8375f3c Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/bsa/bsa_archive.cpp
 2012-07-15 12:04:43 -07:00
Chris Robinson
9028cfe83c Look for the NiTriShape when the mesh resource wants to load 
It's still not loaded yet.
 2012-07-15 12:02:47 -07:00
Chris Robinson
69ed73399a Avoid exposing the NIF mesh resource loading class 2012-07-15 11:40:48 -07:00
Chris Robinson
300730a834 Create the skeleton resource from NIFs 
Note they are not loaded yet.
 2012-07-15 11:13:48 -07:00
Marc Zinnschlag
871b1d1c9b silenced a warning 2012-07-15 19:20:59 +02:00
Chris Robinson
bc0a6bffcf Remove outdated comment 2012-07-15 09:03:35 -07:00
Chris Robinson
bd68f7bd33 Remove final direct uses of Mangle::Stream 2012-07-15 08:51:51 -07:00
Chris Robinson
7734771245 Use Ogre to load ESM data instead of Mangle 2012-07-15 08:31:03 -07:00
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.
 2012-07-15 07:50:24 -07:00
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.
 2012-07-15 06:45:21 -07:00
Chris Robinson
9caa264074 Merge remote branch 'zini/master' into nif-cleanup 2012-07-14 17:27:36 -07:00
scrawl
5e8bf28212 Merge branch 'master' into shadersystem 2012-07-14 18:46:11 +02:00
scrawl
5345d4eeef fix a warning 2012-07-14 18:45:03 +02:00
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.
 2012-07-14 09:20:09 -07:00
scrawl
d41050fb79 merge 2012-07-14 11:21:40 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
Chris Robinson
939d0d2fc5 Return a list of meshes and the skeleton from NIFLoader::load 2012-07-13 20:01:15 -07:00
Chris Robinson
fdfe40a55a Use a different loader object for each NIF mesh 2012-07-13 13:41:08 -07:00
Chris Robinson
9436ca4b0c Use vectors for ShapeData properties 2012-07-13 09:32:58 -07:00
Marc Zinnschlag
182017b8e9 Issue #314: Moved ingredients and potions to a different type of record list 2012-07-13 13:08:48 +02:00
Chris Robinson
ecdd4ee23f Load NiMorphData and NiKeyframeData using proper key lists 2012-07-12 20:56:47 -07:00
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.
 2012-07-12 20:12:18 -07:00
Chris Robinson
9995dff943 Use a key list for NiColorData 2012-07-12 14:33:50 -07:00
Chris Robinson
3f11b6b1ae Cleanup a couple unneeded misc component references 2012-07-12 12:01:11 -07:00
Chris Robinson
86b37c6c11 Move the velocity out of the transformation object 2012-07-12 11:21:52 -07:00
Chris Robinson
b292665de9 Use key lists to store some NIF data types 2012-07-12 08:00:26 -07:00
Chris Robinson
b7b9f11333 Add generic classes to help deal with NIF keys 2012-07-12 06:47:38 -07:00
Chris Robinson
645b507ba0 Return a reference to the RecordPtr from operator[] for consistency 
RecordListT is supposed to be a list of RecordPtrT objects.
 2012-07-12 05:37:56 -07:00
Chris Robinson
7e8c146de6 Constify some RecordListT methods 2012-07-11 06:39:03 -07:00
Chris Robinson
8e324c90dc Constify some RecordPtrT methods 2012-07-11 06:37:17 -07:00
Chris Robinson
395a7600fd Initialize identify transform when declaring the identity object 2012-07-10 23:13:03 -07:00
Chris Robinson
348b5fa207 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/nifbullet/bullet_nif_loader.cpp
 2012-07-10 06:16:16 -07:00
Chris Robinson
dddf1b4ee5 Rename getMatrix->getMatrix3 and getVector->getVector3 2012-07-10 04:45:14 -07:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
Chris Robinson
d30f64650a Make the read_* methods private and remove the generic load() methods 2012-07-10 04:21:47 -07:00
Chris Robinson
930459365b Rename getShort->getUShort and getByte->getChar 2012-07-10 03:52:01 -07:00
Chris Robinson
95b804a104 Remove NIFFile::getArrayLen 2012-07-10 03:02:37 -07:00
Chris Robinson
ca37706b34 Use Ogre types for Matrix and Vector objects 2012-07-10 02:38:35 -07:00
Chris Robinson
10072f74b4 Remove NIFFile::getType 2012-07-10 00:27:13 -07:00
Chris Robinson
98ae7168b1 Fix double-incrementing a pointer 2012-07-10 00:24:18 -07:00
Chris Robinson
b3aa453f9a Use Ogre data streams for loading NIFs 2012-07-09 22:02:12 -07:00
Chris Robinson
0143cacd2b Avoid returning pointers from NIFFile 2012-07-09 21:35:36 -07:00
Chris Robinson
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.
 2012-07-09 21:08:23 -07:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
gugus
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
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
scrawl
e517e75d09 update 2012-07-07 01:25:14 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
8e683c2e05 vertex colors 2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1 transparency 2012-07-05 00:39:25 +02:00
scrawl
19ecc7f890 fix performance 2012-07-04 17:28:22 +02:00
Chris Robinson
d8d00123ea Watch for empty children node refs when setting parents 2012-07-03 18:37:04 -07:00
Chris Robinson
832247bff2 Merge remote branch 'zini/master' into nif-cleanup 
Conflicts:
	components/nif/data.hpp
 2012-07-03 15:29:18 -07:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Chris Robinson
291599c609 Store the parents of NIF's nodes 2012-07-02 22:49:44 -07:00
Chris Robinson
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.
 2012-07-02 21:41:21 -07:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
scrawl
797c2c538d fix some settings bugs 2012-06-23 12:25:28 +02:00
Jason Hooks
fbde798968 merge 2012-06-21 19:02:20 -04:00
Marc Zinnschlag
50d81e99fb possible fix for script execution bug 2012-06-19 14:55:22 +02:00
Marc Zinnschlag
fe85de5ea7 Issue #181: assignment to member variables 2012-06-16 14:29:55 +02:00
Marc Zinnschlag
10b27e582b Issue #181: various fixed to member variable access 2012-06-16 13:51:13 +02:00
Marc Zinnschlag
8b19de17b6 Iisue #181: enable member variable access from expressions in console 2012-06-16 13:21:01 +02:00
Marc Zinnschlag
6c5b21fa42 Issue #181: Member variable access in expressions; error reporting fix for the previous commit 2012-06-16 13:06:23 +02:00
Marc Zinnschlag
d1441d79e7 Issue #181: added code generation for member variable access 2012-06-16 10:49:34 +02:00
Marc Zinnschlag
050559d2e2 Issue #181: added member variable access token 2012-06-16 10:31:49 +02:00
Jason Hooks
c4c8288af8 Seven digit scales 2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d Bullet scale solution 2012-06-12 18:09:58 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Alexander "Ace" Olofsson
76c4aa41bb More land and cell work 2012-06-11 20:02:03 +02:00
Alexander "Ace" Olofsson
f675d8d039 Merge branch 'master' 2012-06-11 19:09:10 +02:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
Mark Siewert
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.
 2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d Changing transformation processing 2012-06-09 15:19:15 -04:00
Marc Zinnschlag
ce43ff8d05 Issue #181: added member variable access opcodes 2012-06-07 13:56:49 +02:00
Marc Zinnschlag
eb0be10e80 Merge branch 'script' into xdoty 2012-06-07 13:00:01 +02:00
Marc Zinnschlag
6ec2a2091c Issue #305: Allow the use of = as a synonym for == 2012-06-07 12:16:03 +02:00
Marc Zinnschlag
72fca40090 Issue #181: member variable access in interpreter context 2012-06-07 11:59:45 +02:00
Jason Hooks
4ff36a9018 Bullet loader trafos changed to match NIFLoader 2012-06-06 16:29:44 -04:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
a284bfb4d0 Merge branch 'master' into inventoryGUI 2012-05-19 15:07:37 +02:00
gugus
6f87493df6 fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much) 2012-05-17 15:46:38 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-05-13 16:18:22 +02:00
scrawl
ddb0a91994 addition to last commit 2012-05-13 12:19:49 +02:00
Lukasz Gromanowski
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.
 2012-05-11 21:32:38 +02:00
Alexander "Ace" Olofsson
b1af18e98d Merged next 2012-04-29 09:28:07 +02:00
Alexander "Ace" Olofsson
0c9dfcc017 Some changes 2012-04-29 09:26:03 +02:00
scrawl
4ce83badc9 flickering lights 2012-04-28 20:42:53 +02:00
scrawl
8231cab599 correct case for dialogue topics 2012-04-17 23:47:50 +02:00
Marc Zinnschlag
afa859a6a6 Merge remote branch 'jhooks/clothingarmor' 
Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
 2012-04-15 22:06:05 +02:00
Alexander "Ace" Olofsson
a74aeace73 Can now save strings with proper encoding, byte-perfect clones up until land records 2012-04-14 00:14:04 +02:00
scrawl
95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 2012-04-12 16:33:36 +02:00
Alexander "Ace" Olofsson
f16a9ce5ed Working on making output identical to input. 2012-04-12 14:00:58 +02:00
Jason Hooks
7fce57f335 Getting started with a new branch 2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
Jason Hooks
74deb5588d Post merge 2012-04-08 20:41:49 -04:00
Alexander "Ace" Olofsson
290d09de64 Switching creature and npc to using the same id storage as the rest of the records 2012-04-08 18:32:40 +02:00
Alexander "Ace" Olofsson
f0c32ba7d3 Fixed saving cell ref data with wrong name 2012-04-08 18:01:54 +02:00
Alexander "Ace" Olofsson
fc8c75ab89 Esmtool can now clone an esm file in such a way that it can read it back again afterwards. 2012-04-08 17:04:52 +02:00
Alexander "Ace" Olofsson
0fd48c4229 Extended the esmtool a bit and prepared all records for saving. 2012-04-08 11:51:52 +02:00
scrawl
cdea19206c Revert "more accurate fog, TODO: apply this to the terrain" 
This reverts commit 96c37d3e7c.
 2012-04-07 22:47:39 +02:00
scrawl
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
 2012-04-07 22:37:15 +02:00
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c more accurate fog, TODO: apply this to the terrain 2012-04-07 16:55:32 +02:00
Lukasz Gromanowski
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.
 2012-04-07 13:08:25 +02:00
Alexander "Ace" Olofsson
47013799ea Fleshing out the esm writer a bit 2012-04-06 22:25:33 +02:00
Alexander "Ace" Olofsson
b81ac363fc Write names with a small sanity check 2012-04-06 21:28:58 +02:00
Alexander "Ace" Olofsson
7c1e417f9a Niceify-ing it (Yes, that's a word) 2012-04-06 21:14:52 +02:00
Alexander "Ace" Olofsson
ba602929ef Adding basic save functions to all record types. 2012-04-06 21:04:30 +02:00
scrawl
622fb568cf removed MRT setting and figure it out automatically 2012-04-05 19:27:54 +02:00
scrawl
88c50c5171 Merge branch 'master' into water 2012-04-05 15:38:46 +02:00
Marc Zinnschlag
01500e979a another fix for optional arguments 2012-04-05 15:00:49 +02:00
Marc Zinnschlag
6fd3d5c776 Merge remote branch 'lgro/master' 2012-04-04 23:19:30 +02:00
Lukasz Gromanowski
ea8e5cb6f8 Issue #225: Land struct is not copyable. 
Disabled copy constructor and assignment operator in Land structure.
 2012-04-04 21:39:21 +02:00
Lukasz Gromanowski
cd2789b15a Revert "Issue #225: Correction to commit ae98904." 
This reverts commit 0e5c90d3e7.
 2012-04-04 21:05:19 +02:00
scrawl
006970fd79 add MRT code to shaders 2012-04-04 19:53:41 +02:00
Jason Hooks
57299571d5 Preparing for clothes/armor 2012-04-02 22:08:46 -04:00
Lukasz Gromanowski
0e5c90d3e7 Issue #225: Correction to commit ae98904. 
Changed pointer to LandData struct to simple member variable.
 2012-04-02 23:50:53 +02:00
scrawl
2b4b941192 Merge branch 'master' into gamesettings 2012-04-02 15:21:10 +02:00
scrawl
5accca385c fix crash on exit when no user settings exist 2012-04-02 13:47:25 +02:00
Marc Zinnschlag
6022d3ab13 Merge remote branch 'corristo/pgrd-rendering' 
reduced cout spam.

Conflicts:
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	components/bsa/bsa_archive.cpp
	libs/openengine/bullet/physic.hpp
 2012-04-02 12:04:47 +02:00
Lukasz Gromanowski
ae989040e5 Issue #225: Fix for memleak when loading terrain. 2012-04-01 21:29:49 +02:00
scrawl
c2a82c3d89 Merge branch 'master' into gamesettings 2012-04-01 20:06:18 +02:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
Alexander "Ace" Olofsson
54ce95cfaf Make sure it doesn't find the wrong file 2012-04-01 17:25:03 +02:00