mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 07:26:38 +00:00
Code Issues Releases Wiki Activity
24063 commits 115 branches 76 tags 128 MiB
Commit graph

1548 commits

Author SHA1 Message Date
Marek Kochanowicz
b31f0dfe1f Raster status icons. 2013-05-26 17:28:27 +02:00
scrawl
de5a08a07d Version should be 100 for GLSLES 2013-05-25 05:40:35 +02:00
scrawl
c2c88acc7b GLSLES: only the fragment shader needs precision explicitely set. 2013-05-25 04:26:40 +02:00
scrawl
cc747d8ae4 GLSL ES: precision qualifiers are required 2013-05-25 04:23:07 +02:00
scrawl
1e7cf4ae1c GLES2 experiment 2013-05-25 04:15:24 +02:00
riothamus
885d12e867 updated hud layout 2013-05-22 22:06:22 -04:00
riothamus
39bd8894a9 Bug 787 2013-05-20 16:39:24 -04:00
Marc Zinnschlag
54f56b0515 Merge remote-tracking branch 'graffy76/usersettings' 
Conflicts:
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/doc/view.hpp
 2013-05-16 18:04:55 +02:00
Marek Kochanowicz
60893f4b00 New icons from nomadic1 finally. Including dialogue-greetings AKA Ave 
Caesar icon.
 2013-05-14 17:57:35 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
scrawl
90b7df439f Fix image buttons 2013-05-08 13:55:15 +02:00
graffy76
f6203cac2a update for master 2013-05-07 20:33:42 -05:00
scrawl
8845c0cee1 Camera relative sky rendering. Now we no longer need to keep sky position in sync with camera. 2013-05-07 17:38:24 +02:00
scrawl
f1413ca56b Synced font code ranges. 2013-05-06 15:17:17 +02:00
scrawl
ef9f0b2fc0 Fix size of quest index 2013-05-05 11:56:08 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
03f4e91ceb Unrelated shadows fix 2013-05-03 23:08:46 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Glorf
f1a659e2ac Bugfix #730 2013-05-02 14:49:30 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
Nathan Jeffords
718af692c9 reworked journal to match bethesda's implemenation 2013-04-24 20:20:01 -07:00
Nathan Jeffords
85595245ab Updated journal layout to match Bethesda's version more closely 2013-04-24 20:20:00 -07:00
Emanuel Guevel
c0102954f1 Add non-breaking space to font code range 2013-04-25 01:42:09 +02:00
Marek Kochanowicz
03af0a8ac9 Adding more icons from nomadic1, replacing older with recently redoned. 2013-04-14 10:02:48 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
scrawl
2c70074dd7 Fix combinedAlpha 2013-04-11 15:17:47 +02:00
Chris Robinson
9d29921913 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-09 15:12:19 -07:00
scrawl
0e7d555cdf Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM. 2013-04-09 20:31:00 +02:00
Chris Robinson
01a1a0b846 Merge remote-tracking branch 'zini/master' into nifogre 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 2013-04-08 11:46:57 -07:00
scrawl
343e2027af Support NIF detail maps 2013-04-08 15:17:30 +02:00
Chris Robinson
3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-07 17:24:47 -07:00
Chris Robinson
88c81bfb24 Apply polygon_mode to objects 2013-04-07 07:38:43 -07:00
scrawl
4daaa4030d Added shader based MyGUI render manager to allow using Ogre's next generation render systems. 2013-04-07 00:12:04 +02:00
Chris Robinson
e50b6b1cfe Apply texture matrix 0 in the object shader 2013-04-06 09:45:26 -07:00
scrawl
75b462b974 If alpha rejection was forced, we also need to force depth_write and depth_check 2013-04-05 18:24:12 +02:00
Marek Kochanowicz
01314b7c08 addin more nomadic icons 2013-04-05 12:08:35 +02:00
Marc Zinnschlag
8dd7f0c53a Merge remote-tracking branch 'scrawl/normalmap' 2013-04-03 19:46:06 +02:00
scrawl
a9b56eedc3 Support NIF "glow maps", which are basically an emissive channel. 2013-04-03 18:51:40 +02:00
Glorf
ae3e4ecf8b Finished enchanting 2013-04-03 18:02:30 +02:00
scrawl
5625d73d84 Bump texture support 2013-04-03 17:16:34 +02:00
scrawl
857f2b33db Fix companion layout align 2013-03-31 14:48:48 +02:00
scrawl
bc6e1fd981 Add missing files 2013-03-31 14:36:03 +02:00
scrawl
b0199c703c Companion UI 2013-03-31 13:13:46 +02:00
Marek Kochanowicz
49b5b90cd5 png icons from nomadic and my rastered icons in raster folder. 2013-03-31 10:13:01 +02:00
Marek Kochanowicz
faf293bd6d Removing old directory. 2013-03-31 09:50:35 +02:00
scrawl
a031c77619 Improved enchanting layout 2013-03-30 15:56:14 +01:00
Marc Zinnschlag
a359ba6a2f Merge remote-tracking branch 'scrawl/graphics' 2013-03-30 11:18:41 +01:00
vorenon
a49e524541 Reduced width of textboxes in race menu 
The width of the text box was too large and MyGui didn't align the texts properly. Fixed with the help of the MyGui layout editor.
 2013-03-30 03:07:34 +01:00
