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 |
|
scrawl
|
006970fd79
|
add MRT code to shaders
|
2012-04-04 19:53:41 +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
|
328bdaafb6
|
fixed a problem with the underwater compositor
|
2012-04-03 22:53:08 +02:00 |
|
scrawl
|
2fa9bac517
|
added fog
|
2012-04-03 22:04:37 +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 |
|
scrawl
|
342464530d
|
rotated map working
|
2012-04-02 19:37:24 +02:00 |
|
scrawl
|
ff15f28787
|
options for texture filtering and mipmaps
|
2012-04-02 18:01:49 +02:00 |
|
scrawl
|
39ee9e9ab8
|
setting for field of view
|
2012-04-02 17:51:51 +02:00 |
|
Sebastian Wick
|
6e19076dc5
|
fallback for ini importer
|
2012-04-02 17:07:18 +02:00 |
|
scrawl
|
5f2a674d93
|
fixed a typo
|
2012-04-02 16:14:39 +02:00 |
|
scrawl
|
00cc45c537
|
FPS is now a setting instead of commandline option
|
2012-04-02 16:10:54 +02:00 |
|
scrawl
|
fd662f937a
|
add settings for viewing distance and fog
|
2012-04-02 15:51:48 +02:00 |
|
scrawl
|
e5cc9adbb0
|
added settings for rendering distance of small objects
|
2012-04-02 15:30:29 +02:00 |
|
scrawl
|
2b4b941192
|
Merge branch 'master' into gamesettings
|
2012-04-02 15:21:10 +02:00 |
|
Sebastian Wick
|
16674ad141
|
open file for writing AFTER reading it :)
|
2012-04-02 14:42:01 +02:00 |
|
scrawl
|
e0631dd9be
|
Merge branch 'master' into minimap
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-04-02 14:38:02 +02:00 |
|
Sebastian Wick
|
89565bacd1
|
since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify
|
2012-04-02 14:34:21 +02:00 |
|
scrawl
|
b380e71832
|
fixed underwater wireframe mode
|
2012-04-02 14:32:21 +02:00 |
|
scrawl
|
1445ae992d
|
adding a setting to disable static geometry
|
2012-04-02 14:24:16 +02:00 |
|