mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity
6,930 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 'daab4f55a3'
${ noResults }
Commit Graph

1203 Commits (daab4f55a3648a2adfb4f71780909e4b88752efc)

Author SHA1 Message Date
Emanuel Guevel 3adf3f5121 Revive bsatool 12 years ago
Pieter van der Kloet 9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 12 years ago
Pieter van der Kloet 7504ae675b Implemented a file dialog for the editor using launcher .ui 12 years ago
Marc Zinnschlag e7e8bd655f Merge remote-tracking branch 'scrawl/graphics' 12 years ago
greye 9133182f2f restore loading CELL records in esmtool 12 years ago
scrawl 7f8d659f3c Fix transparency sorting 12 years ago
Marc Zinnschlag d839a4c6c2 Merge remote-tracking branch 'scrawl/graphics' 12 years ago
scrawl c9f7f1b994 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 2486ec6cb9 Material fixes (vertex colors, alpha) 12 years ago
Marc Zinnschlag dc3edc6024 Merge branch 'vartype' 12 years ago
Marc Zinnschlag 1489570b09 change variant in info record to new type 12 years ago
Marc Zinnschlag 1b19ab6028 fixed gmst integers 12 years ago
Marc Zinnschlag ba4907fbaf use new Variant type for GMSTs 12 years ago
Marc Zinnschlag ce49ad54a1 some cleanup and fixing 12 years ago
Pieter van der Kloet 4c9d0563fe WIP: Implementing the .ui for the DataFilesPage 12 years ago
Chris Robinson 2f14f26b96 Use the full unique mesh name for the material instead of the NIF name 12 years ago
Marc Zinnschlag a1ac20c6f3 changed global variable records to new variant type 12 years ago
Marc Zinnschlag 65081f5520 added variant class 12 years ago
Chris Robinson 4e1e0eaf62 Merge remote-tracking branch 'zini/master' into material-fix 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 12 years ago
Chris Robinson 5e50436a94 Convert some BooleanValues to StringValues 12 years ago
scrawl 05bd94effb Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
scrawl 0f6fd80294 Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwrender/npcanimation.cpp
	files/mygui/openmw_settings_window.layout
 12 years ago
Chris Robinson 21e2c287eb Fix/workaround specular issues 
The glossiness should not be multiplied by 255, however the values set in many
of Bloodmoon's meshes would look horrible otherwise. Now we can let the
NiSpecularProperty specify when to enable specular (which is supposed to
default to on, but due to the aforementioned meshes, we default to off).
 12 years ago
Chris Robinson 7930aa82b2 Add missing depthFlags to the hash 12 years ago
Chris Robinson 8e35159ad4 Handle NiSpecularProperty 12 years ago
Chris Robinson 8c0326a49c Handle NiZBufferProperty 12 years ago
Chris Robinson 03785f3ecd Handle NiVertexColorProperty 12 years ago
Pieter van der Kloet a3c5c868ec Merge remote-tracking branch 'upstream/master' into launcherui 12 years ago
Nathan Jeffords 109dff2d29 renamed high level NIF files... 12 years ago
Chris Robinson fdfcd5bb47 Material properties are accumulative along the node tree 12 years ago
Nathan Jeffords d3c1f5e7b2 renamed low-level NIF related files and include guards to conform to naming convention 12 years ago
Nathan Jeffords 0ed2015319 refactored NIFFile parse to get better code/data seperation 12 years ago
Nathan Jeffords 6de6d9ff6e Factored a NIFStream class out of the NIFFile class. 
Split NIFFile into two parts, NIFFile which is cached and is a container
for a parsed NIF, and NIFStream which is a class specialized for parsing
NIFs. This required a semi-sweeping change to make all record classes
accept a NIFStream instead of a NIFFile as an agurment to their read
functions.
 12 years ago
