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

1158 commits

Author SHA1 Message Date
vorenon
06e077c07c Removing all traces of "Open Morrowind". 
pvdk said it was ok to remove the header entirely
 2013-02-28 19:36:10 +01:00
scrawl
6683e43efc Removed commented code 2013-02-28 12:35:18 +01:00
scrawl
f75681d89b Ignore ESX header version 2013-02-28 12:12:51 +01:00
Marc Zinnschlag
3bd228f71b fix for global variables of type short 2013-02-28 11:50:29 +01:00
lazydev
b93eb84401 fix for https://bugs.openmw.org/issues/573 2013-02-28 02:43:03 +04:00
Chris Robinson
a7220518b6 Merge remote-tracking branch 'zini/master' into skeleton-fixes 2013-02-27 13:22:33 -08:00
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.
 2013-02-27 13:16:27 -08:00
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.
 2013-02-27 12:33:36 -08:00
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.
 2013-02-27 23:45:09 +04:00
scrawl
b82ee4872d Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-02-27 12:25:34 +01:00
Marc Zinnschlag
53953b23f9 Merge remote-tracking branch 'chris/materials' 2013-02-27 10:04:42 +01:00
Marc Zinnschlag
f175f8327f Merge remote-tracking branch 'lazydev/master' 2013-02-27 10:01:50 +01:00
scrawl
369f881170 Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-27 09:25:44 +01:00
Chris Robinson
b4b20622c6 Properly handle NiAlphaProperty values 2013-02-26 15:24:20 -08:00
lazydev
f717fe0254 Merge branch 'master' of git://github.com/zinnschlag/openmw 2013-02-27 01:47:30 +04:00
Marc Zinnschlag
70b6b68005 Merge remote-tracking branch 'sergeyshambir/BBfix' 2013-02-26 22:37:45 +01:00
lazydev
759b2e96bf fix for https://bugs.openmw.org/issues/577 2013-02-27 01:37:40 +04:00
Marc Zinnschlag
a7102c143f ESX variable type cleanup 2013-02-26 14:37:11 +01:00
Chris Robinson
aefd12dfe0 Don't create meshes for collision shapes 2013-02-25 15:44:59 -08:00
Chris Robinson
9679daa6a4 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 13:10:21 -08:00
Chris Robinson
429bc23cf6 Convert the 0-1 glossiness parameter to 0-255 for shininess 2013-02-25 13:08:40 -08:00
Pieter van der Kloet
469d608f51 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 21:26:54 +01:00
Marc Zinnschlag
a535d51cbf Merge branch 'brokenendfix' 2013-02-25 19:52:22 +01:00
Chris Robinson
5f2c897001 Better handle which collision shapes to load 2013-02-25 10:29:48 -08:00
Chris Robinson
ff1ecb85c6 Don't bother storing the shape name for the submesh name 
The submesh name Ogre has is completely useless to us
 2013-02-25 08:22:57 -08:00
scrawl
cacdb33b42 Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/sky.cpp
 2013-02-25 15:12:03 +01:00
Marc Zinnschlag
151ecaad04 workaround for garbage after an end statement 2013-02-25 10:32:38 +01:00
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.
 2013-02-24 18:12:15 -08:00
Sergey Shambir
b1381ddd69 Nif loader: workaround for missed textures in BB/BH 
Works for Better Bodies / Better Heads addons.
 2013-02-25 04:12:41 +04:00
Pieter van der Kloet
6eaaf20c94 Merge remote-tracking branch 'upstream/master' into launchernext 2013-02-25 00:56:23 +01:00
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.
 2013-02-24 12:42:32 -08:00
