1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 18:35:20 +00:00

513 Commits

Author SHA1 Message Date
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
scrawl
4813a1ce9d Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
2012-03-13 16:00:59 +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
scrawl
8be661c802 Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
Conflicts:
	CMakeLists.txt
2012-03-07 13:29:59 +01: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
scrawl
04c141ddd5 Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
Conflicts:
	apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Marc Zinnschlag
be70d197e5 Merge branch 'next'
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Michael Papageorgiou
a1cbc7fb42 Altered getFver to fix a warning 2012-03-01 14:00:45 +02:00
Alexander "Ace" Olofsson
b6915a6090 Forgot that IsWow64Process would return false on a native 64-bit application 2012-03-01 01:03:31 +01:00
Jacob Essex
6924348696 Fixed some texture splatting issues with loading empty terrain cells 2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1 Start of a basic implementation of fake vertex colours 2012-02-29 23:05:22 +00:00
scrawl
f2c3616638 Merge branch 'next' into terrain_next
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	cmake/FindOGRE.cmake
2012-02-28 21:49:45 +01:00
Lukasz Gromanowski
9a4cd6c2b1 Fixes #200 - Paths with quotes for data-local option.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-27 23:56:58 +01:00
Jason Hooks
8d7a5f469b a few changes 2012-02-26 21:27:54 -05:00
Nikolay Kasyanov
1addef2cc3 added missing include for macospath.cpp 2012-02-25 17:47:57 +04:00
Marc Zinnschlag
728e9cce5a Merge remote branch 'lgro/config_fixes' 2012-02-24 09:03:48 +01:00
Lukasz Gromanowski
d97854be00 Bug fixes for configuration handling.
Corrected retrieving installation path from wine registry on MacOS.
Updated doxygen comments.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-23 23:21:17 +01:00
Lukasz Gromanowski
3da6af6e38 Bug fixes for configuration handling.
Added erasing double quotes from paths, corrected retriveing
installation path from wine registry. Updated doxygen comments.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-23 23:01:42 +01:00