fd430dc5a9
Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget
...
Conflicts:
apps/launcher/datafilespage.cpp
components/fileorderlist/datafileslist.cpp
12 years ago
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
da5f11700f
Warn about unhandled node types before the controllers
12 years ago
5b2ca6fa7d
Don't complain about RootCollisionNode, it's handled in nifbullet
12 years ago
f4d60ae7b2
Files sorting (masters then plugins).
...
Remove unneeded includes.
12 years ago
0df7c7e5c1
Rename mPlugins* to mFiles*
12 years ago
e4ed397b2d
Merge plugins and masters list view in openDialog. Simplify datafilesmodel.
12 years ago
f4e587c72c
Always create a skeleton from a NIF when there's more than one NiNode
12 years ago
f197c67e95
Fix a circular include
12 years ago
34ddf69a31
Merge remote-tracking branch 'zini/next' into animation2
12 years ago
d47090b312
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
12 years ago
f19fbaa293
Merge remote-tracking branch 'mark76/multiple_esm_esp' into next
12 years ago
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
d5dd0640c7
basic gmst support
12 years ago
8b1e7b95ba
Attempt to load the skeleton source if it doesn't yet exist
12 years ago
347a734364
Move OpenDialog to editor and use it in startup dialogue.
...
Remove debug output from DataFilesList.
12 years ago
f7e5ea24f4
Merge branch 'startup' into cs_load.
...
Fix include in textinputdialog.cpp.
12 years ago
bd4fdf47a3
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/sky.cpp
12 years ago
66ec4ca7d9
Split launcher specific code from DataFilesList back to DataFilesPage.
12 years ago
bec538bfa1
Always declare operator<< for using a TextKeyMap with Ogre::Any
12 years ago
109d0a942f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
3e43db5f76
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
12 years ago
c45b4d6072
Clean up some NIF warning reports
12 years ago
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
e6e7c69013
Fix handling of filtered entities
12 years ago
85697e4628
reverted to C++03
12 years ago
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
12 years ago
492482de7f
Add "open" option in opencs.
12 years ago
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
ac62dd050d
Rename datafilespage to datafileslist
12 years ago
f029a9011a
Move datafilespage to shared space.
12 years ago
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
0853fa335c
Avoid redundant string concatenations
12 years ago
487c83e943
Rename nonaccum to animroot
12 years ago
e1d3933145
Remove an unused struct
12 years ago
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
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
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
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
8e8900e422
Use the first bone with text keys as the nonaccum root.
12 years ago
536f8104e6
Do not create an 'all' animation.
12 years ago
713d324eeb
- Minor code cleanup
12 years ago
a8e02779b2
- Add support for multiple plugins trying to modify the same reference
...
- Fix a small signed/unsigned warning
12 years ago
1ce8eaf52c
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
apps/openmw/mwrender/actors.cpp
apps/openmw/mwrender/actors.hpp
12 years ago
94e30199d1
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
12 years ago
e5f040a06f
Improve filename pattern matching
12 years ago
6c6ce4a05c
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
b23fcb260c
Use the record index for finding the NiTriShape instead of the name
12 years ago
660d73fd88
Store the NIF index in the Record object
12 years ago
e4f140841e
Make OpenMW work with Ogre 1.9
12 years ago
3f4d8c08e4
Merge branch 'nif_file' into graphics
12 years ago
31e6d28b19
Close NIF file resource after loading it into memory
12 years ago
52516ca4b4
Merge branch 'master' into graphics
12 years ago
db48017c36
Merge remote-tracking branch 'blunted2night/nif_cache_v6'
12 years ago
85bdb49d1b
Mix debug and release if necessary under non Windows systems.
12 years ago
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
0989b44b41
spread some const around NIF loading
12 years ago
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
6ef85c46fd
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
12 years ago
23ac1c2de5
Merge remote-tracking branch 'zini/master' into animation2
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
12 years ago
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
4defb1a476
Merge remote-tracking branch 'trombonecot/lowerstring'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
12 years ago
2dc0064cc2
more string lowercase
12 years ago
a14132b5a0
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
c4c8295e0b
Rename NIFLoader to Loader, and update some comments
12 years ago
44031ec3d7
fleshed out BSAArchive and DirArchive.
...
Implemented both lists & finds, with pattern matching.
Conflicts:
components/bsa/bsa_archive.cpp
12 years ago
4b7cc1372f
Some cleanup
12 years ago
a9bcbfd8d3
Use Node::_getFullTransform instead of building the matrix manually
12 years ago
015bb0bf1f
Use the calculated max time for the "all" animation
12 years ago
465fd9c8af
Offset animation times to start at 0
12 years ago
d1e51ebf42
silenced some warnings
12 years ago
4054934f16
Store text keys for each animation
12 years ago
bb98542c5a
Build separate animations for each group
12 years ago
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
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
43cd88a24e
include members of BSAArchives in Ogres resource indices
12 years ago
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
921ae76ea9
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
7ba09ff025
Catch errors from buildBones
12 years ago
e31cd1c805
Merge remote-tracking branch 'corristo/master'
12 years ago
1d3f3bcce3
clang build fix
12 years ago
25815ab8f7
Merge remote-tracking branch 'potatoesmaster/to_utf8-rewrite'
12 years ago
0b7d11d38d
to_utf8 test: fix Utf8Encoder constructor
12 years ago
8ebf49a35b
Only lower-case the model name
...
The skeleton name will already be lower-case
12 years ago
18389c7b04
Set non-bone nodes as manually controlled
12 years ago
63f09462fd
to_utf8, Utf8Encoder: pass encoding as constructor parameter
...
Edit other files accordingly.
12 years ago
e5ce55b6a4
Remove a hack
12 years ago
043e6c09fe
Merge remote-tracking branch 'chris/animation2'
12 years ago
58d35dbfcf
Have createEntities' caller retrieve the text keys as needed
12 years ago
761914bdaa
Use a separate method to build the animation
12 years ago
3ed77ca189
Include C++ header instead
12 years ago
8a086e3afb
Cache the mesh names from the mesh/skeleton pairs
12 years ago
3131e8dae6
Don't get the text keys if they're not being requested
12 years ago
683ced54a0
Store and retrieve the node text keys in the bones' user object bindings
12 years ago
a3d33db415
Store a NiNode's NiTextKeyExtraData in a user object binding on Ogre::Bone
12 years ago
b52904a6ea
Include headers necessary for compilation under VS2010
12 years ago
1d4d67f811
Avoid underflows if the texture name doesn't include a '.'
12 years ago
3f19b13695
Merge remote-tracking branch 'zini/master' into animation2
12 years ago
215b43cc7b
Merge remote-tracking branch 'blunted2night/texname_fix'
12 years ago
b4d63814cc
post merge fix
12 years ago
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
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
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
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
cc792da858
Fix to_utf8 test: add test data directory and remove unused include
12 years ago
c947d87ab9
Add a test for to_utf8 component
12 years ago
61ad8bb3dd
Use a list of mesh names instead of mesh objects
12 years ago
019893b5c6
Get rid of some unnecessary case-insensitive compares
12 years ago
0bdf52a071
components/to_utf8: keep only Utf8Encoder
12 years ago
02bf02f288
ESMReader, ESMWriter: use Utf8Encoder
12 years ago
9906c3051d
components/translation: use Utf8Encoder
12 years ago
740e2b5769
components/to_utf8: add class Utf8Encoder
12 years ago
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
80a0be3264
Merge remote-tracking branch 'blunted2night/msvcbuild'
12 years ago
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
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
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
12 years ago
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
12 years ago
69d9d22579
comparestring
12 years ago
98103e15eb
conflict resolution
12 years ago
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
334588bf1c
Merge branch 'editor2'
12 years ago
c75a5ae212
string compare and tolower
12 years ago
8545667bbd
string compare and tolower
12 years ago
2cef65a056
- Remove some files that are no longer in upstream/master
12 years ago
a14b7e4a0f
small fixes on text defines
12 years ago
e9ba7339f3
improved error handling
12 years ago
afc2e840ae
renamed namespace TranslationData to Translation
12 years ago
206c613b52
moved translation storage from GUI manager to engine
12 years ago
2d468fec02
made previous commits naming standard compliant
12 years ago
4c28f3211b
Merge remote-tracking branch 'lazydev/master'
12 years ago
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
1f71395660
renaming of translation component; removing of C++11 features
12 years ago
74ae479780
Cell names localization fix
12 years ago
8ac8fdff47
implemented all text defines except a few for keybindings that don't exist yet
12 years ago
f2c6907244
Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work
12 years ago
5a7a8629b6
remove unnecessary include directive
12 years ago
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
5cd2fe00ab
initialise blank global records
12 years ago
8a09e03d5c
global variable editing (no undo support yet)
12 years ago
ef9575498f
basic (non-editable) subview for global variables
12 years ago
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
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
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
d684b3ae11
fixed getString function in NIF loader
12 years ago
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
2175f13b67
- Add tracking for dependencies between plugins.
...
- Add reference number mangling required for moving references around.
12 years ago
5f7d349126
several missing includes
12 years ago
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
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
Pieter van der Kloet
Chris Robinson
Michal Sciubidlo
scrawl
Marc Zinnschlag
Mark Siewert
Nathan Jeffords
eduard
Nikolay Kasyanov
Emanuel Guevel
Jordan Milne
lazydev
Tom Mason
Thoronador