scrawl
2e6c63d9cd Disable specular on NIF's 2013-02-24 17:18:22 +01:00
Chris Robinson
db9a3aeddf Merge remote-tracking branch 'zini/master' into animation2 2013-02-24 03:32:35 -08:00
scrawl
3135482cee Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-24 10:06:04 +01:00
Nathan Jeffords
44b1c66c4b fixed various warnings about converting size_t to int 2013-02-23 10:23:38 -08:00
scrawl
db9e49968e Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-02-23 04:13:51 +01:00
Chris Robinson
3c0b29de45 Merge remote-tracking branch 'zini/master' into animation2 2013-02-22 01:34:22 -08:00
greye
82595e66b2 another missing header for #576 2013-02-21 22:47:18 +04:00
Marc Zinnschlag
9b7957cf20 fixed a missing inlcude 2013-02-21 19:27:07 +01:00
Chris Robinson
6ae00be8a3 Fix nifbullet shape transformation 2013-02-19 22:28:15 -08:00
scrawl
f4749f10da NIF bullet loader fix for incorrect collision shapes (credit goes to Chris, he asked me to push this) 2013-02-20 05:35:52 +01:00
Pieter van der Kloet
35b68a3c40 Fixed accidental profile deletion and added sorting by date 2013-02-19 15:58:01 +01:00
Pieter van der Kloet
37fe31e858 Merge remote-tracking branch 'upstream/next' into settings_selwidget 2013-02-19 01:12:47 +01:00
scrawl
32b837ebd4 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-19 00:15:54 +01:00
Pieter van der Kloet
178cf2154e Made checking/unchecking work with the new datafiles model 2013-02-18 17:59:08 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
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
 2013-02-15 20:28:14 +01:00
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
 2013-02-15 15:38:30 +01:00
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
 2013-02-15 15:21:14 +01:00
Chris Robinson
da5f11700f Warn about unhandled node types before the controllers 2013-02-13 00:45:00 -08:00
Chris Robinson
5b2ca6fa7d Don't complain about RootCollisionNode, it's handled in nifbullet 2013-02-13 00:43:29 -08:00
Michal Sciubidlo
f4d60ae7b2 Files sorting (masters then plugins). 
Remove unneeded includes.
 2013-02-10 19:59:25 +01:00
Michal Sciubidlo
0df7c7e5c1 Rename mPlugins* to mFiles* 2013-02-10 14:08:54 +01:00
Michal Sciubidlo
e4ed397b2d Merge plugins and masters list view in openDialog. Simplify datafilesmodel. 2013-02-10 14:02:06 +01:00
Chris Robinson
f4e587c72c Always create a skeleton from a NIF when there's more than one NiNode 2013-02-09 17:48:23 -08:00
Chris Robinson
f197c67e95 Fix a circular include 2013-02-09 12:46:20 -08:00
Chris Robinson
34ddf69a31 Merge remote-tracking branch 'zini/next' into animation2 2013-02-09 09:46:57 -08:00
scrawl
d47090b312 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2013-02-09 16:40:10 +01:00
Marc Zinnschlag
f19fbaa293 Merge remote-tracking branch 'mark76/multiple_esm_esp' into next 2013-02-09 15:30:29 +01:00
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.
 2013-02-09 13:00:57 +01:00
Marc Zinnschlag
d5dd0640c7 basic gmst support 2013-02-08 09:58:19 +01:00
Chris Robinson
8b1e7b95ba Attempt to load the skeleton source if it doesn't yet exist 2013-02-05 17:55:12 -08:00
Michal Sciubidlo
347a734364 Move OpenDialog to editor and use it in startup dialogue. 
Remove debug output from DataFilesList.
 2013-02-05 22:06:36 +01:00
Michal Sciubidlo
f7e5ea24f4 Merge branch 'startup' into cs_load. 
Fix include in textinputdialog.cpp.
 2013-02-05 21:23:49 +01:00
Chris Robinson
bd4fdf47a3 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/sky.cpp
 2013-02-05 02:27:57 -08:00
Michal Sciubidlo
66ec4ca7d9 Split launcher specific code from DataFilesList back to DataFilesPage. 2013-02-04 22:14:14 +01:00
Chris Robinson
bec538bfa1 Always declare operator<< for using a TextKeyMap with Ogre::Any 2013-02-04 09:19:59 -08:00
scrawl
109d0a942f Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-03 19:02:57 +01:00
Mark Siewert
3e43db5f76 Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2013-02-03 16:14:41 +01:00
Chris Robinson
c45b4d6072 Clean up some NIF warning reports 2013-02-02 22:27:08 -08:00
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.
 2013-02-02 18:36:01 +01:00
Chris Robinson
e6e7c69013 Fix handling of filtered entities 2013-02-02 05:26:52 -08:00
Marc Zinnschlag
85697e4628 reverted to C++03 2013-02-02 13:24:28 +01:00
scrawl
3ec703e6af Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics 2013-02-01 16:25:54 +01:00
Michal Sciubidlo
492482de7f Add "open" option in opencs. 2013-02-01 00:42:03 +01:00
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.
 2013-01-30 22:37:39 -08:00