vorenon
f93cefa201 Changed Y position of the textboxes 2013-03-29 21:26:40 +01:00
vorenon
35a6ca010a Adjusted textbox height in race menu 2013-03-29 20:43:17 +01:00
scrawl
a39c129954 Clamp individual light attenuation at 1 2013-03-29 19:53:52 +01:00
scrawl
7ad1e962e0 Merge branch 'master' into graphics 2013-03-29 19:39:18 +01:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Marek Kochanowicz
623f9c2a58 A new icon for misc iteams. I really hope that scales will do. 2013-03-27 19:52:12 +01:00
Marek Kochanowicz
cf0c55b37f New random-item. Looks a lot better. 2013-03-26 10:28:43 +01:00
Marek Kochanowicz
37a1fb6b7c Adding ingredient.svg icon. I need to work on random-item and scrap container icon. 2013-03-26 09:41:26 +01:00
Marek Kochanowicz
b7f95cd271 Random item (dice). Container.svg needs to be scraped, I'm afraid. 2013-03-24 10:19:46 +01:00
Marek Kochanowicz
3b5e202b13 Update the status icons. X as removed.svg and backgrounds for status icons stolen from oxygen emblems :P It gives clear look for it. 2013-03-23 19:53:10 +01:00
Marek Kochanowicz
e97319c0bb Drawer as container icon looks actually quite good IMHO. 2013-03-23 19:32:37 +01:00
Marek Kochanowicz
cb58ee126e Drawer as container icon. Look a little better the old crappy chest but changes are needed. 2013-03-23 19:29:52 +01:00
Marek Kochanowicz
59233e54b2 changing potion.svg according to pvdk sugestions 2013-03-23 18:18:19 +01:00
Marek Kochanowicz
43e863b020 Forgot to place the icons in the middle of the page. 2013-03-23 16:22:17 +01:00
Marek Kochanowicz
001b56714a Adding new status icons svg files. Qt svg does not allow blur to be used so I think that we should make png files of it but first information on the actual resolution needed is required... 2013-03-23 16:16:23 +01:00
scrawl
7beda509fe Lighting should be done in view space instead of object space, so that attenuation also works correctly for scaled objects 2013-03-23 09:53:38 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
Marek Kochanowicz
df8600e636 New anvil icon (repair.svg), edited weapon.svg (added new gradient on dagger blade) and light source.svg (clear to see what happend). container icon is still work in progress. 2013-03-22 18:06:11 +01:00
scrawl
20774f8f81 Added merchant repair feature 2013-03-22 14:13:10 +01:00
Marek Kochanowicz
e46097cd2e Icons. Currently activator, apparatus, book, container (work in progress), light source, potion, static, weapon. 2013-03-21 20:18:18 +01:00
scrawl
11aed7474e Shadow cast on water 2013-03-20 18:34:54 +01:00
scrawl
4cbb202306 Several tooltip fixes 2013-03-20 03:31:01 +01:00
scrawl
6c1ff8caca Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwworld/weather.cpp
	components/fileorderlist/model/datafilesmodel.cpp
 2013-03-20 02:29:03 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
scrawl
83932ebfe8 HLSL shader fix 2013-03-16 14:36:37 +01:00
scrawl
fdcbdbf35d Rewrote layout tooltips to use the new box layout system, fixes word wrapping delay 2013-03-13 19:44:34 +01:00
pvdk
30f3fbac3c Fixed paths to OpenMW icons 2013-03-12 21:21:08 +01:00
scrawl
4c588cbab6 Levelup dialog is now dynamic; added level descriptions 2013-03-12 17:18:47 +01:00
pvdk
31ba332647 Moved Windows icon to files/launcher 2013-03-12 04:05:14 +01:00
pvdk
75f86f3a85 Some changes to the stylesheet and other small GUI improvements 2013-03-12 01:03:15 +01:00
Pieter van der Kloet
64c5af314d Removed grayish pixel from the clear button, looks weird with dark colors 2013-03-11 01:53:54 +01:00
Pieter van der Kloet
b4d408af5d Added actions to datafiles.ui and implemented them in the launcher 2013-03-11 01:48:01 +01:00
Pieter van der Kloet
5e13614e08 Improved appearance of combobox and when using dark color themes 2013-03-11 01:34:12 +01:00
Sandy Carter
391bad2ccb put .desktop file in the right directory 2013-03-09 14:43:44 -05:00
Marc Zinnschlag
2a9d15cd9f Merge remote-tracking branch 'scrawl/master' 2013-03-07 16:42:07 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
Pieter van der Kloet
9145fb210b Merge remote-tracking branch 'upstream/master' into opencsui 2013-03-07 03:02:03 +01:00
Pieter van der Kloet
7504ae675b Implemented a file dialog for the editor using launcher .ui 2013-03-07 03:00:59 +01:00
scrawl
7f8d659f3c Fix transparency sorting 2013-03-05 17:09:20 +01:00
scrawl
ff30bef3b2 Mipmap fix 2013-03-05 14:27:05 +01:00
scrawl
2486ec6cb9 Material fixes (vertex colors, alpha) 2013-03-05 13:51:48 +01:00
Marc Zinnschlag
8a887a0aef Merge remote-tracking branch 'potatoesmaster/tradewindow' 2013-03-04 19:42:51 +01:00
Marc Zinnschlag
ac810faa7e Merge remote-tracking branch 'scrawl/master' 2013-03-04 19:36:58 +01:00
scrawl
9f0bd95ef1 Added BM trees to transparency overrides 2013-03-04 17:57:35 +01:00
scrawl
cab5315a8e Disable mipmaps generation 2013-03-04 16:28:20 +01:00
Emanuel Guevel
215d45aaf7 Make trade window's "max sale" button clickable 
The HBox widget above it was stealing the input events.
 2013-03-04 12:24:42 +01:00
