scrawl
5341bf9504
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-03-03 15:51:58 +01:00
scrawl
ac0a23a68d
Fix initialization problem
2013-03-03 14:53:47 +01:00
scrawl
cf87708c1f
Magic effect icons for spells
2013-03-03 12:01:19 +01:00
scrawl
0f6fd80294
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwrender/npcanimation.cpp
files/mygui/openmw_settings_window.layout
2013-03-03 11:02:38 +01:00
Pieter van der Kloet
f2193bb1ba
Made the mainwindow use a .ui file and removed the stylesheet
2013-03-03 00:48:09 +01:00
scrawl
d8f2d0195a
Got rid of the texture rotation hack by rendering the cursor manually.
2013-03-01 18:45:52 +01:00
Marc Zinnschlag
0b629791a8
reverting loading bar layout
2013-02-28 20:40:32 +01:00
Lars Söderberg
f77ace0885
Removed the "hack" mygui.png and misc fixes for this.
2013-02-28 20:16:46 +01:00
vorenon
bd597f07ab
Centered the loading text
2013-02-28 19:22:10 +01:00
scrawl
8966e88050
Fix shadows
2013-02-27 16:07:15 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
284ba58e1e
Z-up conversion: global map, shader fix
2013-02-26 13:52:01 +01:00
scrawl
2e7bc1a368
Z-up conversion: local map, fix tcg
2013-02-26 13:39:10 +01:00
scrawl
3ef952172d
Z-up conversion: water, sky
2013-02-26 10:38:48 +01:00
scrawl
8aff033a0c
Atmosphere no longer does "real" alpha blending to blend with the horizon, this is in preparation for proper underwater viewport BG / fog
2013-02-25 18:29:11 +01:00
scrawl
a3afb91485
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-24 18:04:51 +01:00
Lars Söderberg
e32646ee50
Prettier repeated borders.
2013-02-24 16:57:40 +01:00
Lars Söderberg
62c5568ed9
Fix for the loadingbar to resemble vanilla Morrowind.
2013-02-24 16:57:07 +01:00
scrawl
0d6a3367d3
Water shader no longer depends on object shaders being enabled
2013-02-24 10:28:50 +01:00
scrawl
7046e7ae3d
Water fog fix
2013-02-23 09:02:05 +01:00
scrawl
01102f9c73
Don't emit if there wasn't enough movement
2013-02-23 05:53:20 +01:00
scrawl
db9e49968e
Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics
2013-02-23 04:13:51 +01:00
Nathan Jeffords
5e1ec9e128
improved book window layout
2013-02-22 08:32:54 -08:00
Emanuel Guevel
3dc28baa28
Remove "PinToggle" event from layout file
2013-02-20 01:31:10 +01:00
Emanuel Guevel
2dea86bbc7
Make the "lock window" button appealing
2013-02-20 01:30:42 +01:00
Emanuel Guevel
3ba3c71556
Make the "lock window" button to change state visually
2013-02-20 01:30:39 +01:00
scrawl
6cceb04adf
When a custom near clip plane is used, we need to fix up a second viewproj matrix manually to get proper depth values in the vertex shader. This fixes fog on reflections.
2013-02-19 03:08:00 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
scrawl
42883ec64b
cleanup
2013-02-18 02:33:53 +01:00
graffy76
ceefae81e8
fix for the opencs icon
2013-02-17 07:46:50 -06:00
scrawl
492e0f2ccf
Switched objects shaders to vertex lighting, to accomodate badly placed lights in morrowind.
...
Fixed a very obvious land <-> water seam.
2013-02-14 19:45:07 +01:00
scrawl
499f3ac0d1
Slightly better ripple normal blending. Not physically accurate at all, but looks good.
2013-02-05 16:40:41 +01:00
scrawl
3772cd9257
Refraction can be disabled separately now
2013-02-05 14:29:46 +01:00
scrawl
0f37c24d5f
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-04 21:55:41 +01:00
scrawl
e949765922
cloud blending now as before (0 -> 0.25 -> 1)
2013-02-04 19:21:47 +01:00
scrawl
bf037b7d29
Removed problematic ModVertexAlpha method, now done in shader
2013-02-04 18:03:03 +01:00
scrawl
15e51b76de
Experimental: Directional shading on local map, separated out refraction render, no longer uses screen depth
2013-02-03 15:46:23 +01:00
scrawl
a461b282c1
water ripples (experimental)
2013-02-01 23:43:23 +01:00
scrawl
3ec703e6af
Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics
2013-02-01 16:25:54 +01:00
Emanuel Guevel
af9e126487
Add unicode number for ellipsis (…) to code range
2013-01-20 17:50:32 +01:00
lazydev
aa514a53d9
Console font change to provide possibility to show cyrillic symbols
2013-01-15 02:22:14 +04:00
scrawl
30136eb449
Update settings UI
2013-01-12 06:36:48 +01:00
scrawl
55769aaf91
Fix selection buffer (i.e. item selection on the inventory character preview) when object shaders were disabled
2013-01-10 01:46:00 +01:00
scrawl
35015ef110
Change default settings to use no object shaders and per vertex lighting, as some lights in MW look clearly broken with per pixel lighting enabled (e.g. fireplace in census office, ghostfence)
2013-01-09 23:11:15 +01:00
scrawl
bd8d793fec
Removing gamma correction due to caused inconsistencies.
2013-01-09 21:41:40 +01:00
scrawl
111e38ef25
Revert "fog now distance based instead of depth"
...
This reverts commit 7ee038fdd7
2013-01-09 20:18:26 +01:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
1718d735b5
Fix menu/journal/book/scroll buttons when using localised MW-installations
...
This patch implements a custom widget that can switch its texture on-the-fly, making it obsolete having to use an atlas to get a hover animation. This also removes the predefined size restriction and should now work with all button texture sizes.
2013-01-03 01:09:03 +01:00
scrawl
a6c3e06e54
fixed fog in some cells
2012-12-15 20:36:17 +01:00
scrawl
5f676f9c6b
Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwscript/miscextensions.cpp
2012-12-11 22:28:23 +01:00
scrawl
44010974fc
workaround for HLSL error X4579
2012-12-10 12:34:28 +01:00
scrawl
c4facc233e
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-12-01 11:30:51 +01:00
scrawl
11a8d5d70a
Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap
2012-11-10 21:19:41 +01:00
scrawl
7c22690116
Merge branch 'next' into globalmap
2012-11-10 21:19:10 +01:00
scrawl
5fdc7ad809
forgot to add file
2012-11-10 13:07:26 +01:00
scrawl
ace9ee9c83
persuasion dialog
2012-11-09 20:18:38 +01:00
scrawl
38828acac9
transparent overlay
2012-11-04 12:13:04 +01:00
Marc Zinnschlag
648b53ef93
removed unused launcher.cfg file
2012-10-31 10:09:27 +01:00
scrawl
234716daa6
finished spell creation
2012-10-23 11:42:38 +02:00
scrawl
9f821e5df2
fix shaders
2012-10-22 16:56:43 +02:00
scrawl
0a19b56031
fix gold label
2012-10-17 18:49:49 +02:00
scrawl
e80394c0b5
fix training limit
2012-10-17 18:48:29 +02:00
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
Lukasz Gromanowski
5e9153e2b8
Issue #423 : Wrong usage of "Version"
...
Remove "Version" line from openmw.desktop file (according to
http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s05.html
it's not required).
Fixes #423
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-10-16 23:16:14 +03:00
scrawl
f154031e54
last bits of the gui
2012-10-11 18:26:29 +02:00
gugus
1f4de03613
oooups
2012-10-06 22:33:10 +02:00
gugus
85d9357e3a
Travel GUI
2012-10-06 17:52:46 +02:00
scrawl
025e820703
abstracted code and use it in enchanting window as well
2012-10-03 15:36:10 +02:00
scrawl
1c0dd3ccc5
some editing code
2012-10-03 15:06:54 +02:00
scrawl
7ee038fdd7
fog now distance based instead of depth
2012-10-03 12:03:07 +02:00
scrawl
636f297f10
enchant
2012-09-28 16:52:42 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
scrawl
73c69e8eda
video playback
2012-09-25 02:35:50 +02:00
scrawl
d393f551ed
edit effect dialog
2012-09-24 08:09:16 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
scrawl
f45a6b71a9
Merge branch 'master' into next
2012-09-22 20:48:55 +02:00
Marc Zinnschlag
63772e2301
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-22 18:27:51 +02:00
scrawl
dbf59d14dc
water gamma correction
2012-09-22 16:52:53 +02:00
Nikolay Kasyanov
8a81a4a334
Fixed typo on openmw.cfg that caused launcher crash on OS X
2012-09-22 13:03:58 +04:00
scrawl
8214966d44
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
2012-09-20 17:41:14 +02:00
scrawl
e5e3d829d0
player arrow & markers
2012-09-20 17:30:09 +02:00
scrawl
86cfc91ef3
global map rendering
2012-09-20 13:56:37 +02:00
Marc Zinnschlag
87a9373a56
Merge remote-tracking branch 'scrawl/gamma' into next
2012-09-20 09:01:58 +02:00
scrawl
b9a3f8e8d7
gamma slider
2012-09-19 23:47:42 +02:00
scrawl
d9f6072f02
gamma correct rendering & adjustment setting
2012-09-19 23:25:07 +02:00
scrawl
32de090079
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
2012-09-19 19:34:02 +02:00
scrawl
bf5e30b24f
everything done except health/mana restore
2012-09-19 02:53:06 +02:00
scrawl
ab698bb401
date time label
2012-09-18 20:53:32 +02:00
scrawl
0ba996f290
dialog layout
2012-09-18 18:29:03 +02:00
scrawl
42d25c0af0
fix resources, I renamed those in the last commit, but only in one place
2012-09-16 20:56:49 +02:00
scrawl
76b494100e
finished?
2012-09-15 17:12:42 +02:00
scrawl
95f3a20e2c
Merge branch 'master' into levelup
2012-09-15 14:25:37 +02:00
scrawl
b76a28f69c
beginnings of the gui
2012-09-14 19:44:00 +02:00
scrawl
a308d2e38a
fixed exception, fixed armor label obscuring the items
2012-09-14 15:33:24 +02:00
scrawl
6ac2a12296
item selection working on the preview
2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0
race selection preview
2012-09-13 19:03:31 +02:00
scrawl
5155339cb6
character preview working
2012-09-13 14:56:50 +02:00
scrawl
4f3eb3c34a
character preview WIP
2012-09-13 00:54:32 +02:00
scrawl
a8d9aa98b1
some fixes
2012-09-11 19:18:26 +02:00