Michal Sciubidlo
ac62dd050d Rename datafilespage to datafileslist 2013-01-30 21:08:27 +01:00
Michal Sciubidlo
f029a9011a Move datafilespage to shared space. 2013-01-30 20:21:03 +01:00
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.
 2013-01-30 09:29:16 -08:00
Chris Robinson
0853fa335c Avoid redundant string concatenations 2013-01-29 01:36:17 -08:00
Chris Robinson
487c83e943 Rename nonaccum to animroot 2013-01-28 22:09:41 -08:00
Chris Robinson
e1d3933145 Remove an unused struct 2013-01-28 01:27:12 -08:00
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).
 2013-01-26 04:48:53 -08:00
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.
 2013-01-25 18:22:01 +01:00
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).
 2013-01-22 00:24:57 -08:00
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.
 2013-01-21 02:59:12 -08:00
Chris Robinson
8e8900e422 Use the first bone with text keys as the nonaccum root. 2013-01-20 22:51:39 -08:00
Chris Robinson
536f8104e6 Do not create an 'all' animation. 2013-01-20 17:24:43 -08:00
Mark Siewert
713d324eeb - Minor code cleanup 2013-01-20 19:07:33 +01:00
Mark Siewert
a8e02779b2 - Add support for multiple plugins trying to modify the same reference 
- Fix a small signed/unsigned warning
 2013-01-19 23:33:18 +01:00
Chris Robinson
1ce8eaf52c Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	apps/openmw/mwrender/actors.cpp
	apps/openmw/mwrender/actors.hpp
 2013-01-16 07:36:56 -08:00
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
Chris Robinson
e5f040a06f Improve filename pattern matching 2013-01-15 14:10:52 -08:00
scrawl
6c6ce4a05c Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-14 00:10:57 +01:00
Chris Robinson
b23fcb260c Use the record index for finding the NiTriShape instead of the name 2013-01-13 08:00:04 -08:00
Chris Robinson
660d73fd88 Store the NIF index in the Record object 2013-01-13 06:56:58 -08:00
scrawl
e4f140841e Make OpenMW work with Ogre 1.9 2013-01-12 08:23:15 +01:00
scrawl
3f4d8c08e4 Merge branch 'nif_file' into graphics 2013-01-12 06:41:13 +01:00
scrawl
31e6d28b19 Close NIF file resource after loading it into memory 2013-01-12 06:37:43 +01:00
scrawl
52516ca4b4 Merge branch 'master' into graphics 2013-01-12 01:22:01 +01:00
Marc Zinnschlag
db48017c36 Merge remote-tracking branch 'blunted2night/nif_cache_v6' 2013-01-11 11:07:45 +01:00
Michal Sciubidlo
85bdb49d1b Mix debug and release if necessary under non Windows systems. 2013-01-11 09:10:48 +01:00
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.
 2013-01-10 21:47:02 -08:00
Nathan Jeffords
0989b44b41 spread some const around NIF loading 2013-01-10 21:32:47 -08:00
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.
 2013-01-10 21:32:32 -08:00
scrawl
6ef85c46fd Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics 2013-01-10 19:35:40 +01:00
Chris Robinson
23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-09 20:52:12 -08:00
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. 2013-01-09 22:27:58 +01:00
Marc Zinnschlag
4defb1a476 Merge remote-tracking branch 'trombonecot/lowerstring' 
Conflicts:
	apps/openmw/mwgui/loadingscreen.cpp
 2013-01-09 22:13:59 +01:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Chris Robinson
a14132b5a0 Merge remote-tracking branch 'zini/master' into animation2 2013-01-09 11:12:26 -08:00
Chris Robinson
c4c8295e0b Rename NIFLoader to Loader, and update some comments 2013-01-09 09:10:59 -08:00
Nathan Jeffords
44031ec3d7 fleshed out BSAArchive and DirArchive. 
Implemented both lists & finds, with pattern matching.

Conflicts:
	components/bsa/bsa_archive.cpp
 2013-01-09 08:53:27 -08:00