Chris Robinson e3fd4b8429 Fix restoring the original texture name when the DDS check fails 12 years ago
Chris Robinson e6b547b9ba Merge remote-tracking branch 'zini/master' into transparency-fixes 12 years ago
Chris Robinson 166d529c50 Ensure the material is properly built after creating it 12 years ago
Chris Robinson 2c05a7477c Improve checks for texture resource names that include the "textures\" prefix 12 years ago
Chris Robinson ae5c0663f5 Merge remote-tracking branch 'zini/master' into nif-fixes 12 years ago
Chris Robinson eaa6813917 Workaround for meshes without any vertices 12 years ago
Chris Robinson 2786cc67f6 Fix loading empty NiTriShapeData records 12 years ago
Marc Zinnschlag 230136438b minor cleanup 12 years ago
lazydev 60f2219450 fixed zini's norices 12 years ago
Chris Robinson 1168f15361 Don't disable depth writes when blending is enabled 12 years ago
lazydev 169a1ff1ce Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag 1f24763881 Merge remote-tracking branch 'vorenon/licensefix' 12 years ago
vorenon 06e077c07c Removing all traces of "Open Morrowind". 
pvdk said it was ok to remove the header entirely
 12 years ago
scrawl 6683e43efc Removed commented code 12 years ago
scrawl f75681d89b Ignore ESX header version 12 years ago
Marc Zinnschlag 3bd228f71b fix for global variables of type short 12 years ago
lazydev b93eb84401 fix for https://bugs.openmw.org/issues/573 12 years ago
Chris Robinson a7220518b6 Merge remote-tracking branch 'zini/master' into skeleton-fixes 12 years ago
Chris Robinson 3ed0bf97a8 Share the space with the parent entity only when there's real skinned meshes 
The existence of a base skeleton doesn't mean it shares the same bone
structure. If there isn't an actual skinned entity besides the base, simply
attach it to the bone like unskinned meshes should be.
 12 years ago
Chris Robinson bfe80bb8dc Avoid duplicating skeletons due to casing issues 
Manually created resource names are apparently always case sensitive, causing
some skeletons to get loaded multiple times.
 12 years ago
Sergey Shambir 03ca7f6123 NIF: added NiStencilProperty record handling 
NiStencilProperty appears in Better Clothes plugin. If it not handled,
some parts of NPCs bodies will be not rendered.
 12 years ago
scrawl b82ee4872d Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 12 years ago
Marc Zinnschlag 53953b23f9 Merge remote-tracking branch 'chris/materials' 12 years ago
Marc Zinnschlag f175f8327f Merge remote-tracking branch 'lazydev/master' 12 years ago
scrawl 369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson b4b20622c6 Properly handle NiAlphaProperty values 12 years ago
lazydev f717fe0254 Merge branch 'master' of git://github.com/zinnschlag/openmw 12 years ago
Marc Zinnschlag 70b6b68005 Merge remote-tracking branch 'sergeyshambir/BBfix' 12 years ago
lazydev 759b2e96bf fix for https://bugs.openmw.org/issues/577 12 years ago
Marc Zinnschlag a7102c143f ESX variable type cleanup 12 years ago
Chris Robinson aefd12dfe0 Don't create meshes for collision shapes 12 years ago
Chris Robinson 9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 12 years ago
Chris Robinson 429bc23cf6 Convert the 0-1 glossiness parameter to 0-255 for shininess 12 years ago
Pieter van der Kloet 469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
Marc Zinnschlag a535d51cbf Merge branch 'brokenendfix' 12 years ago
Chris Robinson 5f2c897001 Better handle which collision shapes to load 12 years ago
Chris Robinson ff1ecb85c6 Don't bother storing the shape name for the submesh name 
The submesh name Ogre has is completely useless to us
 12 years ago
scrawl cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 12 years ago
Marc Zinnschlag 151ecaad04 workaround for garbage after an end statement 12 years ago
Chris Robinson 53eb553c57 Be a little more aggressive when looking to skip generating a skeleton 
This is needed to handle the insane number of nodes and trishapes in
in_prison_ship.nif, as Ogre has a 256-bone limit for skeletons. This is a bit
sketchy, but it works.
 12 years ago
