scrawl
1df7be7fee
- fixes to texture filtering setting
...
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
2012-04-09 00:10:42 +02:00
Marc Zinnschlag
e17a09e710
Merge remote branch 'scrawl/water'
2012-04-08 23:21:46 +02:00
Marc Zinnschlag
9e3299cae8
Merge remote branch 'scrawl/water'
2012-04-08 18:40:19 +02:00
Alexander "Ace" Olofsson
00b8ce6b35
Fix linker error in windows.
2012-04-08 18:22:41 +02:00
scrawl
a5c6207fe7
add setting to disable the underwater effect
2012-04-08 17:44:00 +02:00
scrawl
b1c84f28a9
Merge branch 'master' into water
...
Conflicts:
files/settings-default.cfg
2012-04-08 16:11:16 +02:00
scrawl
113bbfa253
removed the now unneccesary SG for transparent objects
2012-04-08 14:37:36 +02:00
Marc Zinnschlag
77604086e2
Merge branch 'autoequip'
2012-04-08 13:01:25 +02:00
Marc Zinnschlag
ab2a1297b0
exclude player from auto equip
2012-04-08 13:01:03 +02:00
Marc Zinnschlag
dcab6737e5
consider skills when auto equipping
2012-04-08 12:26:21 +02:00
Marc Zinnschlag
8e6c445111
Merge remote branch 'chris/sound'
2012-04-08 11:13:42 +02:00
Chris Robinson
59ccab0b2c
Add sound volume settings
2012-04-07 16:00:30 -07:00
Chris Robinson
752e89a268
Add a setting to select the sound device name
2012-04-07 15:28:38 -07:00
Chris Robinson
b8be867e6e
Work around a bug in the Windows OpenAL router
2012-04-07 14:58:52 -07:00
scrawl
c748252d33
weather fix again
2012-04-07 22:55:25 +02:00
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
.
2012-04-07 22:47:39 +02:00
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
2012-04-07 22:37:15 +02:00
Marc Zinnschlag
34a02fef45
consider item value when auto equipping
2012-04-07 20:09:09 +02:00
Marc Zinnschlag
d5a7d418dd
added getValue function to Class hierarchy
2012-04-07 19:53:49 +02:00
Marc Zinnschlag
f52b9cc162
Merge branch 'autoequip'
2012-04-07 18:48:30 +02:00
scrawl
044d649edd
Merge branch 'master' into water
2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
2012-04-07 16:55:32 +02:00
scrawl
dbf7547003
fixed first weather transition being instant
2012-04-07 16:33:03 +02:00
Roman Melnik
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
2012-04-07 17:30:20 +03:00
Roman Melnik
72b3f6121d
Windows Pinning: add files to CMakeLists.txt
...
Add new files (map_window and window_pinnable_base)
2012-04-07 12:37:15 +03:00
Marc Zinnschlag
b7614dd0ce
Merge remote branch 'chris/sound'
2012-04-06 22:09:34 +02:00
scrawl
dbde8405f7
Merge branch 'master' into water
2012-04-06 21:21:57 +02:00
scrawl
50702c5e84
Merge branch 'master' into water
2012-04-06 20:58:50 +02:00
Chris Robinson
87e8917c4d
Don't try to play sounds when no sound output is initialized
2012-04-06 10:43:14 -07:00
scrawl
c49d5dd40b
another sky tweak
2012-04-06 19:23:19 +02:00
scrawl
f008ca166b
restored moons like they were
2012-04-06 19:21:28 +02:00
scrawl
c0f991ac0a
underwater depth effect
2012-04-06 18:51:30 +02:00
scrawl
456eb95209
reversed sun and moon paths (sunrise at east)
2012-04-06 18:22:37 +02:00
scrawl
8316a4c2ec
add mrt dummy output to sky shaders
2012-04-06 17:21:56 +02:00
scrawl
c169f9e171
underwater tweaks
2012-04-06 16:11:08 +02:00
scrawl
2976625b00
better underwater
2012-04-06 15:51:57 +02:00
scrawl
ec3fe1ef00
no sun glare in the reflection
2012-04-06 15:17:54 +02:00
scrawl
393530e671
more or less fixed the sky for normal viewing angles, still disappears at a certain height though
2012-04-06 15:05:17 +02:00
scrawl
a41eee9a72
specular lighting
2012-04-06 14:07:52 +02:00
Marc Zinnschlag
8bf9b371c7
removed remains of input framelistener
2012-04-06 10:39:55 +02:00
Roman Melnik
ef0a185e11
Pinnable windows: hide hud elements
...
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.
Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
2012-04-06 01:17:23 +03:00
scrawl
e718d4b6f0
another sky fix
2012-04-05 22:36:48 +02:00
scrawl
b36c0d95b8
night transition fix
2012-04-05 22:11:04 +02:00
scrawl
e492a69c8f
Merge branch 'inputfix' into water
2012-04-05 21:27:59 +02:00
scrawl
a3151fe525
fixed input handling priority in the main loop
2012-04-05 21:16:51 +02:00
scrawl
8bfc81f398
Merge branch 'master' into water
2012-04-05 20:09:38 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
b8a470efcd
put transparent objects in a seperate render queue, in order to not mess up the mrt textures
2012-04-05 19:07:21 +02:00
Marc Zinnschlag
000cfad82d
Merge remote branch 'scrawl/gamesettings'
2012-04-05 18:07:47 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00