mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
5,093 Commits
38 Branches
54 Tags
122 MiB
0.8.1
master
0.8.2
0.8.1-vr
0.8.0-vr
0.8.0
0.7.1-build-fixes
0.7.0
ffi-server-rewrite
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
tes3mp-0.8.0
tes3mp-0.8.1
tes3mp-0.8.1-vr
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'bbac63bff7'
${ noResults }
Commit Graph

829 Commits (bbac63bff7cd2f16f00c2c9cde102f1dbdbb7c02)

Author SHA1 Message Date
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