Sergey Shambir b1381ddd69 Nif loader: workaround for missed textures in BB/BH 
Works for Better Bodies / Better Heads addons.
 12 years ago
Pieter van der Kloet 6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 12 years ago
Chris Robinson c60e858b02 Create bones for NiTriShape nodes, and attach the entities to them 
Otherwise some models don't connect properly. NiTriShapes are more guaranteed
to have unique names than their parent nodes.
 12 years ago
scrawl 2e6c63d9cd Disable specular on NIF's 12 years ago
Chris Robinson db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 12 years ago
scrawl 3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Nathan Jeffords 44b1c66c4b fixed various warnings about converting size_t to int 12 years ago
scrawl db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
greye 82595e66b2 another missing header for #576 12 years ago
Marc Zinnschlag 9b7957cf20 fixed a missing inlcude 12 years ago
Chris Robinson 6ae00be8a3 Fix nifbullet shape transformation 12 years ago
scrawl f4749f10da NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this) 12 years ago
Pieter van der Kloet 35b68a3c40 Fixed accidental profile deletion and added sorting by date 12 years ago
Pieter van der Kloet 37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 12 years ago
scrawl 32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Pieter van der Kloet 178cf2154e Made checking/unchecking work with the new datafiles model 12 years ago
Chris Robinson e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
Douglas Mencken df5919f2c5 Use `signed char' explicitly where needed. It is important because: 
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
 12 years ago
Pieter van der Kloet fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget 
Conflicts:
	apps/launcher/datafilespage.cpp
	components/fileorderlist/datafileslist.cpp
 12 years ago
Pieter van der Kloet ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/launcher/datafilespage.cpp
	apps/launcher/datafilespage.hpp
	apps/launcher/graphicspage.cpp
	components/fileorderlist/utils/filedialog.cpp
	components/fileorderlist/utils/filedialog.hpp
 12 years ago
Chris Robinson da5f11700f Warn about unhandled node types before the controllers 12 years ago
Chris Robinson 5b2ca6fa7d Don't complain about RootCollisionNode, it's handled in nifbullet 12 years ago
Michal Sciubidlo f4d60ae7b2 Files sorting (masters then plugins). 
Remove unneeded includes.
 12 years ago
Michal Sciubidlo 0df7c7e5c1 Rename mPlugins* to mFiles* 12 years ago
Michal Sciubidlo e4ed397b2d Merge plugins and masters list view in openDialog. Simplify datafilesmodel. 12 years ago
Chris Robinson f4e587c72c Always create a skeleton from a NIF when there's more than one NiNode 12 years ago
Chris Robinson f197c67e95 Fix a circular include 12 years ago
Chris Robinson 34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 12 years ago
scrawl d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Marc Zinnschlag f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 12 years ago
Mark Siewert eefbdde6de - For pull request: remove all instances of maps used to track refnumbers. 
- new file: apps/openmw/mwworld/store.cpp, had to move reference merging method out of the header file to prevent three-way recursion/unresolved forward references in custom compare operators.
 12 years ago
Marc Zinnschlag d5dd0640c7 basic gmst support 12 years ago
Chris Robinson 8b1e7b95ba Attempt to load the skeleton source if it doesn't yet exist 12 years ago
Michal Sciubidlo 347a734364 Move OpenDialog to editor and use it in startup dialogue. 
Remove debug output from DataFilesList.
 12 years ago
Michal Sciubidlo f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 12 years ago
Chris Robinson bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 12 years ago
Michal Sciubidlo 66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 12 years ago
Chris Robinson bec538bfa1 Always declare operator<< for using a TextKeyMap with Ogre::Any 12 years ago
scrawl 109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Mark Siewert 3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 12 years ago
Chris Robinson c45b4d6072 Clean up some NIF warning reports 12 years ago
Michal Sciubidlo 155cca0c9a Upload missing files. 
Fix folder name.
Keep Qt optional.
Move open dialogue from doc to tools.
Rename 'load' to 'open'.
Deleted wrong comment.
 12 years ago
Chris Robinson e6e7c69013 Fix handling of filtered entities 12 years ago
Marc Zinnschlag 85697e4628 reverted to C++03 12 years ago
scrawl 3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 12 years ago
Michal Sciubidlo 492482de7f Add "open" option in opencs. 12 years ago
Chris Robinson c6a9ea5007 Use the skeleton as defined in the NIF model 
The avoids having to duplicate models that get attached to different character
skeletons.
 12 years ago
Michal Sciubidlo ac62dd050d Rename datafilespage to datafileslist 12 years ago
Michal Sciubidlo f029a9011a Move datafilespage to shared space. 12 years ago
Chris Robinson b6354c6282 Don't share skeleton instances between bounded parts on an NPC 
However, a skeleton instance will still be shared between entities in an entity
list.
 12 years ago
Chris Robinson 0853fa335c Avoid redundant string concatenations 12 years ago
Chris Robinson 487c83e943 Rename nonaccum to animroot 12 years ago
Chris Robinson e1d3933145 Remove an unused struct 12 years ago
Chris Robinson b1ffdf855f Reset the initial state of animated nodes on the skeleton instances 
This is so the animation specifies node keyframe data based on the node's
parent. This will also be necessary for applying animations from different
skeleton sources, as they can have different binding positions (even native
.skeleton resources will need to specify animation data this way).
 12 years ago
Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
 12 years ago
Chris Robinson d836b3d0ff Don't try to create animations if there's no text keys and nonaccum node. 
Such meshes apparently use NiBSAnimationNode, a Bethesda-specific extension
which has animation-related info in its flags (values currently unknown).
 12 years ago
Chris Robinson 6905bd18ba Filter out the group name from the text keys 
It's already in the animation name, and the text keys are animation-specific
anyway.
 12 years ago
Chris Robinson 8e8900e422 Use the first bone with text keys as the nonaccum root. 12 years ago
Chris Robinson 536f8104e6 Do not create an 'all' animation. 12 years ago
Mark Siewert 713d324eeb - Minor code cleanup 12 years ago
Mark Siewert a8e02779b2 - Add support for multiple plugins trying to modify the same reference 
- Fix a small signed/unsigned warning
 12 years ago
Chris Robinson 1ce8eaf52c Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/actors.cpp
	apps/openmw/mwrender/actors.hpp
 12 years ago
Chris Robinson 94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 12 years ago
Chris Robinson e5f040a06f Improve filename pattern matching 12 years ago
scrawl 6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson b23fcb260c Use the record index for finding the NiTriShape instead of the name 12 years ago
Chris Robinson 660d73fd88 Store the NIF index in the Record object 12 years ago
scrawl e4f140841e Make OpenMW work with Ogre 1.9 12 years ago
scrawl 3f4d8c08e4 Merge branch 'nif_file' into graphics 12 years ago
scrawl 31e6d28b19 Close NIF file resource after loading it into memory 12 years ago
scrawl 52516ca4b4 Merge branch 'master' into graphics 12 years ago
Marc Zinnschlag db48017c36 Merge remote-tracking branch 'blunted2night/nif_cache_v6' 12 years ago
Michal Sciubidlo 85bdb49d1b Mix debug and release if necessary under non Windows systems. 12 years ago
Nathan Jeffords d5ebd6654d cache loaded NIF files to eliminate reloads 
Created a NIF file caching mechanism to prevent the system from
reloading a NIF during a startup and cell changes.
 12 years ago
Nathan Jeffords 0989b44b41 spread some const around NIF loading 12 years ago
Nathan Jeffords 9d4f8c6722 changed bullet_nif_loader to not modifiy NIF file 
The code in bullet_nif_loader was modifing the loaded NIF file as part of
processing. Currently this is OK since the NIF file will be thrown away
immediately, but it causes problems when trying to share loaded NIF files.
 12 years ago
scrawl 6ef85c46fd Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 12 years ago
Chris Robinson 23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 12 years ago
scrawl 455ec0996d Shaders & textures are now loaded upon loading the NIF, instead of when the object becomes visible in the camera frustum. Should improve responsiveness. 12 years ago
Marc Zinnschlag 4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
Chris Robinson a14132b5a0 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Chris Robinson c4c8295e0b Rename NIFLoader to Loader, and update some comments 12 years ago
Nathan Jeffords 44031ec3d7 fleshed out BSAArchive and DirArchive. 
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
 12 years ago
Chris Robinson 4b7cc1372f Some cleanup 12 years ago
Chris Robinson a9bcbfd8d3 Use Node::_getFullTransform instead of building the matrix manually 12 years ago
Chris Robinson 015bb0bf1f Use the calculated max time for the "all" animation 12 years ago
Chris Robinson 465fd9c8af Offset animation times to start at 0 12 years ago
Marc Zinnschlag d1e51ebf42 silenced some warnings 12 years ago
Chris Robinson 4054934f16 Store text keys for each animation 12 years ago
Chris Robinson bb98542c5a Build separate animations for each group 12 years ago
Chris Robinson e44729cd43 Make the text keys lower-case when extracting them 
I think it's safe to assume all text keys are treated in a case-insensitive
manner. So far the only known NiTextKeyExtraData records are for animation
keys, which effectively are.
 12 years ago
Nathan Jeffords 67491f6c49 reworked DirArchive to improve performance 
Replaced old file index with a simple map. The map works by storing the
file's relative path with path seperators normalized, and in lower case if
not in strict mode. Incoming searches are normalized in the same way then
the name is searched in the map. The value in the map is the original full
path to the file which is then used to created a ConstrainedDataStream. In
addition to changing the index, the commonly used Archive methods are
implemented so that they don't fall back on the default FileSystemArchive
implementations.
 12 years ago
Nathan Jeffords 43cd88a24e include members of BSAArchives in Ogres resource indices 12 years ago
Chris Robinson 14d814d1d3 Avoid creating bones for NiTriShape nodes 
The offset specified for them can be just as easilly handled by the tag point
they get connected to, and as such it's just needless extra nodes.
 12 years ago
Chris Robinson 921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Chris Robinson 7ba09ff025 Catch errors from buildBones 12 years ago
Marc Zinnschlag e31cd1c805 Merge remote-tracking branch 'corristo/master' 12 years ago
Nikolay Kasyanov 1d3f3bcce3 clang build fix 12 years ago
Marc Zinnschlag 25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 12 years ago
Emanuel Guevel 0b7d11d38d to_utf8 test: fix Utf8Encoder constructor 12 years ago
Chris Robinson 8ebf49a35b Only lower-case the model name 
The skeleton name will already be lower-case
 12 years ago
Chris Robinson 18389c7b04 Set non-bone nodes as manually controlled 12 years ago
Emanuel Guevel 63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 12 years ago
Chris Robinson e5ce55b6a4 Remove a hack 12 years ago
Marc Zinnschlag 043e6c09fe Merge remote-tracking branch 'chris/animation2' 12 years ago
Chris Robinson 58d35dbfcf Have createEntities' caller retrieve the text keys as needed 12 years ago
Chris Robinson 761914bdaa Use a separate method to build the animation 12 years ago
Jordan Milne 3ed77ca189 Include C++ header instead 12 years ago
Chris Robinson 8a086e3afb Cache the mesh names from the mesh/skeleton pairs 12 years ago
Chris Robinson 3131e8dae6 Don't get the text keys if they're not being requested 12 years ago
Chris Robinson 683ced54a0 Store and retrieve the node text keys in the bones' user object bindings 12 years ago
Chris Robinson a3d33db415 Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone 12 years ago
Jordan Milne b52904a6ea Include headers necessary for compilation under VS2010 12 years ago
Chris Robinson 1d4d67f811 Avoid underflows if the texture name doesn't include a '.' 12 years ago
Chris Robinson 3f19b13695 Merge remote-tracking branch 'zini/master' into animation2 12 years ago
Marc Zinnschlag 215b43cc7b Merge remote-tracking branch 'blunted2night/texname_fix' 12 years ago
Marc Zinnschlag b4d63814cc post merge fix 12 years ago
Nathan Jeffords fec9a59237 changed EMSLoader to use ConstrainedDataStream 
Changed the EMSLoader class to use the ConstrainedDataStream so that
future changes may benifit from its increased performance.
 12 years ago
Nathan Jeffords 278337116b increased performance of ConstrainedDataStream 
Reimplemented ConstrainedDataStream to use low-level IO calls and a
custom buffering scheme to avoid using C++ iostreams.
 12 years ago
Nathan Jeffords 5c7f1bd497 moved ConstrainedDataStream into its own file 
moved the ConstrainedDataStream into its own source file and changed
BSAFile to use it though the exposed factory function. This is in
preperation foreimplementing it based on feedback from profiling that
(at least on windows) the C++ iostreams library is quite slow.
 12 years ago
Nathan Jeffords 2181393518 change texture renaming logic to increase performance 
ResourceGroupManager::resourceExistsInAnyGroup is slow (at least on
windows) if the tested path does not exist, but is fast if it does (due
to finding it in the index). This change tries the '.dds' version of the
name first, and reverts to the original if the '.dds' version was not
found.
 12 years ago
Emanuel Guevel cc792da858 Fix to_utf8 test: add test data directory and remove unused include 12 years ago
Emanuel Guevel c947d87ab9 Add a test for to_utf8 component 12 years ago
Chris Robinson 61ad8bb3dd Use a list of mesh names instead of mesh objects 12 years ago
Chris Robinson 019893b5c6 Get rid of some unnecessary case-insensitive compares 12 years ago
Emanuel Guevel 0bdf52a071 components/to_utf8: keep only Utf8Encoder 12 years ago
Emanuel Guevel 02bf02f288 ESMReader, ESMWriter: use Utf8Encoder 12 years ago
Emanuel Guevel 9906c3051d components/translation: use Utf8Encoder 12 years ago
Emanuel Guevel 740e2b5769 components/to_utf8: add class Utf8Encoder 12 years ago
Mark Siewert d6377fb2e3 - Support deleting references from a plugin 
- Add preliminary support for loading some unique fields appearing only in savegames
- Add a few lines required for supporting respawning references. Incomplete.
 12 years ago
Marc Zinnschlag 80a0be3264 Merge remote-tracking branch 'blunted2night/msvcbuild' 12 years ago
Nathan Jeffords 08fa9dcd3e replaced std::string concatenation with std::ostringstream 
Changed a block of code that was performing a series of string
concatenations to use an ostringstream instead. This allowed the removal
of calls to std::to_string (not C++03 compliant) and fixes an compile
error in MSVC 2010 (ambigous overload when calling std::to_string).
 12 years ago
Nathan Jeffords 7228f5d696 added missing reference to <cctype> 
added missing reference to <cctype> that was causing Visual Studio 2010
to fail to compile stringops.hpp
 12 years ago
lazydev 7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
 12 years ago
lazydev cd5d95ed22 1. Dialogs in Russian version now works. 
2. Destination names it travel window are now translated
 12 years ago
eduard 69d9d22579 comparestring 12 years ago
eduard 98103e15eb conflict resolution 12 years ago
eduard c85400b809 Merge https://github.com/zinnschlag/openmw into comparestring 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/esm_store/reclists.hpp
	components/misc/stringops.hpp
 12 years ago
Marc Zinnschlag 334588bf1c Merge branch 'editor2' 12 years ago
eduard c75a5ae212 string compare and tolower 12 years ago
eduard 8545667bbd string compare and tolower 12 years ago
Mark Siewert 2cef65a056 - Remove some files that are no longer in upstream/master 12 years ago
Tom Mason a14b7e4a0f small fixes on text defines 12 years ago
Marc Zinnschlag e9ba7339f3 improved error handling 12 years ago
Marc Zinnschlag afc2e840ae renamed namespace TranslationData to Translation 12 years ago
Marc Zinnschlag 206c613b52 moved translation storage from GUI manager to engine 12 years ago
Marc Zinnschlag 2d468fec02 made previous commits naming standard compliant 12 years ago
Marc Zinnschlag 4c28f3211b Merge remote-tracking branch 'lazydev/master' 12 years ago
Mark Siewert 049b0e66e0 - Restore ability to generate references in the same cell from multiple plugins 
- Disable some code related to deleting entries in the store so that it builds again
 12 years ago
lazydev 1f71395660 renaming of translation component; removing of C++11 features 12 years ago
lazydev 74ae479780 Cell names localization fix 12 years ago
Tom Mason 8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 12 years ago
Tom Mason f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 12 years ago
Thoronador 5a7a8629b6 remove unnecessary include directive 12 years ago
Thoronador 32f051d61d Remove 'GMST fixing' for dirty GMST records 
The 'fixing' for so-called dirty GMSTs does not work properly in its
current state anyway, so it should be removed. Fixing the 'GMST fixing'
might not be possible, because whether or not a GMST is 'dirty' depends
on the language version of MW. Therefore different 'fixing' algorithms
would be required for the different MW localisations, and I do not see
a good reason why GMST values should be hard-coded in the GMST load
procedure. In my opinion, it only clutters the code.

Last but not least, I believe that it is not the task of the engine to
clean ESM files from dirty entries. That is a job for the modders, who
should only release clean ESM/ESP files in the first place. The engine
should not need to worry about whether a file is 'dirty' or not.

That is why I believe a feature for cleaning ESM/ESP files shall not be
part of the engine.
 12 years ago
Marc Zinnschlag 5cd2fe00ab initialise blank global records 12 years ago
Marc Zinnschlag 8a09e03d5c global variable editing (no undo support yet) 12 years ago
Marc Zinnschlag ef9575498f basic (non-editable) subview for global variables 12 years ago
Mark Siewert b103426cf0 - Partially reimplement deleting objects defined in a parent esX file. 
- Try to reimplement multiple esX files dropping references in the same file.
NOTE: None of these features works. Maybe the code itself does not build. Anyway, after 12 hours of hacking, I am just tired and want to get a snapshot of the code out.
 12 years ago
Mark Siewert 896ab44d1e - Add some updated files missing from last commit. 
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
 12 years ago
Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
 12 years ago
Marc Zinnschlag d684b3ae11 fixed getString function in NIF loader 12 years ago
Mark Siewert 31fb715bd7 - Add support for moving existing references by plugin files. No cell changing yet. 
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
 12 years ago
Mark Siewert 2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 12 years ago
scrawl 5f7d349126 several missing includes 12 years ago
Mark Siewert 42eefaf36f - Add support for loading references from multiple esm/esp files. Full reference ID mangling coming soon (currently, moved references are simply cloned). 
- Reference loader now (partially) supports MVRF tag.
 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
Marc Zinnschlag 4994a253da Merge branch 'bountydisease' into dialogue 12 years ago
greye c3f0dc0dfb m prefix for NpcAnimation members 12 years ago
scrawl 00a2de432a fix BulletShapeLoader namespace 12 years ago
Marc Zinnschlag 662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 12 years ago
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.
 12 years ago
Mark Siewert 64c08eada4 Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 12 years ago
greye 8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 12 years ago