Marc Zinnschlag
c259b25fcf
Merge remote branch 'werdanith/soundmanagerrefactor'
2012-03-09 17:27:11 +01:00
Michael Papageorgiou
6f46f2b7a0
SoundManager: add the ability to play non-3d looping sounds
2012-03-09 18:10:23 +02:00
Alexander "Ace" Olofsson
5beee8598d
Giving the windows installer a more personal look.
2012-03-09 15:34:47 +01:00
Michael Papageorgiou
a309ef7b55
Corrected setPlaylist and added stopMusic
2012-03-09 03:56:29 +02:00
Michael Papageorgiou
44620ada86
SoundManager: Finish up with Task #172 , plus cleanup
2012-03-09 03:22:16 +02: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
gugus
82c6b0f92a
choice function. Do not work.
2012-03-07 18:52:27 +01:00
gugus
6f7752633a
there was no extension in the compiler context. Corrected. But Choice doesn't work.
2012-03-07 18:44:09 +01:00
gugus
39415f0b4a
fix compilation bug with Visual C++
2012-03-07 17:35:10 +01: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
gugus
4990ba48ed
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-07 09:47:46 +01:00
gugus
61914a70bd
Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-07 09:24:41 +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
Jason Hooks
39ff8d6a01
Compile error retry
2012-03-06 18:28:41 -05:00
Nikolay Kasyanov
540e4f77a7
Feature #161 (In Progress) Load REC_PGRD records
...
improved debug output
2012-03-06 15:52:23 +04:00
Michael Papageorgiou
03ea3bb62f
SoundManager: first attempt at refactoring. BROKEN
2012-03-06 01:21:00 +02:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05:00
Pieter van der Kloet
2429f3960f
Merge remote-tracking branch 'upstream/master' into launcher
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/launcher/datafilespage.cpp
2012-03-05 23:43:59 +01:00
Marc Zinnschlag
e992a75615
Merge remote branch 'scrawl/vertexcolours'
2012-03-05 22:45:56 +01:00
Marc Zinnschlag
25f5bdf7aa
Merge remote branch 'scrawl/weather'
2012-03-05 22:45:52 +01:00
scrawl
3ea2a9f05d
changeWeather bugfix
2012-03-05 19:13:11 +01:00
scrawl
f7b706d24e
use the vertex colours that morrowind supplies for a lot of meshes
2012-03-05 18:50:56 +01:00
Marc Zinnschlag
69f0ec99f1
implemented dialogue scripts
2012-03-05 16:56:14 +01:00
Michael Papageorgiou
1776ede9e1
Broken sound path fix
2012-03-05 16:06:46 +02:00
Marc Zinnschlag
65756db49e
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-03-05 11:34:16 +01:00
Marc Zinnschlag
4bdfbb6d4f
Merge branch 'master' into dialogue
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-03-05 11:34:06 +01:00
Marc Zinnschlag
4c240c644f
OpenEngine update (log fix)
2012-03-05 10:58:33 +01:00
Marc Zinnschlag
8f98718315
Merge remote branch 'scrawl/logfix'
2012-03-05 10:57:17 +01:00
Marc Zinnschlag
896c7d9fa5
Merge remote branch 'scrawl/batching2'
2012-03-05 10:54:55 +01:00
Marc Zinnschlag
e7fa1d94b8
Merge remote branch 'scrawl/shapefix'
2012-03-05 10:51:18 +01:00
scrawl
42a7375a0b
adjusted the batch region size, this was the cause for lights going on/off bug
2012-03-04 23:26:35 +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
scrawl
04a4e20bb3
fix ogre.log
2012-03-04 12:47:21 +01:00
Jason Hooks
a81ecb5f65
Bug 210 fix
2012-03-03 18:26:11 -05: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
d74b78a302
very minor performance improvement
2012-03-03 12:26:08 +01:00
scrawl
ba0365a427
collision shape scale fix
2012-03-02 16:47:39 +01:00
scrawl
5aabf22c16
collision shape scale fix
2012-03-02 16:47:13 +01:00
Marc Zinnschlag
1e998545c7
fixed log path
2012-03-02 15:15:44 +01:00
Marc Zinnschlag
12b7c6f1ac
Merge remote branch 'corristo/master'
2012-03-02 12:11:53 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Nikolay Kasyanov
70da2a2a99
removed tabs
2012-03-02 14:18:10 +04:00
Marc Zinnschlag
8da0925e70
Merge remote branch 'corristo/master'
2012-03-02 11:18:07 +01:00
Nikolay Kasyanov
fa3fbf940c
Fix for OS X 10.6 support
2012-03-02 14:10:11 +04:00