Chris Robinson
4b7cc1372f Some cleanup 2013-01-09 06:32:31 -08:00
Chris Robinson
a9bcbfd8d3 Use Node::_getFullTransform instead of building the matrix manually 2013-01-09 05:11:32 -08:00
Chris Robinson
015bb0bf1f Use the calculated max time for the "all" animation 2013-01-09 04:30:32 -08:00
Chris Robinson
465fd9c8af Offset animation times to start at 0 2013-01-09 04:21:56 -08:00
Marc Zinnschlag
d1e51ebf42 silenced some warnings 2013-01-09 12:25:45 +01:00
Chris Robinson
4054934f16 Store text keys for each animation 2013-01-09 02:51:25 -08:00
Chris Robinson
bb98542c5a Build separate animations for each group 2013-01-09 01:40:38 -08:00
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.
 2013-01-09 00:17:42 -08:00
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.
 2013-01-08 22:51:05 -08:00
Nathan Jeffords
43cd88a24e include members of BSAArchives in Ogres resource indices 2013-01-08 22:51:05 -08:00
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.
 2013-01-07 04:21:25 -08:00
Chris Robinson
921ae76ea9 Merge remote-tracking branch 'zini/master' into animation2 2013-01-06 21:20:49 -08:00
Chris Robinson
7ba09ff025 Catch errors from buildBones 2013-01-06 20:05:50 -08:00
Marc Zinnschlag
e31cd1c805 Merge remote-tracking branch 'corristo/master' 2013-01-06 18:40:30 +01:00
Nikolay Kasyanov
1d3f3bcce3 clang build fix 2013-01-06 19:19:12 +04:00
Marc Zinnschlag
25815ab8f7 Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite' 2013-01-06 13:31:01 +01:00
Emanuel Guevel
0b7d11d38d to_utf8 test: fix Utf8Encoder constructor 2013-01-06 11:39:18 +01:00
Chris Robinson
8ebf49a35b Only lower-case the model name 
The skeleton name will already be lower-case
 2013-01-05 20:54:57 -08:00
Chris Robinson
18389c7b04 Set non-bone nodes as manually controlled 2013-01-05 17:50:22 -08:00
Emanuel Guevel
63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter 
Edit other files accordingly.
 2013-01-06 01:37:58 +01:00
Chris Robinson
e5ce55b6a4 Remove a hack 2013-01-05 06:20:21 -08:00
Marc Zinnschlag
043e6c09fe Merge remote-tracking branch 'chris/animation2' 2013-01-05 13:34:46 +01:00
Chris Robinson
58d35dbfcf Have createEntities' caller retrieve the text keys as needed 2013-01-05 04:01:11 -08:00
Chris Robinson
761914bdaa Use a separate method to build the animation 2013-01-05 03:31:51 -08:00
Jordan Milne
3ed77ca189 Include C++ header instead 2013-01-05 01:17:07 -04:00
Chris Robinson
8a086e3afb Cache the mesh names from the mesh/skeleton pairs 2013-01-04 20:58:35 -08:00
Chris Robinson
3131e8dae6 Don't get the text keys if they're not being requested 2013-01-04 20:33:26 -08:00
Chris Robinson
683ced54a0 Store and retrieve the node text keys in the bones' user object bindings 2013-01-04 19:41:37 -08:00
Chris Robinson
a3d33db415 Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone 2013-01-04 15:55:47 -08:00
Jordan Milne
b52904a6ea Include headers necessary for compilation under VS2010 2013-01-04 19:52:27 -04:00
Chris Robinson
1d4d67f811 Avoid underflows if the texture name doesn't include a '.' 2013-01-04 15:03:57 -08:00
Chris Robinson
3f19b13695 Merge remote-tracking branch 'zini/master' into animation2 2013-01-04 14:47:01 -08:00
Marc Zinnschlag
215b43cc7b Merge remote-tracking branch 'blunted2night/texname_fix' 2013-01-04 23:19:51 +01:00
Marc Zinnschlag
b4d63814cc post merge fix 2013-01-04 23:12:56 +01:00
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.
 2013-01-04 13:41:03 -08:00
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.
 2013-01-04 13:40:00 -08:00
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.
 2013-01-04 13:39:10 -08:00
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.
 2013-01-04 11:36:22 -08:00
