Chris Robinson
75ce10c580
Don't load data for hidden meshes
13 years ago
Chris Robinson
ad75b47472
Build and set up a skeleton for meshes
13 years ago
Chris Robinson
b1f7fd9f7b
Pre-transform the mesh vertices when there's no skinning or skeleton
13 years ago
Chris Robinson
61f32eca77
Add methods to get a node's local and full transform as a 4x4 matrix
13 years ago
Chris Robinson
441a5c2da2
Load NiTriShapes into Ogre meshes
13 years ago
Chris Robinson
3029c221ef
Create materials when creating meshes
13 years ago
scrawl
509e9d7034
Merge branch 'master' into shadersystem
13 years ago
scrawl
fb1f8082d2
fix link error with recent glibc versions
13 years ago
Chris Robinson
b4c8375f3c
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/bsa/bsa_archive.cpp
13 years ago
Chris Robinson
9028cfe83c
Look for the NiTriShape when the mesh resource wants to load
...
It's still not loaded yet.
13 years ago
Chris Robinson
69ed73399a
Avoid exposing the NIF mesh resource loading class
13 years ago
Chris Robinson
300730a834
Create the skeleton resource from NIFs
...
Note they are not loaded yet.
13 years ago
Marc Zinnschlag
871b1d1c9b
silenced a warning
13 years ago
Chris Robinson
bc0a6bffcf
Remove outdated comment
13 years ago
Chris Robinson
bd68f7bd33
Remove final direct uses of Mangle::Stream
13 years ago
Chris Robinson
7734771245
Use Ogre to load ESM data instead of Mangle
13 years ago
Chris Robinson
a8ebb39883
Avoid Mangle for BSA accesses
...
The way it was set up was not very efficient, and we're using Ogre for resource
management anyway, so it's best to just use that.
13 years ago
Chris Robinson
6a447c88fb
Create meshes from the NiTriShapes in the NIF.
...
This doesn't actually load them yet. It's also very slow for certain NIFs.
13 years ago
Chris Robinson
9caa264074
Merge remote branch 'zini/master' into nif-cleanup
13 years ago
scrawl
5e8bf28212
Merge branch 'master' into shadersystem
13 years ago
scrawl
5345d4eeef
fix a warning
13 years ago
Chris Robinson
5a381006e5
Fix parsing of some key lists
...
It seems some still want you to read the interpolation type even when there's
no keys.
13 years ago
scrawl
d41050fb79
merge
13 years ago
scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
13 years ago
Chris Robinson
939d0d2fc5
Return a list of meshes and the skeleton from NIFLoader::load
13 years ago
Chris Robinson
fdfe40a55a
Use a different loader object for each NIF mesh
13 years ago
Chris Robinson
9436ca4b0c
Use vectors for ShapeData properties
13 years ago
Marc Zinnschlag
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
13 years ago
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
13 years ago
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
13 years ago
Chris Robinson
9995dff943
Use a key list for NiColorData
13 years ago
Chris Robinson
3f11b6b1ae
Cleanup a couple unneeded misc component references
13 years ago
Chris Robinson
86b37c6c11
Move the velocity out of the transformation object
13 years ago
Chris Robinson
b292665de9
Use key lists to store some NIF data types
13 years ago
Chris Robinson
b7b9f11333
Add generic classes to help deal with NIF keys
13 years ago
Chris Robinson
645b507ba0
Return a reference to the RecordPtr from operator[] for consistency
...
RecordListT is supposed to be a list of RecordPtrT objects.
13 years ago
Chris Robinson
7e8c146de6
Constify some RecordListT methods
13 years ago
Chris Robinson
8e324c90dc
Constify some RecordPtrT methods
13 years ago
Chris Robinson
395a7600fd
Initialize identify transform when declaring the identity object
13 years ago
Chris Robinson
348b5fa207
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nifbullet/bullet_nif_loader.cpp
13 years ago
Chris Robinson
dddf1b4ee5
Rename getMatrix->getMatrix3 and getVector->getVector3
13 years ago
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
13 years ago
Chris Robinson
d30f64650a
Make the read_* methods private and remove the generic load() methods
13 years ago
Chris Robinson
930459365b
Rename getShort->getUShort and getByte->getChar
13 years ago
Chris Robinson
95b804a104
Remove NIFFile::getArrayLen
13 years ago
Chris Robinson
ca37706b34
Use Ogre types for Matrix and Vector objects
13 years ago
Chris Robinson
10072f74b4
Remove NIFFile::getType
13 years ago
Chris Robinson
98ae7168b1
Fix double-incrementing a pointer
13 years ago
Chris Robinson
b3aa453f9a
Use Ogre data streams for loading NIFs
13 years ago
Chris Robinson
0143cacd2b
Avoid returning pointers from NIFFile
13 years ago
Chris Robinson
d3a31a24ce
Use proper strings and vectors instead of slice arrays for NIF files
...
Slice arrays use pre-allocated pointers whose memory is managed externally. This is
unnecessary and ultimately detrimental since it prevents any kind of data fixup
(e.g. little endian to big endian, p[adding handling), and it also makes it difficult
to use Ogre data streams.
13 years ago
scrawl
b803d0e949
converted shadow caster shader
13 years ago
scrawl
81d30ff63a
temp commit
13 years ago
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
13 years ago
Jason Hooks
b5edad790d
merge
13 years ago
scrawl
e517e75d09
update
13 years ago
scrawl
a095572205
fixed some textures, started with sky
13 years ago
scrawl
33c48b9481
update
13 years ago
scrawl
8e683c2e05
vertex colors
13 years ago
scrawl
9bd888d9a1
transparency
13 years ago
scrawl
19ecc7f890
fix performance
13 years ago
Chris Robinson
d8d00123ea
Watch for empty children node refs when setting parents
13 years ago
Chris Robinson
832247bff2
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
components/nif/data.hpp
13 years ago
scrawl
4ea6530772
hello world.
13 years ago
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
13 years ago
Chris Robinson
291599c609
Store the parents of NIF's nodes
13 years ago
Chris Robinson
046e9686f9
Cleanup RecordPtrT
...
This moves the index resolution into a separate post method instead of always
checking when access. As a result, it reduces the size of it down to the size
of a pointer, as opposed to 2 pointers + 1 int. The appropriate methods are
added to the various node types to make sure they're resolved.
13 years ago
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
scrawl
797c2c538d
fix some settings bugs
13 years ago
Jason Hooks
fbde798968
merge
13 years ago
Marc Zinnschlag
50d81e99fb
possible fix for script execution bug
13 years ago
Marc Zinnschlag
fe85de5ea7
Issue #181 : assignment to member variables
13 years ago
Marc Zinnschlag
10b27e582b
Issue #181 : various fixed to member variable access
13 years ago
Marc Zinnschlag
8b19de17b6
Iisue #181 : enable member variable access from expressions in console
13 years ago
Marc Zinnschlag
6c5b21fa42
Issue #181 : Member variable access in expressions; error reporting fix for the previous commit
13 years ago
Marc Zinnschlag
d1441d79e7
Issue #181 : added code generation for member variable access
13 years ago
Marc Zinnschlag
050559d2e2
Issue #181 : added member variable access token
13 years ago
Jason Hooks
c4c8288af8
Seven digit scales
13 years ago
Jason Hooks
5028f9926d
Bullet scale solution
13 years ago
Jason Hooks
20288de685
Post merge
13 years ago
Alexander "Ace" Olofsson
76c4aa41bb
More land and cell work
13 years ago
Alexander "Ace" Olofsson
f675d8d039
Merge branch 'master'
13 years ago
Jason Hooks
595b0729da
Few things changed
13 years ago
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
13 years ago
Jason Hooks
fb0a52809d
Changing transformation processing
13 years ago
Marc Zinnschlag
ce43ff8d05
Issue #181 : added member variable access opcodes
13 years ago
Marc Zinnschlag
eb0be10e80
Merge branch 'script' into xdoty
13 years ago
Marc Zinnschlag
6ec2a2091c
Issue #305 : Allow the use of = as a synonym for ==
13 years ago
Marc Zinnschlag
72fca40090
Issue #181 : member variable access in interpreter context
13 years ago
Jason Hooks
4ff36a9018
Bullet loader trafos changed to match NIFLoader
13 years ago
scrawl
c85c794c86
fixed some cppcheck issues
13 years ago
scrawl
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
13 years ago
scrawl
689cf7ce05
ConfirmationDialog
13 years ago
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
13 years ago
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
13 years ago
scrawl
8ce4727424
skill tooltips
13 years ago
scrawl
a284bfb4d0
Merge branch 'master' into inventoryGUI
13 years ago
gugus
6f87493df6
fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much)
13 years ago
scrawl
630241c8e2
load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.
13 years ago
scrawl
471f6467ec
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
scrawl
ddb0a91994
addition to last commit
13 years ago
Lukasz Gromanowski
d9e39bd90e
Changed order of plugins.cfg file paths.
...
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
13 years ago
Alexander "Ace" Olofsson
b1af18e98d
Merged next
13 years ago
Alexander "Ace" Olofsson
0c9dfcc017
Some changes
13 years ago
scrawl
4ce83badc9
flickering lights
13 years ago
scrawl
8231cab599
correct case for dialogue topics
13 years ago
Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
Alexander "Ace" Olofsson
a74aeace73
Can now save strings with proper encoding, byte-perfect clones up until land records
13 years ago
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
13 years ago
Alexander "Ace" Olofsson
f16a9ce5ed
Working on making output identical to input.
13 years ago
Jason Hooks
7fce57f335
Getting started with a new branch
13 years ago
scrawl
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
scrawl
2a4fcf42a3
basic shadows
13 years ago
Jason Hooks
74deb5588d
Post merge
13 years ago
Alexander "Ace" Olofsson
290d09de64
Switching creature and npc to using the same id storage as the rest of the records
13 years ago
Alexander "Ace" Olofsson
f0c32ba7d3
Fixed saving cell ref data with wrong name
13 years ago
Alexander "Ace" Olofsson
fc8c75ab89
Esmtool can now clone an esm file in such a way that it can read it back again afterwards.
13 years ago
Alexander "Ace" Olofsson
0fd48c4229
Extended the esmtool a bit and prepared all records for saving.
13 years ago
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
.
13 years ago
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
13 years ago
scrawl
044d649edd
Merge branch 'master' into water
13 years ago
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
13 years ago
Lukasz Gromanowski
e21e8c221d
Added explicit cast to char in ToUTF8::windows_XXXX tables.
...
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:
narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]
warnings.
13 years ago
Alexander "Ace" Olofsson
47013799ea
Fleshing out the esm writer a bit
13 years ago
Alexander "Ace" Olofsson
b81ac363fc
Write names with a small sanity check
13 years ago
Alexander "Ace" Olofsson
7c1e417f9a
Niceify-ing it (Yes, that's a word)
13 years ago
Alexander "Ace" Olofsson
ba602929ef
Adding basic save functions to all record types.
13 years ago
scrawl
622fb568cf
removed MRT setting and figure it out automatically
13 years ago
scrawl
88c50c5171
Merge branch 'master' into water
13 years ago
Marc Zinnschlag
01500e979a
another fix for optional arguments
13 years ago
Marc Zinnschlag
6fd3d5c776
Merge remote branch 'lgro/master'
13 years ago
Lukasz Gromanowski
ea8e5cb6f8
Issue #225 : Land struct is not copyable.
...
Disabled copy constructor and assignment operator in Land structure.
13 years ago
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
.
13 years ago
scrawl
006970fd79
add MRT code to shaders
13 years ago
Jason Hooks
57299571d5
Preparing for clothes/armor
13 years ago
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904
.
...
Changed pointer to LandData struct to simple member variable.
13 years ago
scrawl
2b4b941192
Merge branch 'master' into gamesettings
13 years ago
scrawl
5accca385c
fix crash on exit when no user settings exist
13 years ago
Marc Zinnschlag
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
13 years ago
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
13 years ago
scrawl
c2a82c3d89
Merge branch 'master' into gamesettings
13 years ago
scrawl
7b3adb27a3
backend changes, terrain num lights setting
13 years ago
Alexander "Ace" Olofsson
54ce95cfaf
Make sure it doesn't find the wrong file
13 years ago
scrawl
6091a0504d
first settings test (config file has to be created manually)
13 years ago
scrawl
308df7caa8
add method for keeping track of settings that changed
13 years ago
scrawl
55c984c179
Merge branch 'master' into gamesettings
13 years ago
Marc Zinnschlag
08f8701b33
workaround for tga problem
13 years ago
scrawl
82429d6931
finished interface
13 years ago
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
13 years ago
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
13 years ago
Alexander "Ace" Olofsson
3b0dc408ae
Debug-b-gone
13 years ago
Alexander "Ace" Olofsson
06a34b9e0d
Strange problems call for strange solutions.
13 years ago
Alexander "Ace" Olofsson
8e07b7e050
Better (less) debug output
13 years ago
Alexander "Ace" Olofsson
8d9100c77b
Debug output
13 years ago
Alexander "Ace" Olofsson
fc4e4dc336
Case sensitiviy?
13 years ago
scrawl
ff85006e71
added untested interface
13 years ago
Alexander "Ace" Olofsson
8ac9dd8e70
Always use the same type of slashes
13 years ago
Marc Zinnschlag
2d2af4b28a
Merge remote branch 'scrawl/terrain18' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
13 years ago
Alexander "Ace" Olofsson
d2f8539a42
Forgot to remove some old code that didn't do anything
13 years ago
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
13 years ago
scrawl
d5c49fa036
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
13 years ago
Nikolay Kasyanov
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
13 years ago
Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
13 years ago
Alexander "Ace" Olofsson
6acd900577
Better name
13 years ago
Alexander "Ace" Olofsson
c3944d3e1a
Use a normal binary search
13 years ago
Alexander "Ace" Olofsson
ce38876a74
Oops, that could've crashed horribly
13 years ago
scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
13 years ago
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
13 years ago
Alexander "Ace" Olofsson
71cb85dbc4
Performance enhancment and minor copy-paste fix.
13 years ago
scrawl
42c5d515e6
fixed interior water level
13 years ago
Alexander "Ace" Olofsson
0d163d76ab
Replaced some messy code with some differently messy code, this one at least seems to work
13 years ago
scrawl
8bbb02a1bd
ogre 1.8 fixes
13 years ago
scrawl
6bea08157e
Merge branch 'master' into terrain18
13 years ago
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
13 years ago
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
13 years ago
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
13 years ago
Lukasz Gromanowski
2b9845a5b6
Issue #225 : Free memory allocated for sending into HardwareVertexBuffer.
...
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
13 years ago
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
13 years ago
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
13 years ago
scrawl
99b2b6b648
ogre 1.8 fixes
13 years ago
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Roman Melnik
e6c55c144c
Fix tabulation/formatting
13 years ago
Roman Melnik
6d33ad248d
Fix memory leak in getIdentity method
...
Replace static pointer and new() operator with normal static variable
13 years ago
scrawl
b8f962a68d
Merge branch 'next' into shaders
13 years ago
scrawl
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
13 years ago
Roman Melnik
ebc49de851
Fix Bug #1 : "Meshes rendered with wrong orientation"
...
Discard the tranformation of the root NiNode when loading nif files
(set the 'identity' transformation instead).
After applying the fix test the following types of interiors:
- Dwemer ruins (the bug was common here before the fix)
- Ancestral tombs (the bug was common here before the fix)
- Daedric shrines
- Caves/grottos
- Dunmer strongholds
- Telvanni, imperial, redoran houses/towers/castles
Also checked exteriors (although it is hard to do without terrain
rendering)
13 years ago
Marc Zinnschlag
d9677cb33e
fixed problem with parsing optional string arguments
13 years ago
Marc Zinnschlag
187b8e58d6
fixed handling of optional instruction/function arguments; removed choice workaround
13 years ago
scrawl
3e4cf64a77
Merge branch 'master' into shaders
13 years ago
Michael Papageorgiou
b2c6d52db1
Another file search fix
13 years ago
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
13 years ago
Nikolay Kasyanov
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
1c0bf162f2
boost compatibility fix
13 years ago
Marc Zinnschlag
a7211d2a90
Merge remote branch 'werdanith/searchfix'
13 years ago
Michael Papageorgiou
588ac44bc7
Improved matching for the FileListLocator
13 years ago
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
13 years ago
Marc Zinnschlag
3c3fb8d706
Merge remote branch 'werdanith/activationsounds2' into equipment
13 years ago
Michael Papageorgiou
f7c7ed0ac7
Fix regression with locating sound files
13 years ago