scrawl
f1d35b73b8 Cleanup 2013-03-03 19:52:20 +01:00
scrawl
c9fefc7f5d Simpler, more lightweight underwater effect, changed colors to match vanilla better 2013-03-03 19:28:11 +01:00
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
scrawl
369db182de actual progress bar, performance optimization 2012-09-11 16:53:49 +02:00
scrawl
2b339f6c0f loading screen 2012-09-11 16:37:54 +02:00
scrawl
ad66ebf84f fix button align on 2 windows 2012-09-10 14:31:19 +02:00
scrawl
996e6280d8 more spell buying window cleanup 2012-09-10 14:10:01 +02:00
scrawl
ba0acd4056 changed some text colors 2012-09-10 13:52:37 +02:00
scrawl
fde69d0c87 Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing 2012-09-10 13:40:34 +02:00
scrawl
bc6a1979b0 replaced everything with the new method 2012-09-10 13:39:22 +02:00
Marc Zinnschlag
273ac0a97f Merge branch 'spellbuying' 2012-09-10 13:16:02 +02:00
scrawl
b66c8099eb new system for dynamic sizing of buttons & text boxes 2012-09-10 11:20:27 +02:00
scrawl
bb267dddf6 some stats window cleanup 2012-09-09 23:50:57 +02:00
Marc Zinnschlag
3fad1c0786 fixed a crash 2012-09-09 20:43:21 +02:00
Adam Hogan
08410b9062 Renamed SpellBuyingWindow, took some suggestions from scrawl 2012-09-09 14:10:07 -04:00
Adam Hogan
ebf80943a9 Added spell buying window 2012-09-08 18:17:03 -04:00
Marc Zinnschlag
ef6f033dd1 Merge branch 'multidata' 2012-09-04 11:02:28 +02:00
Marc Zinnschlag
e2bf4694cb Merge remote-tracking branch 'scrawl/master' 2012-08-31 09:22:32 +02:00
scrawl
ba43f2997f fix missing character in font for french morrowind version, thanks to jvoisin 2012-08-30 22:08:30 +02:00
scrawl
dbe3cca828 added a separate core.xml file that works with the mygui layout editor 2012-08-29 13:11:06 +02:00
Marc Zinnschlag
4f411ff1eb Merge remote-tracking branch 'scrawl/master' 2012-08-29 11:17:33 +02:00
scrawl
6ad08dfd33 added settings for crosshair & subtitles 2012-08-29 11:15:17 +02:00
scrawl
5370fecb6f fix a small input focus issue with the map 2012-08-29 10:51:36 +02:00
scrawl
7eaf5e7f0f changed the markers to look more like morrowind's (hover effect) 2012-08-28 18:40:11 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
scrawl
6161f81c24 last bits of the quick key menu. 2012-08-27 20:44:14 +02:00
scrawl
c5e55d3cac fix screenshot function 2012-08-27 15:51:01 +02:00
scrawl
c0f27bd5ef magic selection window 2012-08-26 11:37:33 +02:00
scrawl
fab4cfecb1 some unfinished work on quick keys window 2012-08-26 10:52:06 +02:00
scrawl
132da92391 Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem 2012-08-16 13:20:53 +02:00
Marc Zinnschlag
b0506e2220 re-enabling support for multiple data directories 2012-08-16 12:59:28 +02:00
Marc Zinnschlag
f9693ab33a Merge remote-tracking branch 'scrawl/shadersystem' 2012-08-16 12:03:03 +02:00
scrawl
4ae0a5c02e fix silhouettes around objects above the water 2012-08-15 19:29:00 +02:00
Pieter van der Kloet
9501e133f5 Updated the EB Garamond font to a higher-resolution version 2012-08-14 03:23:57 +02:00
scrawl
67577c6192 UI cursor & camera sensitivity sliders 2012-08-13 18:48:50 +02:00
scrawl
c7b8787c32 "reset to defaults" button, invert y axis button 2012-08-13 02:55:22 +02:00
scrawl
bc6e4feedc hotkey window first version 2012-08-13 01:26:15 +02:00
scrawl
976ad7a301 key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw 2012-08-12 22:59:58 +02:00
scrawl
86d6f190bf Input system rewrite 2012-08-12 20:45:02 +02:00
scrawl
8ac2d11f56 changed shading to be more like MW (completely replace material ambient with vertex colors if present), fixes some too dark daedric ruins 2012-08-11 14:42:14 +02:00
scrawl
f58a4ada7a Merge branch 'master' into shadersystem 2012-08-11 14:28:31 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
scrawl
993c7150dc tweaked depth bias 2012-08-07 22:43:11 +02:00
scrawl
15a16aeba1 Fixed DirectX HLSL shaders and re-enabled them in the gui 2012-08-01 04:11:16 +02:00
scrawl
37c7becb07 some potential compability fixes 2012-07-25 23:53:06 +02:00
scrawl
3feb4ce61b terrain lod morph fix 2012-07-25 19:33:21 +02:00
scrawl
8c8228a15c fix terrain num lights setting 2012-07-24 00:08:53 +02:00
scrawl
3ebc6fd590 fixed a settings window bug 2012-07-23 20:50:56 +02:00
scrawl
a70f93b024 fix "Crash when running openmw with --start="XYZ", remove HLSL for windows 2012-07-23 20:12:42 +02:00
scrawl
9f9183ff73 depth bias 2012-07-23 18:25:20 +02:00
scrawl
bc7876e980 use alpha map for moons 2012-07-23 13:04:48 +02:00
scrawl
f0b3142966 switch to glsl 1.2 2012-07-23 02:54:50 +02:00
scrawl
6bfcf2bc1b - exchanged the preprocessor again, no warnings now 
- disable line directives for now, causing some trouble
 2012-07-22 02:45:39 +02:00
