Commit graph

548 commits

Author SHA1 Message Date
scrawl
7d5b94709d Merge branch 'master' into shadersystem
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
Chris Robinson
348b5fa207 Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	components/nifbullet/bullet_nif_loader.cpp
2012-07-10 06:16:16 -07:00
Chris Robinson
dddf1b4ee5 Rename getMatrix->getMatrix3 and getVector->getVector3 2012-07-10 04:45:14 -07:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
Chris Robinson
d30f64650a Make the read_* methods private and remove the generic load() methods 2012-07-10 04:21:47 -07:00
Chris Robinson
930459365b Rename getShort->getUShort and getByte->getChar 2012-07-10 03:52:01 -07:00
Chris Robinson
95b804a104 Remove NIFFile::getArrayLen 2012-07-10 03:02:37 -07:00
Chris Robinson
ca37706b34 Use Ogre types for Matrix and Vector objects 2012-07-10 02:38:35 -07:00
Chris Robinson
10072f74b4 Remove NIFFile::getType 2012-07-10 00:27:13 -07:00
Chris Robinson
98ae7168b1 Fix double-incrementing a pointer 2012-07-10 00:24:18 -07:00
Chris Robinson
b3aa453f9a Use Ogre data streams for loading NIFs 2012-07-09 22:02:12 -07:00
Chris Robinson
0143cacd2b Avoid returning pointers from NIFFile 2012-07-09 21:35:36 -07:00
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.
2012-07-09 21:08:23 -07:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
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
2012-07-09 10:39:57 +02:00
scrawl
e517e75d09 update 2012-07-07 01:25:14 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
8e683c2e05 vertex colors 2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1 transparency 2012-07-05 00:39:25 +02:00
scrawl
19ecc7f890 fix performance 2012-07-04 17:28:22 +02:00
Chris Robinson
d8d00123ea Watch for empty children node refs when setting parents 2012-07-03 18:37:04 -07:00
Chris Robinson
832247bff2 Merge remote branch 'zini/master' into nif-cleanup
Conflicts:
	components/nif/data.hpp
2012-07-03 15:29:18 -07:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
Marc Zinnschlag
c85aaafac2 more include cleanup (most removing Ogre.h) 2012-07-03 15:32:38 +02:00
Chris Robinson
291599c609 Store the parents of NIF's nodes 2012-07-02 22:49:44 -07:00
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.
2012-07-02 21:41:21 -07:00
Marc Zinnschlag
76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 2012-06-29 16:48:50 +02:00
scrawl
797c2c538d fix some settings bugs 2012-06-23 12:25:28 +02:00
Marc Zinnschlag
50d81e99fb possible fix for script execution bug 2012-06-19 14:55:22 +02:00
Marc Zinnschlag
fe85de5ea7 Issue #181: assignment to member variables 2012-06-16 14:29:55 +02:00
Marc Zinnschlag
10b27e582b Issue #181: various fixed to member variable access 2012-06-16 13:51:13 +02:00
Marc Zinnschlag
8b19de17b6 Iisue #181: enable member variable access from expressions in console 2012-06-16 13:21:01 +02:00
Marc Zinnschlag
6c5b21fa42 Issue #181: Member variable access in expressions; error reporting fix for the previous commit 2012-06-16 13:06:23 +02:00
Marc Zinnschlag
d1441d79e7 Issue #181: added code generation for member variable access 2012-06-16 10:49:34 +02:00
Marc Zinnschlag
050559d2e2 Issue #181: added member variable access token 2012-06-16 10:31:49 +02:00
Jason Hooks
c4c8288af8 Seven digit scales 2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d Bullet scale solution 2012-06-12 18:09:58 -04:00
Jason Hooks
20288de685 Post merge 2012-06-11 15:39:57 -04:00
Jason Hooks
595b0729da Few things changed 2012-06-10 21:08:58 -04:00
Jason Hooks
fb0a52809d Changing transformation processing 2012-06-09 15:19:15 -04:00
Marc Zinnschlag
ce43ff8d05 Issue #181: added member variable access opcodes 2012-06-07 13:56:49 +02:00
Marc Zinnschlag
eb0be10e80 Merge branch 'script' into xdoty 2012-06-07 13:00:01 +02:00
Marc Zinnschlag
6ec2a2091c Issue #305: Allow the use of = as a synonym for == 2012-06-07 12:16:03 +02:00
Marc Zinnschlag
72fca40090 Issue #181: member variable access in interpreter context 2012-06-07 11:59:45 +02:00
Jason Hooks
4ff36a9018 Bullet loader trafos changed to match NIFLoader 2012-06-06 16:29:44 -04:00
scrawl
c85c794c86 fixed some cppcheck issues 2012-06-06 20:29:30 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00