scrawl
4434fb640e
Merge branch 'master' into shadersystem
2012-07-17 19:12:02 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
scrawl
509e9d7034
Merge branch 'master' into shadersystem
2012-07-15 21:58:45 +02:00
Chris Robinson
bd68f7bd33
Remove final direct uses of Mangle::Stream
2012-07-15 08:51:51 -07:00
scrawl
d41050fb79
merge
2012-07-14 11:21:40 +02:00
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
ca37706b34
Use Ogre types for Matrix and Vector objects
2012-07-10 02:38:35 -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
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
Jason Hooks
5028f9926d
Bullet scale solution
2012-06-12 18:09:58 -04:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
ddb0a91994
addition to last commit
2012-05-13 12:19:49 +02:00
Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-15 22:06:05 +02:00
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
2012-04-12 16:33:36 +02:00
scrawl
a727bcd4a4
override nif transparency settings (part 1)
2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
Jason Hooks
74deb5588d
Post merge
2012-04-08 20:41:49 -04:00
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
.
2012-04-07 22:47:39 +02:00
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
2012-04-07 22:37:15 +02:00
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
2012-04-07 16:55:32 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
006970fd79
add MRT code to shaders
2012-04-04 19:53:41 +02:00
Jason Hooks
57299571d5
Preparing for clothes/armor
2012-04-02 22:08:46 -04:00
scrawl
6091a0504d
first settings test (config file has to be created manually)
2012-04-01 16:59:35 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
2012-03-26 23:16:59 +02:00
Lukasz Gromanowski
2b9845a5b6
Issue #225 : Free memory allocated for sending into HardwareVertexBuffer.
...
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
2012-03-26 19:09:55 +02:00
scrawl
118250171d
Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
...
Conflicts:
apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +01:00
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05:00
scrawl
f7b706d24e
use the vertex colours that morrowind supplies for a lot of meshes
2012-03-05 18:50:56 +01:00
scrawl
ff8f95fcca
fix batch lighting, removed the "bumping number of lights" hack
2012-03-04 23:18:40 +01:00
scrawl
332671b43d
lighting fix
2012-03-04 22:26:40 +01:00
scrawl
b2109a1302
make the vertex colours only affect diffuse, this caused some areas to
...
be darker than they should be
2012-03-04 22:01:02 +01:00
scrawl
8910b0d471
use shaders for all NIF materials. this has numerous advantages:
...
- vertex colours are now working as they should (and they have a huge impact on the look)
- the lighting is per pixel and looks a lot better
- by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +01:00
Jason Hooks
8d7a5f469b
a few changes
2012-02-26 21:27:54 -05:00