scrawl
17a5c22c8f don't use globbing 2012-07-20 23:31:49 +02:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
41791ccaa2 add file 2012-07-20 16:44:40 +02:00
scrawl
014396e80c remove the plugins.cfg files, do not enforce CG plugin 2012-07-20 16:44:03 +02:00
scrawl
21728020f6 fixed the water on local map 2012-07-20 14:45:42 +02:00
scrawl
f5ffea4d4b new button, water timescale 2012-07-19 23:30:41 +02:00
scrawl
e077814a8c water 2012-07-19 22:23:07 +02:00
scrawl
9d7470e14c temp commit 2012-07-19 20:18:34 +02:00
scrawl
739455e6f8 new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc 2012-07-19 16:23:30 +02:00
scrawl
778e59ee37 terrain as it was before, with about 4x less code 2012-07-15 08:21:43 +02:00
scrawl
29f91753f7 correction 2012-07-14 18:44:03 +02:00
scrawl
93c641efa7 terrain albedo 2012-07-14 18:25:43 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2012-07-14 11:16:35 +02:00
scrawl
16c2ea3a75 terrain colourmap 2012-07-14 11:13:38 +02:00
scrawl
1429c8d5cb copy&paste mistake 2012-07-13 12:43:48 +02:00
scrawl
fb109ec7e2 use debug versions of ogre plugins in debug mode 2012-07-13 11:30:47 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
scrawl
b8384162b6 merge 2012-07-13 06:16:55 +02:00
scrawl
cd6e9986b6 forgot to add files 2012-07-11 09:09:38 +02:00
scrawl
ad7383be43 sky 2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b settings tab "shadows" 2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc shader mode button in settingswindow 2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47 sync mrt_output setting 2012-07-11 02:31:03 +02:00
scrawl
1a9f59d5d4 shadows 2012-07-10 00:07:33 +02:00
scrawl
07fd9986ef accidently removed the map. 2012-07-09 20:14:07 +02:00
scrawl
b803d0e949 converted shadow caster shader 2012-07-09 19:46:36 +02:00
scrawl
81d30ff63a temp commit 2012-07-09 19:20:41 +02:00
scrawl
e517e75d09 update 2012-07-07 01:25:14 +02:00
scrawl
a095572205 fixed some textures, started with sky 2012-07-06 10:31:48 +02:00
scrawl
71c865e2e9 let there be light 2012-07-06 07:10:10 +02:00
scrawl
33c48b9481 update 2012-07-06 04:28:08 +02:00
scrawl
8e683c2e05 vertex colors 2012-07-05 01:38:33 +02:00
scrawl
9bd888d9a1 transparency 2012-07-05 00:39:25 +02:00
scrawl
f8e3213996 fog, mrt depth 2012-07-04 16:57:14 +02:00
scrawl
de9b7a51de change glsl #version, remove CG from required libraries 2012-07-04 00:33:09 +02:00
scrawl
4ea6530772 hello world. 2012-07-04 00:26:57 +02:00
scrawl
d27863bf8e rename layout files to .layout to get them recognized by layout editor 2012-07-03 11:34:20 +02:00
scrawl
246c6493df Merge branch 'master' into graphics 2012-06-08 17:29:36 +02:00
scrawl
b886aea298 change console skin to MW_Window and set the selected object refID as window title 2012-06-02 12:31:23 +02:00
scrawl
fbaedd2c3a new underwater colors 2012-05-30 16:20:35 +02:00
scrawl
298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 2012-05-29 18:33:01 +02:00
scrawl
30461438f6 still left: spell success formula 2012-05-29 12:35:03 +02:00
scrawl
c7268233df spell window layout & opening/closing/pinning logic 2012-05-29 09:02:22 +02:00
scrawl
1b561ce91f Merge branch 'master' into next 2012-05-29 06:56:23 +02:00
scrawl
69e6bc6588 add water settings to settings window 2012-05-29 06:45:44 +02:00
scrawl
5d03e86613 added field of view and texture filtering to settings window 2012-05-29 04:54:54 +02:00
scrawl
6945afe95b alchemy window layout 2012-05-29 02:57:19 +02:00
scrawl
6014a90002 added tooltip delay option 2012-05-28 09:46:05 +02:00
scrawl
8f667580bb ogre 1.8 final release compability fixes 2012-05-27 23:12:45 +02:00
scrawl
10cfe0f5bc Issue #295: Class creation dialogs tooltips; plus tons of other improvements 2012-05-27 06:39:10 +02:00
scrawl
63213b36bf Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind 2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7 - Issue #296: Clicking on HUD elements shows/hides the respective window 
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
 2012-05-26 21:09:21 +02:00
