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

563 commits

Author SHA1 Message Date
scrawl
4c8a04d9cb Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2 
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
 2013-06-15 17:41:42 +02:00
Marek Kochanowicz
c174f57a2f Git changes show that it should upload all the files this time. Let's 
hope…
 2013-06-15 14:40:36 +02:00
graffy76
a5d9d3fd7a Updated status icons from sirherrbatka 2013-06-15 07:29:20 -05:00
graffy76
97cfbc31b5 Merge color icons 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-06-15 06:46:27 -05:00
scrawl
fcf35d3871 Removed the UI cursor sensitivity slider 2013-06-12 20:27:55 +02:00
scrawl
403704b92a Use openmw.png for SDL_SetWindowIcon 2013-06-12 16:15:04 +02:00
Marc Zinnschlag
bd08677a7f Merge branch 'openmw24' 2013-06-12 10:37:33 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
pvdk
b3595a6a2e Fix for duplicate key/value pairs being written to settings.cfg, Bug #755 2013-06-02 21:43:22 +02:00
Marek Kochanowicz
09ab541102 Colored status icons. Hopefully everybody loves watercolors! 2013-05-31 11:50:03 +02:00
Marek Kochanowicz
e403773e95 Simply removed background from status icons. 2013-05-30 13:33:49 +02:00
graffy76
94db7cdcfe Added png's of icons 2013-05-29 12:45:15 -05:00
graffy76
35fb9b669a Final details implemented 
Png icons, alignments fixed.
 2013-05-29 06:38:35 -05:00
graffy76
5a40594b0d Merge 
Merge branch 'icons-svg' of git://github.com/sirherrbatka/openmw into recordStatusDelegate
 2013-05-26 23:21:08 -05:00
Marek Kochanowicz
792f3aaa86 Rastered status icons. ingredients, light, and book icon without emblem. 2013-05-26 17:31:29 +02:00
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