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
b1ef0026a9
race selection/inventory preview character model update
12 years ago
4994a253da
Merge branch 'bountydisease' into dialogue
12 years ago
c3f0dc0dfb
m prefix for NpcAnimation members
12 years ago
00a2de432a
fix BulletShapeLoader namespace
12 years ago
662054acf4
Issue #219 : moved checks for various dialogue info fields from DialogueManager to Filter
12 years ago
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
64c08eada4
Merge remote-tracking branch 'upstream/next' into multiple_esm_esp
12 years ago
8691eac557
resolve Script::mData.mName -> mId, resolve moving ESMStore
12 years ago
5ac54d1fff
alter ESM::Script for storing id as std::string
12 years ago
d5628c678f
add mId field to every record indexed by id
12 years ago
2057f5619e
move ESMStore to MWWorld
12 years ago
f0a3ee0ef9
gmst id should be lowercase, wipe RecIdListT
12 years ago
4ca0eb93ee
fix markers used for raycasting and blocking activation
12 years ago
3f6afb13f1
Merge remote-tracking branch 'scrawl/alchemy'
12 years ago
18686614db
Merge remote-tracking branch 'scrawl/splashscreen_dirlisting'
...
Conflicts:
apps/openmw/mwgui/loadingscreen.cpp
12 years ago
510674aa5e
Merge branch 'master' into alchemy
...
Conflicts:
components/esm/loadmgef.hpp
12 years ago
5fbca239dd
Issue #61 : potion creation (1st part; still missing some implementations)
12 years ago
1a2034b4dd
training window
12 years ago
84a4fd56c3
consider all files in Splash directory
12 years ago
e05e683da3
Merge remote-tracking branch 'scrawl/spellcreation'
12 years ago
8ccb0907e6
assertion -> exception; added the old effect flags again
12 years ago
3fd887c030
silenced some warnings
12 years ago
35d099a638
disabling gcc extensions
12 years ago
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
12 years ago
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.
12 years ago
21493c2dbd
added magic effect flags from Research wiki page
12 years ago
31f7325e1f
fix land loading
12 years ago
93078bb0dc
move record ids to defs.hpp
12 years ago
3494e17b7c
wipe record superclass
12 years ago
2fa4ac177a
initial resolving
12 years ago
721324c1db
rm record inheritance, rework esmtool accordingly
12 years ago
cd8515396a
Use a multimap to store the text keys
12 years ago
9b491edbf8
Small cleanup for loading animation keyframes
12 years ago
d163f8203c
change books to RecListWithIDT
12 years ago
1339787863
remove underscores from filenames in esm
12 years ago
7368e7b655
rename getASCII() to getLegacyEnc()
12 years ago
c54750977f
remove underscores in guards
12 years ago
bf3aad8be0
handle NCC flag
12 years ago
872fcf3e3d
sleeping restoration of health, magicka, and fatigue
12 years ago
18cc435aa1
resolving conflicts
12 years ago
09195894cf
restore INGR and MGEF
12 years ago
2d5ddd104b
Land::loadData rework
12 years ago
bd94f257bf
a bit formatting
12 years ago
e69880f77e
almost perfect byte copies, has redundant data
12 years ago
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
12 years ago
e8bba2b833
disabled loading of land normals again, didn't need them after all
12 years ago
86cfc91ef3
global map rendering
12 years ago
597b88e95a
update saving AI packages
12 years ago
4abb9a00da
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
12 years ago
7606ebafd6
resolving conflicts, minor update
12 years ago
835c530e06
Merge branch 'ingredients'
12 years ago
b5ddc8d4fb
Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.
12 years ago
677158c477
added typesafe access functions for GMST values
12 years ago
f2ab4c929d
Issue #356 : added hardcoded magic effect flags *grumble*
12 years ago
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
c5b25ef70b
Very basic actor physics (no set scale/rotate functions)
12 years ago
7934d8abd9
Fixed an issue with some paths not concatenating properly.
12 years ago
bc6d87ba32
Oops, that would've broken getUserPath() on Linux...
12 years ago
cd3e780614
Removing the unnecessary local variables
12 years ago
97f1be2b05
Testing a third way to solve the path issue
12 years ago
6e317f00eb
Fix the problem in a different way
12 years ago
b6fcd337df
Modified the cache path to work on windows
12 years ago
e3d893b001
Merge remote-tracking branch 'jhooks/animationsmooth'
13 years ago
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
c27ff546e4
shader cache
13 years ago
950bf66334
throw an exception if default value for a setting is not found
13 years ago
4f1bcb749f
turned off redundant edge list building
13 years ago
0697c7f7f4
Finally merged in master
13 years ago
a90547bbbe
code formatting
13 years ago
75fa0288a3
fix creatures has spells, creatures ai data
13 years ago
02d7aa4135
npc ai packages
13 years ago
34c30b132c
Issue #378 : workaround for bad ingredient records in Morrowind.esm
13 years ago
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
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
5202b11235
just moving a comment
13 years ago
4a219404fc
Super smooth animations; 100 PERCENT COMPLETE
13 years ago
f21df64808
changing a few things around
13 years ago
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
13 years ago
cc776810e2
smoother animations
13 years ago
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
1da56e2832
removed some unused variables
13 years ago
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
13 years ago
d14cc5a435
update master
13 years ago
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
8762f4a47a
boxrotation nif field; commented functions
13 years ago
1f5bc229e0
Separate adjustRigidBody function
13 years ago
e7329d5f8b
Creatures now have a properly positioned box shape
13 years ago
38c2c5d480
Creatures now use object physics
13 years ago
083e3537b4
post merge
13 years ago
7cc2de3e21
boost filesystem compatibility fix
13 years ago
dbcd4a8b5b
compatibility fix
13 years ago
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
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
13 years ago
32b167ce2b
Revert "nif_file.hpp: include type definitions to fix build"
...
This reverts commit b0b3ebe123
13 years ago
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
13 years ago
cacf0bd10d
Basic collision with npcs
13 years ago
b0b3ebe123
nif_file.hpp: include type definitions to fix build
13 years ago
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
13 years ago
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
13 years ago
f8e54b401b
fixed linkage problem
13 years ago
scrawl
Marc Zinnschlag
Michal Sciubidlo
Nathan Jeffords
Chris Robinson
eduard
Nikolay Kasyanov
Emanuel Guevel
Jordan Milne
Mark Siewert
lazydev
Tom Mason
Thoronador
greye
Jason Hooks
Alexander "Ace" Olofsson
Edmondo Tommasina
greye
Michael Mc Donnell