scrawl
750259973e potion creating works, most of the values are bogus 2012-05-25 18:00:13 +02:00
scrawl
1df1b521a4 show the list of potion effects 2012-05-25 16:20:57 +02:00
scrawl
09c870ad68 first alchemy window layout (not pretty) 2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68 merged by branches together, starting with alchemy window 
Merge branch 'guimode_stacking' into next

Conflicts:
	apps/openmw/mwgui/mode.hpp
 2012-05-24 15:57:23 +02:00
scrawl
c2b818373e adjust tooltip skin, now is never transparent 2012-05-24 15:11:45 +02:00
scrawl
6ea7bdb224 vsync & fps buttons, sound volume apply fix 2012-05-24 11:50:48 +02:00
scrawl
9b94edd561 audio tab with volume sliders 2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208 some unrelated gui cleanup 2012-05-24 03:50:02 +02:00
scrawl
689cf7ce05 ConfirmationDialog 2012-05-23 05:28:25 +02:00
scrawl
656a8f1be9 working menu transparency slider 2012-05-23 01:32:36 +02:00
scrawl
972c035e97 TabControl skin, settings window categories 2012-05-22 23:35:05 +02:00
scrawl
313294c522 settings window (hotkey F2) which does nothing. Yay! 2012-05-22 21:40:42 +02:00
scrawl
343bbaf0fd integrated video settings in the settings file, the launcher is now useless 2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004 Merge remote branch 'scrawl/graphics' 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-05-21 11:24:36 +02:00
scrawl
8f2c8bbea4 Merge branch 'master' into graphics 2012-05-21 09:50:46 +02:00
scrawl
b2d207130d vastly improved look of the GUI, skin background textures now use tiling instead of stretching 2012-05-21 08:14:22 +02:00
scrawl
1079bb2677 finished tooltips for everything in the stats window, some gui refactoring 2012-05-21 05:14:07 +02:00
scrawl
8ce4727424 skill tooltips 2012-05-21 01:58:11 +02:00
scrawl
6518eb7794 some cleanup 2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5 birthsign tooltip 2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files 2012-05-20 22:06:54 +02:00
scrawl
4fb30544d4 more gui files cleanup 2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d changed more gui stuff to use the new tag system 2012-05-19 15:32:32 +02:00
scrawl
7ef0ad4e39 show faction & birthsign in the stats window 2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a working mygui tag replacement system for GMST strings 2012-05-19 14:19:21 +02:00
scrawl
41efea4c1d in the trade window, don't show items that the merchant has equipped. 2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06 complete trade window layout 2012-05-17 21:15:48 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
scrawl
8cc49ae2b9 xml files update (layout tweak, added double quotation marks to font) 2012-05-17 12:55:48 +02:00
scrawl
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
scrawl
a54e52586b fix for a potential directx problem 2012-05-13 12:17:07 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
gugus
8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
 2012-05-11 10:40:40 +02:00
