mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
Code Issues Releases Wiki Activity
7901 commits 38 branches 54 tags 122 MiB
Commit graph

582 commits

Author SHA1 Message Date
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