Emanuel Guevel
cc792da858 Fix to_utf8 test: add test data directory and remove unused include 2013-01-04 15:24:07 +01:00
Emanuel Guevel
c947d87ab9 Add a test for to_utf8 component 2013-01-04 15:10:30 +01:00
Chris Robinson
61ad8bb3dd Use a list of mesh names instead of mesh objects 2013-01-04 00:14:41 -08:00
Chris Robinson
019893b5c6 Get rid of some unnecessary case-insensitive compares 2013-01-03 23:44:58 -08:00
Emanuel Guevel
0bdf52a071 components/to_utf8: keep only Utf8Encoder 2013-01-04 01:58:30 +01:00
Emanuel Guevel
02bf02f288 ESMReader, ESMWriter: use Utf8Encoder 2013-01-04 01:52:03 +01:00
Emanuel Guevel
9906c3051d components/translation: use Utf8Encoder 2013-01-04 01:52:02 +01:00
Emanuel Guevel
740e2b5769 components/to_utf8: add class Utf8Encoder 2013-01-04 01:52:02 +01:00
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.
 2013-01-03 18:51:04 +01:00
Marc Zinnschlag
80a0be3264 Merge remote-tracking branch 'blunted2night/msvcbuild' 2013-01-01 21:19:27 +01:00
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).
 2013-01-01 11:59:05 -08:00
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
 2013-01-01 10:58:30 -08:00
lazydev
7cd1e87fe8 Merge branch 'master' of git://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
 2013-01-01 22:18:21 +04:00
lazydev
cd5d95ed22 1. Dialogs in Russian version now works. 
2. Destination names it travel window are now translated
 2012-12-31 04:15:47 +04:00
eduard
69d9d22579 comparestring 2012-12-30 19:56:38 +01:00
eduard
98103e15eb conflict resolution 2012-12-30 13:46:07 +01:00
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
 2012-12-30 13:09:37 +01:00
Marc Zinnschlag
334588bf1c Merge branch 'editor2' 2012-12-28 23:31:43 +01:00
eduard
c75a5ae212 string compare and tolower 2012-12-28 18:05:52 +01:00
eduard
8545667bbd string compare and tolower 2012-12-28 17:54:56 +01:00
Mark Siewert
2cef65a056 - Remove some files that are no longer in upstream/master 2012-12-27 20:11:58 +01:00
Tom Mason
a14b7e4a0f small fixes on text defines 2012-12-26 18:07:56 +00:00
Marc Zinnschlag
e9ba7339f3 improved error handling 2012-12-26 17:15:53 +01:00
Marc Zinnschlag
afc2e840ae renamed namespace TranslationData to Translation 2012-12-26 17:06:33 +01:00
Marc Zinnschlag
206c613b52 moved translation storage from GUI manager to engine 2012-12-26 17:03:37 +01:00
Marc Zinnschlag
2d468fec02 made previous commits naming standard compliant 2012-12-26 16:19:59 +01:00
Marc Zinnschlag
4c28f3211b Merge remote-tracking branch 'lazydev/master' 2012-12-26 15:50:03 +01:00
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
 2012-12-25 20:27:30 +01:00
lazydev
1f71395660 renaming of translation component; removing of C++11 features 2012-12-25 23:20:39 +04:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Tom Mason
8ac8fdff47 implemented all text defines except a few for keybindings that don't exist yet 2012-12-21 18:09:31 +00:00
Tom Mason
f2c6907244 Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work 2012-12-20 23:16:34 +00:00
Thoronador
5a7a8629b6 remove unnecessary include directive 2012-12-17 23:20:43 +01:00
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.
 2012-12-17 23:13:33 +01:00
Marc Zinnschlag
5cd2fe00ab initialise blank global records 2012-12-03 22:16:02 +01:00
Marc Zinnschlag
8a09e03d5c global variable editing (no undo support yet) 2012-11-29 14:45:34 +01:00
Marc Zinnschlag
ef9575498f basic (non-editable) subview for global variables 2012-11-26 12:29:22 +01:00
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.
 2012-11-25 19:07:16 +01:00
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.
 2012-11-25 17:19:29 +01:00
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.
 2012-11-25 14:12:44 +01:00
Marc Zinnschlag
d684b3ae11 fixed getString function in NIF loader 2012-11-22 10:35:03 +01:00
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.
 2012-11-17 21:50:25 +01:00
Mark Siewert
2175f13b67 - Add tracking for dependencies between plugins. 
- Add reference number mangling required for moving references around.
 2012-11-17 00:21:51 +01:00
scrawl
5f7d349126 several missing includes 2012-11-14 05:32:23 +01:00
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.
 2012-11-10 21:43:41 +01:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
Marc Zinnschlag
4994a253da Merge branch 'bountydisease' into dialogue 2012-11-09 18:17:14 +01:00
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