scrawl
a99f74702e workaround for a white square that appears in menubook_next texture 2012-05-11 09:57:43 +02:00
scrawl
1f1edea6af make it possible to use scroll wheel when mouse is over a skill in the stats window; set the correct track size for the scrollbar 2012-05-11 08:45:03 +02:00
scrawl
65ccfba191 resize both the left and the right pane of the stats window 2012-05-11 08:15:22 +02:00
scrawl
8a9e05a96b display text on the book window 2012-05-10 11:03:27 +02:00
scrawl
d69501b061 change daedric font to .zip resource 2012-05-09 02:16:10 +02:00
scrawl
cd351ba3af simple scroll text parsing (tags are ignored until now) 2012-05-08 00:39:52 +02:00
scrawl
9dd53b32b8 added daedric font for magic scrolls 2012-05-07 02:00:31 +02:00
scrawl
f20d4eeb41 Bug #281 , openmw.font.xml update 2012-05-05 01:44:51 +02:00
scrawl
499dd26398 dialogue window topic list word-wrapping 2012-05-04 23:53:50 +02:00
scrawl
a3d99767f7 next & prev button mouseover 2012-05-04 19:11:32 +02:00
scrawl
c125fba9d2 button mouse-over image change working 2012-05-04 18:44:46 +02:00
scrawl
a4d6d1baff added a utility for creating texture atlas at runtime 2012-05-04 18:09:45 +02:00
scrawl
5028a83d11 fix stats window layout resizing 2012-05-03 07:03:04 +02:00
scrawl
0e6b82284f book & scroll windows 2012-05-03 03:33:33 +02:00
scrawl
f733382f74 tooltip now contains info about item enchantment 2012-04-30 00:57:41 +02:00
scrawl
397a978145 DispositionEdit tweaks 2012-04-29 18:57:26 +02:00
scrawl
cca39978d4 changed messagebox text colors 2012-04-29 17:46:09 +02:00
scrawl
50d79a8815 Merge branch 'next' into tooltips 2012-04-29 17:30:34 +02:00
gugus
5603cb312c Objects can now be selected and follow mouse movements. 2012-04-27 20:54:39 +02:00
scrawl
1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
 2012-04-24 02:02:03 +02:00
scrawl
e443455612 Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics 2012-04-24 00:54:35 +02:00
gugus
25432d97d2 trying to get selected item. Doesn't work. 2012-04-21 20:35:45 +02:00
Alexander "Ace" Olofsson
f7a03b39c4 Some improvments for windows builds and installer 2012-04-19 14:58:27 +02:00
scrawl
4889902b98 magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects 2012-04-18 21:18:53 +02:00
pchan3
215d4e1739 Made adjustments to keep container window within the viewscreen. 2012-04-18 23:09:13 +10:00
scrawl
51a76eda92 Merge branch 'master' into graphics 2012-04-18 01:09:55 +02:00
scrawl
1de1b3e40e Merge branch 'master' into tooltips 2012-04-17 15:57:08 +02:00
scrawl
13b67faf2f adding more safety checks 2012-04-16 20:39:41 +02:00
scrawl
f1b80c6ff7 fixed text input box 2012-04-16 19:23:24 +02:00
scrawl
cfa37b0e77 fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text 2012-04-16 19:14:05 +02:00
scrawl
b3dc1931a9 general GUI refactoring, part 1 2012-04-16 15:48:01 +02:00
Nikolay Kasyanov
582d7ab213 building & packaging improvements for OS X 2012-04-16 15:28:09 +02:00
scrawl
194ecf274c attribute tooltips 2012-04-16 00:16:35 +02:00
scrawl
705d4c6d54 mostly complete 2012-04-15 21:14:14 +02:00
gugus
58d05fa503 more clean-up. Container window shows up! But there is no working close button. 2012-04-15 20:56:45 +02:00
gugus
a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
 2012-04-15 17:54:13 +02:00
