scrawl
7d5b94709d
Merge branch 'master' into shadersystem
...
Conflicts:
components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
Marc Zinnschlag
c4f9bbdc8b
Merge remote branch 'scrawl/plugins_dbg'
2012-07-13 13:09:45 +02:00
scrawl
1429c8d5cb
copy&paste mistake
2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2
use debug versions of ogre plugins in debug mode
2012-07-13 11:30:47 +02:00
scrawl
d2fbb11475
temp commit
2012-07-13 11:26:36 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
scrawl
cd6e9986b6
forgot to add files
2012-07-11 09:09:38 +02:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
b2313be6d7
submodule update
2012-07-11 04:31:33 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
jvoisin
6c73f5e518
Add some translators/reversers to credits.txt
2012-07-10 22:25:19 +03:00
Marc Zinnschlag
089ee33588
some readme.txt improvements
2012-07-10 17:06:27 +02:00
Marc Zinnschlag
1fef4f2bc2
splitting off credits from readme file
2012-07-10 16:59:26 +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
gugus
164a5c8fe4
rotation now also work with the physic representation
2012-07-10 12:10:50 +02:00
Chris Robinson
95b804a104
Remove NIFFile::getArrayLen
2012-07-10 03:02:37 -07:00
gugus
70c74ede05
changed rotation order
2012-07-10 11:53:12 +02:00
Chris Robinson
ca37706b34
Use Ogre types for Matrix and Vector objects
2012-07-10 02:38:35 -07:00
gugus
410b693555
setAngle improvement
2012-07-10 11:15:46 +02: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
3537af051d
removed the old shader helper
2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6
remove cg profile check
2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4
shadows
2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
gugus
557e114992
clean-up + getScale/Angle script instructions
2012-07-09 19:28:44 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
gugus
0a67f60a6e
Clean-up
2012-07-09 18:47:59 +02:00
gugus
e6716c25c3
little correction.
2012-07-09 15:41:19 +02:00
gugus
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
2012-07-09 15:23:26 +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
Jason Hooks
b5edad790d
merge
2012-07-07 15:27:04 -04:00
scrawl
e517e75d09
update
2012-07-07 01:25:14 +02:00
Alexander "Ace" Olofsson
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
2012-07-07 01:14:18 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
71c865e2e9
let there be light
2012-07-06 07:10:10 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
1a5203749f
fix "error in framelistener" when trying to pick up lights that can't be picked up
2012-07-05 17:13:23 +02:00