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
2012-03-30 02:50:30 +04:00
scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
2012-03-29 15:50:15 +02:00
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
2012-03-29 13:27:13 +04:00
scrawl
42c5d515e6
fixed interior water level
2012-03-29 04:50:40 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +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
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
2012-03-26 19:09:55 +02:00
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
2012-03-24 16:57:06 +01:00
Roman Melnik
e6c55c144c
Fix tabulation/formatting
2012-03-23 22:15:45 +02:00
Roman Melnik
6d33ad248d
Fix memory leak in getIdentity method
...
Replace static pointer and new() operator with normal static variable
2012-03-23 22:08:02 +02:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
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)
2012-03-22 00:39:19 +02:00
Marc Zinnschlag
d9677cb33e
fixed problem with parsing optional string arguments
2012-03-18 14:27:49 +01:00
Marc Zinnschlag
187b8e58d6
fixed handling of optional instruction/function arguments; removed choice workaround
2012-03-17 19:32:44 +01:00
scrawl
3e4cf64a77
Merge branch 'master' into shaders
2012-03-16 20:46:18 +01:00
Michael Papageorgiou
b2c6d52db1
Another file search fix
2012-03-16 09:00:18 +02:00
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
2012-03-15 17:40:42 +01:00
Nikolay Kasyanov
65fc141b62
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-15 20:38:21 +04:00
Marc Zinnschlag
1c0bf162f2
boost compatibility fix
2012-03-15 16:56:36 +01:00
Marc Zinnschlag
a7211d2a90
Merge remote branch 'werdanith/searchfix'
2012-03-15 16:54:29 +01:00
Michael Papageorgiou
588ac44bc7
Improved matching for the FileListLocator
2012-03-15 17:32:10 +02:00
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
Marc Zinnschlag
3c3fb8d706
Merge remote branch 'werdanith/activationsounds2' into equipment
2012-03-15 14:06:48 +01:00
Michael Papageorgiou
f7c7ed0ac7
Fix regression with locating sound files
2012-03-15 13:56:46 +02:00
Marc Zinnschlag
ff866269ec
Merge remote branch 'corristo/pgrd'
...
Removed a warning
Conflicts:
CMakeLists.txt
2012-03-14 16:45:53 +01:00
Nikolay Kasyanov
a7f89b864e
Merge branch 'pgrd' into pgrd-rendering
2012-03-14 12:59:58 +04:00
Nikolay Kasyanov
988c1111e9
Feature #161 (Fix) Load REC_PGRD records
...
fixed edge decoding, thanks Project Aedra!
2012-03-14 12:54:52 +04: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
Nikolay Kasyanov
f292a5a7ca
Feature #37 (In Progress) Render Path Grid
...
now using mwRoot instead of ogre's root, so no more messing with coordinates.
2012-03-12 02:37:07 +04:00
Nikolay Kasyanov
4659076129
Feature #37 (In Progress) Render Path Grid
...
workaround for strange ESMStore bug
2012-03-10 20:45:55 +04:00
Nikolay Kasyanov
11f957a64d
Feature #37 (In Progress) Render Path Grid
...
cubes for path grid points
strange crash when trying to get path grids from Debugging
2012-03-10 20:03:00 +04:00
Nikolay Kasyanov
de5b692f9f
Feature #161 (Resolved) Load REC_PGRD records
2012-03-10 18:12:45 +04:00
Nikolay Kasyanov
fda5b59eb6
Feature #161 (In Progress) Load REC_PGRD records
...
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
2012-03-09 23:35:20 +04:00
Marc Zinnschlag
69127fa8f1
boost compatibility fix; added a missing include
2012-03-09 17:33:10 +01:00
Marc Zinnschlag
c259b25fcf
Merge remote branch 'werdanith/soundmanagerrefactor'
2012-03-09 17:27:11 +01:00
Michael Papageorgiou
ad6175c78a
SoundManager: Set up the priority for file look up right and take care of a corner case
2012-03-08 23:06:52 +02:00
Nikolay Kasyanov
08db70e137
disabled debug output
2012-03-08 01:00:13 +04:00
Michael Papageorgiou
054a176c86
Added new FileLibrary class to handle music, this fixes a number of issues.
2012-03-07 17:46:51 +02:00
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Michael Papageorgiou
54353794e5
SoundManager: Completely rewrote the file management
2012-03-07 02:20:15 +02:00
Nikolay Kasyanov
540e4f77a7
Feature #161 (In Progress) Load REC_PGRD records
...
improved debug output
2012-03-06 15:52:23 +04: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
Nikolay Kasyanov
e58e00ef2a
Feature #161 (In Progress) Load REC_PGRD records
...
Point coords definitely not floats
2012-03-05 00:04:36 +04: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
Nikolay Kasyanov
40e07bbd2a
Feature #161 (In Progress) Load REC_PGRD records
...
Struct sizes seems correct, but floats is broken
2012-03-03 18:27:38 +04:00