gugus
b309d245c5 cleaning up hircine work 2012-04-15 17:52:39 +02:00
scrawl
ab4e03f05f Merge branch 'master' into tooltips 2012-04-15 17:11:14 +02:00
scrawl
d37bc9cba8 basic mouse-over info for in-game objects 2012-04-15 17:10:08 +02:00
Marc Zinnschlag
f36c8733fa Merge remote branch 'scrawl/graphics' 2012-04-15 17:02:51 +02:00
scrawl
cac662ca98 basic tooltips 2012-04-14 17:47:44 +02:00
scrawl
fa5a1432c9 map lighting tweak, default settings tweak 2012-04-14 15:58:58 +02:00
k1ll
226f312163 Set the version in the openmw.desktop file via CMake 2012-04-13 17:36:31 +02:00
Marc Zinnschlag
a4fb71a0fc Merge remote branch 'scrawl/graphics' 2012-04-12 18:46:02 +02:00
scrawl
95f87a8abf more or less complete list for morrowind.bsa (thanks to artorius) 2012-04-12 16:33:36 +02:00
scrawl
2b8c81e779 removed test.skin file 2012-04-12 14:31:12 +02:00
scrawl
800df7376c use the cursors from morrowind.bsa and remove mwpointer.png 2012-04-12 14:26:21 +02:00
scrawl
a727bcd4a4 override nif transparency settings (part 1) 2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3 basic shadows 2012-04-11 18:53:13 +02:00
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
scrawl
aa8208efb9 changed compositor to be compatible with Ogre 1.8RC 2012-04-08 22:18:56 +02:00
scrawl
0b2dab0b5d disable water fog due to some issues 2012-04-08 18:17:52 +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
fbfc6e0966 enabled new water by default 2012-04-08 16:06:47 +02:00
scrawl
17eb68e4bc disable "reflect statics" by default because it performs not so well right now 2012-04-08 15:52:43 +02:00
scrawl
8caa5ff9c4 fixed refraction and underwater distortion artifacts 2012-04-08 15:03:09 +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
scrawl
030060e656 settings description 2012-04-07 23:29:36 +02:00
scrawl
9169c0d7c9 slightly improved the quality of the default water setting 2012-04-07 23:18:08 +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
scrawl
044d649edd Merge branch 'master' into water 2012-04-07 17:16:35 +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
1bf79fd022 Windows pinning: support for MapWindow 
Set correct skin for the Map Window.
 2012-04-07 16:47:41 +03:00
scrawl
bcee5d5943 fix areas with only water (no objects below) 2012-04-06 19:40:37 +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
114e8ae2a0 much less underwater distortion 2012-04-06 16:45:45 +02:00
scrawl
2976625b00 better underwater 2012-04-06 15:51:57 +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
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
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
scrawl
1b89a9e203 various fixes 2012-04-05 15:30:55 +02:00
scrawl
f49131e1b8 renamed setting, automatically disable MRT when unsupported 2012-04-05 13:09:59 +02:00
scrawl
add4ebe445 fresnel effect 2012-04-05 12:59:56 +02:00
scrawl
8ddc8131a5 fresnel test 2012-04-05 11:18:58 +02:00
scrawl
36fd9b9f26 shore transition test 2012-04-05 10:39:22 +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
scrawl
006970fd79 add MRT code to shaders 2012-04-04 19:53:41 +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
scrawl
6481cf87fc cleanup resources 2012-04-03 17:07:16 +02:00
scrawl
b3a186e729 simple water without shaders that uses original MW textures 2012-04-03 16:37:54 +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
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
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
1445ae992d adding a setting to disable static geometry 2012-04-02 14:24:16 +02:00
Roman Melnik
d09f0610ea Add basic windows pinning 
Create WindowPinnableBase class for windows which should be
allowed to be pinned.

Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).

Handle clicking on PinToggle button (pinning/unpinning a window).
 2012-04-01 20:36:57 +03:00
scrawl
7b3adb27a3 backend changes, terrain num lights setting 2012-04-01 18:48:37 +02:00
scrawl
f4bbcb48a6 settings-default.cfg 2012-04-01 17:14:49 +02:00
Nikolay Kasyanov
2a7885b514 Synchronized OS X icon with our current app icon 2012-03-31 19:36:07 +04:00
Marc Zinnschlag
46279a001b Merge remote branch 'scrawl/dialogue' 2012-03-30 15:39:56 +02:00
scrawl
4bbedeb3e7 made all dialogs semi transparent (like in morrowind) 2012-03-30 14:01:43 +02:00
scrawl
d3f31c3498 dialogue window enhancements 2012-03-30 13:53:35 +02:00
scrawl
e6303fc3f4 Merge branch 'master' into water 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwrender/renderingmanager.hpp
 2012-03-28 21:37:20 +02:00
Pieter van der Kloet
426c278505 Changed the OpenMW default font from Comic sans to EB Garamond 2012-03-24 22:02:55 +01:00
Pieter van der Kloet
155cd76f37 Changed Launcher font to EB Garamond and added license info 2012-03-24 20:43:35 +01:00
scrawl
7a3034701f functional HUD map 2012-03-23 16:51:56 +01:00
scrawl
ce63d29d4a rotate hud player arrow 2012-03-23 15:26:24 +01:00
scrawl
770b0f2106 gui changes 2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0 player arrow 2012-03-23 09:00:00 +01:00
scrawl
6067053f08 Merge branch 'next' into water 
Conflicts:
	CMakeLists.txt
 2012-03-22 21:41:32 +01:00
scrawl
cf3515a898 it is now possible to drag the minimap with the mouse 2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f MW_MapView skin 2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74 Merge branch 'next' into minimap 
Conflicts:
	files/mygui/openmw_map_window_layout.xml
 2012-03-22 19:36:37 +01:00
