scrawl
|
88c50c5171
|
Merge branch 'master' into water
|
2012-04-05 15:38:46 +02:00 |
|
scrawl
|
1b89a9e203
|
various fixes
|
2012-04-05 15:30:55 +02:00 |
|
Dmitry Marakasov
|
84b475130a
|
Add missing include
|
2012-04-05 15:03:28 +02:00 |
|
scrawl
|
e1bde415f5
|
typo
|
2012-04-05 14:22:44 +02:00 |
|
scrawl
|
43fd0352f4
|
removed unneeded lines
|
2012-04-05 14:21:57 +02:00 |
|
scrawl
|
f49131e1b8
|
renamed setting, automatically disable MRT when unsupported
|
2012-04-05 13:09:59 +02:00 |
|
Marc Zinnschlag
|
1201c271b2
|
Merge remote branch 'swick/initocfg'
|
2012-04-05 12:43:00 +02:00 |
|
scrawl
|
f6342cfd60
|
fixed viewport background color, fixed indentation of some old functions
|
2012-04-05 11:52:06 +02:00 |
|
scrawl
|
5664d879a5
|
fixed some sky objects
|
2012-04-05 11:40:56 +02:00 |
|
scrawl
|
ab8b74dcac
|
forgot adding a file
|
2012-04-05 08:58:21 +02:00 |
|
scrawl
|
3f05aba76d
|
got MRT working, some minor quirks to solve (black viewport background)
|
2012-04-05 01:21:36 +02:00 |
|
Sebastian Wick
|
f7bfea5861
|
typo 2 -.-
|
2012-04-05 00:16:44 +02:00 |
|
Sebastian Wick
|
56c9992b29
|
typo
|
2012-04-04 23:52:42 +02:00 |
|
Sebastian Wick
|
8c84f68dab
|
fix for older boost versions; unsigned warning
|
2012-04-04 23:51:22 +02:00 |
|
Marc Zinnschlag
|
6fd3d5c776
|
Merge remote branch 'lgro/master'
|
2012-04-04 23:19:30 +02:00 |
|
Lukasz Gromanowski
|
cd2789b15a
|
Revert "Issue #225: Correction to commit ae98904."
This reverts commit 0e5c90d3e7 .
|
2012-04-04 21:05:19 +02:00 |
|
Sebastian Wick
|
5dd65c11ee
|
forgot to save the file
|
2012-04-04 21:04:52 +02:00 |
|
Sebastian Wick
|
57ae1bdc43
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg
Conflicts:
apps/openmw/main.cpp
|
2012-04-04 20:58:02 +02:00 |
|
scrawl
|
eb67afe552
|
added MRT output to terrain material
|
2012-04-04 20:18:08 +02:00 |
|
Sebastian Wick
|
6ccb32d26c
|
import nosound option
|
2012-04-04 20:06:31 +02:00 |
|
Sebastian Wick
|
d3a6484bbc
|
set the default value for --fallback the right way
|
2012-04-04 19:59:46 +02:00 |
|
Sebastian Wick
|
a974d88cf1
|
Revert "set a default value for --fallback"
This reverts commit 94a220dcdd .
|
2012-04-04 19:58:04 +02:00 |
|
Sebastian Wick
|
94a220dcdd
|
set a default value for --fallback
|
2012-04-04 19:52:07 +02:00 |
|
scrawl
|
6442d49e16
|
render queue groups, sky fix
|
2012-04-04 18:53:40 +02:00 |
|
Sebastian Wick
|
48b7b03453
|
typo; World::getFallback(std::string key, std::string def)
|
2012-04-04 16:15:15 +02:00 |
|
Sebastian Wick
|
16e7bf353a
|
remove debug message
|
2012-04-04 16:08:46 +02:00 |
|
Sebastian Wick
|
de510d445b
|
throw an error if the --fallback syntax is wrong
|
2012-04-04 15:23:14 +02:00 |
|
Sebastian Wick
|
329ba24eab
|
streamlined command line options
|
2012-04-04 15:11:30 +02:00 |
|
scrawl
|
cc4076d42a
|
basic noise
|
2012-04-03 21:16:43 +02:00 |
|
scrawl
|
fe63f2b2aa
|
first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)
|
2012-04-03 19:10:02 +02:00 |
|
Marc Zinnschlag
|
e403c7158a
|
Merge remote branch 'gus/DialogueSystem'
|
2012-04-03 18:27:36 +02:00 |
|
Marc Zinnschlag
|
cc9696cc2c
|
Merge remote branch 'scrawl/minimap'
|
2012-04-03 18:26:20 +02:00 |
|
scrawl
|
6481cf87fc
|
cleanup resources
|
2012-04-03 17:07:16 +02:00 |
|
scrawl
|
052cc47ee9
|
fixed waterAdded
|
2012-04-03 16:53:33 +02:00 |
|
scrawl
|
b3a186e729
|
simple water without shaders that uses original MW textures
|
2012-04-03 16:37:54 +02:00 |
|
scrawl
|
c1693a0c63
|
Merge branch 'minimap' into water
|
2012-04-03 15:37:11 +02:00 |
|
scrawl
|
51e33cc090
|
fixed map of some interiors
|
2012-04-03 15:34:13 +02:00 |
|
scrawl
|
8aea311797
|
added visibility flags for everything
|
2012-04-03 15:13:47 +02:00 |
|
scrawl
|
fd45208196
|
re-added code for reflection & refraction rendering
|
2012-04-03 14:23:23 +02:00 |
|
scrawl
|
d393f2dd4b
|
Merge branch 'master' into water
|
2012-04-03 14:06:14 +02:00 |
|
Sebastian Wick
|
329d59e52b
|
typo
|
2012-04-03 02:17:15 +02:00 |
|
Sebastian Wick
|
73705dadf6
|
parse fallback with boost program option custom validators
|
2012-04-03 02:14:39 +02:00 |
|
Sebastian Wick
|
d87dffa948
|
should work... but does not even compile
|
2012-04-03 01:47:43 +02:00 |
|
Sebastian Wick
|
2d23d79fd5
|
allways merge fallback; better syntax
|
2012-04-03 00:44:26 +02:00 |
|
Marc Zinnschlag
|
26371a82a5
|
Merge remote branch 'scrawl/crashfix'
|
2012-04-02 23:53:07 +02:00 |
|
Lukasz Gromanowski
|
0e5c90d3e7
|
Issue #225: Correction to commit ae98904 .
Changed pointer to LandData struct to simple member variable.
|
2012-04-02 23:50:53 +02:00 |
|
Sebastian Wick
|
ab9c430632
|
fallback in apps/openmw; fix for apps/mwiniimporter
|
2012-04-02 20:47:09 +02:00 |
|
scrawl
|
d4a2bdfa3d
|
fix crash when hardware occlusion queries unsupporetd
|
2012-04-02 20:46:42 +02:00 |
|
scrawl
|
bd9e165e3f
|
Merge branch 'master' into water
|
2012-04-02 19:44:25 +02:00 |
|
scrawl
|
16481b0594
|
Merge branch 'master' into minimap
|
2012-04-02 19:38:36 +02:00 |
|