scrawl
70ed5770da black journal text 2012-03-22 17:32:18 +01:00
scrawl
250fcab7c2 moved the mygui resources to a more suitable location 2012-03-22 17:11:24 +01:00
Jason Hooks
f2093a51db more cleanup 2012-03-18 22:38:07 -04:00
Jason Hooks
fe9e6a732c Some cleanup 2012-03-18 22:32:46 -04:00
Jason Hooks
51fb9e67cd Merge 2012-03-18 21:31:31 -04:00
Marc Zinnschlag
be70d197e5 Merge branch 'next' 
Conflicts:
	.gitignore
	cmake/FindOGRE.cmake
 2012-03-02 12:11:44 +01:00
Marc Zinnschlag
4c2fffdd61 temporarily disabled multi data path support in OpenMW 2012-02-28 09:27:35 +01:00
scrawl
8b5da06fce Merge branch 'next' into weather 
Conflicts:
	apps/openmw/mwrender/renderingmanager.cpp
 2012-02-20 18:33:13 +01:00
Marc Zinnschlag
e02cba58b1 Merge branch 'master' into next 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-02-20 14:34:27 +01:00
Marc Zinnschlag
8186445de9 fix for a very silly bug 2012-02-16 21:06:25 +01:00
Marc Zinnschlag
8244ed5860 workaround for space in paths problem 2012-02-16 09:26:27 +01:00
Marc Zinnschlag
e1defd3595 adjusted the globally installed openmw.cfg file 2012-02-14 09:25:12 +01:00
Pieter van der Kloet
7bf8497215 Fixed CMake problem with Ogre plugins path 2012-02-07 21:41:08 +01:00
Nikolay Kasyanov
705b2955a0 Feature #162 - Need to create app bundle using CMake, not by hand. 
In progress, working towards plugins support.
 2012-01-30 00:28:02 +04:00
Jason Hooks
bf09762b6a Ground showing up 2012-01-20 19:50:42 -05:00
Jason Hooks
ff2bbc9fc5 Transparent water 2012-01-18 22:42:07 -05:00
Jason Hooks
8798f7dd40 Bringing in some of Azathoth's work 2012-01-14 18:34:14 -05:00
Pieter van der Kloet
6716bf649e Some stylesheet improvements and a drop-shadow for the scroll background 2011-06-26 23:16:39 +02:00
Nikolay Kasyanov
24947d800a Fixed launcher config and style location. Launcher will be started when opening bundle 2011-06-26 21:04:17 +04:00
Pieter van der Kloet
db20186e50 Added newline to the end of some files, GitHub was complaining about it 2011-06-24 21:46:20 +02:00
Pieter van der Kloet
118765a274 Renamed the launcher executable and icons, added .desktop file and default config, modified/updated some other files 2011-06-24 21:42:18 +02:00
Pieter van der Kloet
409bd0fe7e Moved the stylesheet to main.cpp and made some stylesheet-related changes 2011-05-10 22:47:08 +02:00
Pieter van der Kloet
2b0dabe669 Changed profile switching again; Some stylesheet modifications 2011-05-03 02:46:46 +02:00
Pieter van der Kloet
557e659e15 CMake modifications, stylesheet gets copied to destination dir now 2011-05-02 20:07:37 +02:00
Marc Zinnschlag
d47abff25d create local openmw.cfg file for uninstalled version 2011-04-28 21:55:08 +02:00
Nikolay Kasyanov
eaea48011d Now working mac app bundle generated during build 
(includes plugins & resources).
Still need to copy frameworks before deployment.
FindOGRE.cmake finds Ogre plugins dir on OS X.
Default OS X data path set to the data subdir
near .app.
README_Mac updated.
 2011-04-28 21:55:05 +02:00
Nikolay Kasyanov
943eea8104 .app bundle finally works 2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
527ac956a7 More correct MacOS X bundle generation 2011-03-07 06:03:39 +03:00
Nikolay Kasyanov
4028600768 Builds on OS X now 2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
753a4f681e Search for plugins in orgre lib directory 2011-01-13 21:18:20 +01:00
Jan-Peter Nilsson
4221824681 Build debian package using cpack if dpkg is available 
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
 2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
d1b482d64a Update plugins.cfg based on where cmake found ogre libraries 2011-01-12 18:18:06 +01:00
Jan Borsodi
0f860e2fbd openmw.cfg is now created with a configurable path (via cmake), the default is still "data" 2010-09-10 13:38:17 +02:00
Ardekantur
25ba9933f6 Mac Build - heinous additions for bundle management 2010-06-25 21:28:11 -04:00
Marc Zinnschlag
6b6e42b641 removed unused BSP scene manager from plugins.cfg 2010-06-11 19:59:33 +02:00
Marc Zinnschlag
9a041d7c01 added data option and openmw.cfg file 2010-06-11 19:53:00 +02:00
Nicolay Korslund
e8c6caa0b5 Fixed DOS line endings on certain files 2010-06-06 18:04:39 +02:00
Marc Zinnschlag
e973270f9b fixed minor bug in previous commit; more clean up 2010-06-06 13:04:23 +02:00