1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 21:19:57 +00:00
Commit graph

1438 commits

Author SHA1 Message Date
Miloslav Číž
282800b5b2 Create LICENSE (#1532)
* Create LICENSE

Let's add the license file so that GitHub officially registers it and displays it next to the project.

* move license files

* update licenses in cmakelists.txt

* fix link in README
2017-11-05 15:37:38 +00:00
AnyOldName3
3f63ebce77 Theoretically, at least, fix everything (except hte sky issue which is resolved in another branch) 2017-11-05 14:37:36 +00:00
AnyOldName3
e15d461921 Add (potentially physically-flawed) shadow support to the water shader 2017-10-30 20:06:52 +00:00
David Walley
41dc82abad Update Links to Documentation in settings.cfg files (#1523)
* Update settings-default.cfg

* Update settings.cpp
2017-10-28 16:05:30 +00:00
AnyOldName3
147455626e Merge OpenMW/master 2017-10-13 21:39:15 +01:00
AnyOldName3
26a7b48d69 Attempt to make a VDSM work, and also to set up a debug HUD, but without success. 2017-10-13 18:19:29 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
AnyOldName3
e0ce284272 Fix the same shader preprocessor variable issue for the third time now 2017-10-08 01:34:54 +01:00
AnyOldName3
2b78fb436d Fix issue with shader preprocessor variables 2017-10-08 00:44:35 +01:00
AnyOldName3
b94bbe00cb Merge remote-tracking branch 'upstream/master' into osgshadow-test 2017-10-08 00:18:02 +01:00
scrawl
12510efab7 Fade screen out during loading screen (when travelling) 2017-10-04 16:00:38 +00:00
scrawl
d7a5622485 Fix book window buttons overlap 2017-10-03 09:16:46 +00:00
AnyOldName3
ba1e2cab2f Merge remote-tracking branch 'upstream/master' into osgshadow-test 2017-10-03 03:00:15 +01:00
AnyOldName3
ebd3dcf2b3 Remove unnecessary preprocessor variable in shaders 2017-10-03 02:58:25 +01:00
scrawl
64e27c032b Merge pull request #1481 from scrawl/keyfocus
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed Merge pull request #1483 from drummyfish/master
water shader improvements plus rain ripple effect (#452)
2017-09-28 22:31:13 +00:00
Miloslav Číž
64793a55dc get rid of buggy shader trick 2017-09-28 20:44:43 +02:00
Miloslav Číž
c9c6326d87 fix non-refraction water rain ripples 2017-09-28 19:23:37 +02:00
Miloslav Číž
8416feaf5b link rain water ripple effect to actual rain 2017-09-28 19:04:31 +02:00
scrawl
0deda69a27 Fix wrong skin for levelup attribute values 2017-09-27 22:04:36 +02:00
scrawl
db650df416 Fix 'blocking' messageboxes not handling key focus properly 2017-09-27 21:41:22 +02:00
scrawl
fb8306b61f Disable keyfocus for world map button
Fixes 'Tab' no longer working as a keybinding for closing the inventory window.
2017-09-27 21:30:31 +02:00
Miloslav Číž
4a332a1807 improve rain ripples 2017-09-27 21:25:14 +02:00
Miloslav Číž
5c50506c83 water shader refactor plus basic rain ripples 2017-09-27 17:13:21 +02:00
scrawl
2d873a13ac Merge pull request #1469 from drummyfish/master
water shader improvements (partially fixes #3365)
2017-09-27 13:14:22 +00:00
scrawl
879da9c69a Add key focus for some more button skins 2017-09-27 12:56:06 +00:00
scrawl
7a3fbfb34a Slightly improve journal window keyboard navigation 2017-09-27 12:56:05 +00:00
scrawl
1714271a76 Improve KeyboardNavigation to better handle modal windows
It's no longer possible to cycle to widgets that aren't part of the current modal window.

The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
2017-09-27 12:55:58 +00:00
scrawl
a0ee1c5630 Fix order of buttons in book window layout for key cycling 2017-09-27 12:55:52 +00:00
Miloslav Číž
cde2c13900 make water depth independent of view frustum 2017-09-26 14:14:28 +02:00
scrawl
e4c9d84666 Disable NeedKey for ScrollView skins
The widget is set to accept key focus by default for no reason I can tell. Fix in MyGUI TBD
2017-09-25 01:20:46 +02:00
scrawl
2c4b0cc408 Hide sneak indicator by default 2017-09-25 00:47:05 +02:00
scrawl
be19f51013 Adjust some more windows to be keyboard friendlier 2017-09-24 19:08:14 +02:00
scrawl
622e3ebd60 Remove excessive padding in some GUI layouts 2017-09-24 19:08:12 +02:00
scrawl
5482ad0482 Fix tab completion in console to not cycle key focus 2017-09-24 19:08:11 +02:00
scrawl
c203a0774a Adjust some layouts to take better advantage of keyboard navigation 2017-09-24 19:08:11 +02:00
scrawl
c11fe6788f Add basic keyboard navigation for the GUI
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.

Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.

The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
2017-09-24 19:08:11 +02:00
Miloslav Číž
9dececcbd2 rename a constant in water shader 2017-09-22 21:10:05 +02:00
Miloslav Číž
28f58d5a32 add deleted letter in macro 2017-09-22 21:06:03 +02:00
Miloslav Číž
f274bc84cc fix depth computation in water shader 2017-09-22 21:03:09 +02:00
Miloslav Číž
8df79625e8 fix water shader 2017-09-22 10:53:02 +02:00
Miloslav Číž
658fa0fdae fix typo 2017-09-21 22:33:57 +02:00
Miloslav Číž
c43baf6e94 remove commented code 2017-09-21 22:31:26 +02:00
Miloslav Číž
16d9773c6c fix water shader artifacts at shores 2017-09-21 22:25:36 +02:00
AnyOldName3
e33bec97be Tidy up the mess I made of lighting.glsl a bit by removing two single-line functions that are only ever called in one location. 2017-09-21 02:03:53 +01:00
AnyOldName3
26ecf2088b Make shadows play nicely with per-vertex lighting 2017-09-21 01:59:02 +01:00
AnyOldName3
c67b3267fb Stop shadowing ambient lighting from the light casting a shadow when using per-pixel lighting. 2017-09-21 00:49:34 +01:00
AnyOldName3
f50063402d Adjust shaders to support shadows 2017-09-21 00:25:48 +01:00
scrawl
aaa727757d Don't use MW_Dialog skin with plain Widgets
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.

This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:24:20 +00:00
scrawl
fe6f9ffff4 Fix skins incorrectly named 'Client' to avoid a collision with new MyGUI feature cfdaf5f 2017-09-20 22:24:19 +00:00
scrawl
d07fe91cfe Don't use MW_Dialog skin with plain Widgets
After MyGUI commit cfdaf5f , the 'Client' area will be used for every type of widget, whereas previously it would only be used for some widgets like 'Window'. Use 'Window' widget where the client was always used.

This fixes a wrong margin when built with cfdaf5f or later.
2017-09-20 22:56:57 +02:00
scrawl
186cc1e370 Fix skins incorrectly named 'Client' to avoid a collision with new MyGUI feature cfdaf5f 2017-09-20 22:29:34 +02:00
Andrei Kortunov
3fb3c4c20f Add scrollbar to a birth effect lists (bug #4105) 2017-09-17 14:06:01 +04:00
Chris Robinson
ec01b89e59 Increase the default buffer cache sizes 2017-09-14 16:00:42 -07:00
Andrei Kortunov
6ef5d1408f Disabled transparency for description edit fields 2017-08-20 21:25:36 +04:00
Andrei Kortunov
765f982123 Removed cursor from Favorite Attributes label 2017-08-20 20:48:14 +04:00
scrawl
2611377081 Merge pull request #1350 from akortunov/deathanimationfix
Do not allow to loot fighting actors during death animation (bug #3528)
2017-08-18 22:04:12 +00:00
scrawl
1f2b62c541 Merge pull request #1388 from akortunov/guifixes
Make inventory avatar to fit within border
2017-08-11 20:31:02 +00:00
Andrei Kortunov
e4df17ccaf Make inventory avatar to fit within border (bug #4003) 2017-08-11 09:02:50 +04:00
scrawl
0f983144a4 Merge pull request #1383 from akortunov/guifixes
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Thunderforge
f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 2017-08-09 00:20:49 -05:00
Andrei Kortunov
56f5a5dee3 Added transparency to 'owned' tooltip 2017-08-08 22:57:39 +04:00
Andrei Kortunov
8c1c80ab91 Disable transparency for persuation dialogue menu 2017-08-08 20:39:25 +04:00
Andrei Kortunov
6cb3c83248 Add transparency for interactive messageboxes in game mode 2017-08-08 20:36:50 +04:00
Andrei Kortunov
dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 2017-08-07 09:55:50 +04:00
Andrei Kortunov
56a30d7aec Journalbook layout fixes 2017-08-03 20:27:14 +04:00
Andrei Kortunov
a03cc8216e Fixed count widget buttons alignment 2017-07-31 18:51:44 +04:00
scrawl
c9d9461d3e Add Spacer class derived from AutoSizedWidget
Using a normal widget as a spacer with HStretch/VStretch may not work properly because for widgets not derived from AutoSizedWidget, the HBox/VBox treat the widget's current size as the requested minimum size. This leads the layout to break when resized more than once.

The new class sets HStretch and VStretch to true by default to save some typing.
2017-07-31 16:20:29 +02:00
scrawl
7d97d1d513 Merge pull request #1247 from pvdk/progressbar
Ini-importer progress bar fills the whole width of the ui element now
2017-07-30 23:38:49 +00:00
Thunderforge
b98e175161 Renaming duplicate horizontalSpacer variable 2017-07-30 17:40:56 -05:00
scrawl
59b92dc67b Merge pull request #1349 from Thunderforge/prevent-parchment-from-being-cut-off
UI adjustments to prevent parchment scroll from being cut off (fixes #3910)
2017-07-30 22:01:58 +00:00
scrawl
196eedf1b0 Fix key focus issue with the journal hotkey 2017-07-30 23:51:07 +02:00
Nikolay Kasyanov
fd0be7008d [macOS] Fixes accidental loading of plugins from system-wide Qt install
I was too eager to remove the workaround in 014a2fc0e9.
Actually, config-based solution seems cleaner.
Respective Qt documentation: http://doc.qt.io/qt-5/qt-conf.html.

Also, moves Qt plugins from Contents/MacOS to Contents/PlugIns
for consistency.
2017-07-30 15:43:45 +02:00
Thunderforge
072fbcaee3 UI adjustments to prevent parchment scroll from being cut off (fixes #3910) 2017-07-25 22:12:29 -05:00
Thunderforge
8ded95201d Move Morrowind Content Language label to section header 2017-07-24 22:56:58 -05:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
Andrei Kortunov
6795163265 Disable transparency for all popup lists 2017-07-16 23:03:53 +04:00
Andrei Kortunov
5bb9f1b187 Make popup in character select menu non-transparent 2017-07-16 13:18:59 +04:00
Andrei Kortunov
2b22d10ebc Spellview fixes 2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df Quick keys menu fixes 2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 2017-07-15 14:03:36 +04:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
scrawl
9fd0d54a35 Merge pull request #1289 from akortunov/newrepair
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
10d4cb15ad Improved repair widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e Improved recharge widget 2017-05-31 19:11:49 +04:00
scrawl
2638327593 Merge pull request #1303 from akortunov/guifixes
Character generation layout fixes
2017-05-31 15:25:41 +02:00
Andrei Kortunov
2b28d1a6d2 Select specialization menu layout fix 2017-05-30 17:15:10 +04:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Andrei Kortunov
f17badb3cd Makes cells cache size configurable 2017-05-25 13:09:40 +04:00
Andrei Kortunov
da828a1089 Class choice layout fix 2017-05-01 21:37:37 +04:00
Andrei Kortunov
ba78e187c7 Listbox spacing fix 2017-05-01 21:28:42 +04:00
Andrei Kortunov
0e35e6a700 Class generation menu layout fixes 2017-05-01 20:51:54 +04:00
Andrei Kortunov
1520a4d7db Levelup menu layout fixes 2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0 Tooltips: faction, magic effects layout fixes 2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 2017-04-30 22:39:05 +04:00
Andrei Kortunov
27181367e2 Tooltips: skills and attributes layout fixes 2017-04-30 21:26:13 +04:00
Andrei Kortunov
6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da Merge pull request #1272 from akortunov/guifixes
Service menus layout fixes
2017-04-30 12:27:21 +02:00
Andrei Kortunov
bc9080d9d7 Removed 31 symbols cap from service menus 2017-04-23 08:56:54 +04:00
Andrei Kortunov
6c1e3a0618 Merged from upstream master 2017-04-21 08:48:22 +04:00
Andrei Kortunov
c65c643abe Fixed race menu skills layout 2017-04-20 21:30:13 +04:00
Andrei Kortunov
0a90b48e60 Fixed progressbars layout in review menu 2017-04-20 17:37:37 +04:00
Andrei Kortunov
f0f1df3a96 Properly clear inventory 2017-04-19 20:54:09 +04:00
Andrei Kortunov
aac78d29a4 Service menus layout fixes 2017-04-16 20:30:20 +04:00
scrawl
f63b1e81cd Merge pull request #1228 from akortunov/master
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
8d8f293a65 Merge pull request #1246 from akortunov/develop
Menu improvements
2017-04-12 23:57:00 +02:00
Andrei Kortunov
1fe3a3efe4 Count dialog layout changes 2017-04-12 19:15:22 +04:00
Andrei Kortunov
72a16dc78b Merge branch 'master' into pinned since added PR #1250 2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d Add option to show reach and attack speed for melee weapons 2017-04-12 09:12:25 +04:00
Andrei Kortunov
95ce7637f3 Adds persisted pin (feature #2834, bug #2489) 2017-04-10 10:18:00 +04:00
MiroslavR
395e97cf40 Remove evil "implicit GetJournalIndex" hack from expression parser 2017-04-03 01:44:26 +02:00
Pieter van der Kloet
8d76903392 Ini-importer progress bar fills the whole width of the ui element now 2017-04-02 03:15:32 +02:00
Andrei Kortunov
df5a43363a Confirmation dialogs size fix 2017-03-30 17:05:56 +04:00
Andrei Kortunov
e5a0f89934 List scroll fix 2017-03-28 12:49:23 +04:00
Andrei Kortunov
edadcb338c Savegame dialog improvements 2017-03-27 23:10:57 +04:00
Andrei Kortunov
a35d4334c3 Encumberance text fix 2017-03-27 14:54:04 +04:00
Andrei Kortunov
c9cf0ec977 Buttons and widgets captions vertical alignment 2017-03-27 14:38:40 +04:00
Andrei Kortunov
7d09a5d644 Progress bars vertical alignment 2017-03-27 13:33:28 +04:00
Andrei Kortunov
4daa88351b Vanilla style progress bars 2017-03-24 21:38:33 +04:00
Andrei Kortunov
b89fdcfd27 Vanilla style drowning widget (partially fixes bug #3801). 2017-03-24 09:41:18 +04:00
Andrei Kortunov
1286754fb3 Add a new option to show arrow damage (feature #2923) 2017-03-18 08:07:36 +04:00
scrawl
19d516cbda Use the QuadTreeWorld based on distant terrain setting now that it sort of works. 2017-03-14 19:27:56 +01:00
scrawl
e295a72d43 Add align=Center to GUI dialogs (Fixes #2289) 2017-02-14 07:58:16 +01:00
scrawl
2ea0db1d1a Merge pull request #1198 from Allofich/combat
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +01:00
scrawl
93c582064e Remove item shadows for equipped weapon/spell indicators 2017-02-09 04:13:13 +01:00
scrawl
45ae8d5ffa Add support for GL_AMBIENT colorMode to shaders as required by particle systems 2017-02-08 18:39:24 +01:00
Allofich
25c64dbb0f Make combat engagement logic more like vanilla
(Fixes #2678, Fixes #3705)
2017-02-07 01:25:12 +09:00
scrawl
5f2539adb6 Optimize scrollbar/progress skins by using one widget for the track instead of one widget per pixel 2017-02-04 16:05:22 +01:00
scrawl
2db7292bcb Add new setting for the number of preloading worker threads
If you have CPU cores to spare, consider setting 2 or 3. Up to about 3 threads, preloading performance seems to increase in a linear fashion, but with 4 or more threads I/O bottlenecks and synchronization overhead starts to show.
2017-02-04 02:59:28 +01:00
scrawl
1808b8567e Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera] 2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee Add 'small feature culling pixel size' setting 2017-02-01 06:00:14 +01:00
Nikolay Kasyanov
9e8e9aef86 Update gamecontrollerdb.txt from upstream 2017-01-28 11:02:06 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
scrawl
5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
2016-11-25 02:51:32 +01:00
Nikolay Kasyanov
db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
2016-11-23 22:32:54 +01:00
MiroslavR
7e5ba4d435 Fix default values of some GMSTs 2016-11-17 19:43:02 +01:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
MiroslavR
76ddd9bebb Add a setting for merchant auto-equipping prevention 2016-10-19 02:22:49 +02:00
scrawl
77bc807305 Attenuate the light ambient in lighting.glsl (Fixes #3597) 2016-10-17 15:01:10 +02:00
scrawl
e7154c3f7c Add the ItemShadow to various other skins 2016-10-13 01:46:57 +02:00
scrawl
612c3e995f Add drop shadow to ItemWidget (Fixes #3545) 2016-10-13 01:42:50 +02:00
scrawl
f291aabc4b Fix shader compile error for objects without diffuse map 2016-08-09 01:04:02 +02:00
David Carlier
83bab29e4b Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
Alexander Kurtz
ff3b7de0e7 Update gamecontrollerdb.txt from upstream. 2016-07-07 18:31:49 +02:00
scrawl
bc04989448 Remove unused uniforms 2016-06-17 00:20:53 +02:00
scrawl
8e23c37668 Flip the parallax offset Y component based on tangent parity (Bug #3440) 2016-06-16 18:07:10 +02:00
scrawl
6f5b68859f Comment out UV test that is not working 2016-06-16 17:33:54 +02:00
scrawl
6a1fd05074 Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440) 2016-06-16 17:32:27 +02:00
scrawl
aa5a643e3b Fix incorrect multiplication order of TBN matrix (Bug #3440) 2016-06-16 17:31:17 +02:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Sergey "Shnatsel" Davidoff
5c8756cb2c Add composite icon for exterior cell controls in scene view, along with source SVG and a bash script that I used to assemble all possible status combinations 2016-04-21 17:25:53 +03:00
Sergey "Shnatsel" Davidoff
c2c81c6b1a Reversed the location of original state and current state in scene view icon. This way it's much more obvious, assuming the icon stays on the left of the actual landscape view. See https://forum.openmw.org/viewtopic.php?p=38971#p38971 for more info 2016-04-21 15:18:30 +03:00
scrawl
f3e9fd49f3 Don't add the autodetected mw path in global config file
The wizard takes care of detecting the MW installation path already. By having this path permanently in the global cfg-file, there exists no way to *not* use an autodetected installation, which is a problem.
2016-04-17 17:17:07 +02:00
scrawl
e1dda9675d Add "preload instances" setting, disabling this may help if you are low on memory. 2016-03-30 00:13:37 +02:00
scrawl
6f31b3d79f Add parallax mapping for objects 2016-03-22 21:46:15 +01:00
scrawl
b59b2c6d6d Move to parallax.glsl 2016-03-22 21:46:15 +01:00
scrawl
b4dda045a6 Pass the tangent in object space 2016-03-22 21:46:15 +01:00
scrawl
157c11398d Add terrain parallax mapping 2016-03-22 21:46:15 +01:00
Marc Zinnschlag
563f44b823 Merge remote-tracking branch 'origin/master' 2016-03-03 12:13:11 +01:00
Aesylwinn
9d985d883b added grid icon 2016-03-02 20:45:04 -05:00
scrawl
6e7c6fdd7e Implement NiTexturingProperty::DecalTexture 2016-03-01 18:41:36 +01:00
scrawl
414c19f717 Fix detailMapUV bug 2016-03-01 18:40:18 +01:00
scrawl
5e105da3ba Generate texture coordinates per-pixel when normal map + environment map are used 2016-02-24 21:28:55 +01:00
scrawl
900b522d13 Rename viewPos to viewDirection 2016-02-21 01:28:42 +01:00
scrawl
09684adeff Update settings documentation 2016-02-21 00:48:18 +01:00
scrawl
0db7163363 Add specular mapping for terrain 2016-02-20 19:55:08 +01:00
scrawl
f01e8a6950 Add specular mapping for objects 2016-02-20 19:55:08 +01:00
scrawl
5cf2441b10 ShaderVisitor: support automatic recognition of normal maps based on file pattern
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
2016-02-20 18:00:43 +01:00
scrawl
e2dc46c92e Update settings 2016-02-19 01:48:07 +01:00
scrawl
6000e48bba Add terrain shaders and normal map support
Textures with _n filename suffix are automatically recognized as terrain normal maps.
2016-02-19 01:37:30 +01:00
scrawl
5e12a1b4ef Add enchanted item glow to the shader 2016-02-18 23:05:44 +01:00
scrawl
1232607385 Remove pointless widget names in settings layout file 2016-02-18 19:41:06 +01:00
scrawl
a73512afb7 Add shader settings to settings.cfg 2016-02-18 19:38:34 +01:00
scrawl
3969675afa Remove unused settings 2016-02-18 19:38:34 +01:00
scrawl
e5a37a7023 Add normal map code 2016-02-18 19:37:59 +01:00
scrawl
18e80d5627 Add per-pixel lighting code 2016-02-18 19:37:59 +01:00
scrawl
1223bca3d4 Move doLighting to separate file 2016-02-18 19:37:59 +01:00
scrawl
456816f707 Use diffuse.a / vertex.a, use material emission 2016-02-18 19:37:58 +01:00
scrawl
5fd84074c5 Reimplement detailMap, darkMap and emissiveMap 2016-02-18 19:37:58 +01:00
scrawl
e845c576d4 Use the texture matrix 2016-02-18 19:37:58 +01:00
scrawl
3859c58a8a Assign gl_ClipVertex in the vertex shader to make clip planes work 2016-02-18 19:37:57 +01:00
scrawl
9376811213 Vertex lighting shader 2016-02-18 19:37:57 +01:00
scrawl
044e0a829a Add fog 2016-02-18 19:37:57 +01:00
scrawl
a9ad1b09e2 Introduce ShaderManager & ShaderVisitor
Actual shaders still to be written.
2016-02-18 19:37:56 +01:00
scrawl
7f89bb273a Add 'reflect actors' setting for the water shader, default off 2016-02-18 19:36:17 +01:00
scrawl
6fb0022b35 Update preloading settings
Disable 'preload fast travel' by default.

Add 'min cache size' and 'max cache size' settings.

Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
2016-02-18 17:47:10 +01:00
scrawl
6806741d9b Add settings for disabling the individual preloading types 2016-02-09 01:58:33 +01:00
scrawl
a81b10b415 Make the cache expiryDelay configurable 2016-02-07 19:05:55 +01:00
scrawl
5efaa9817c Add preloading settings 2016-02-07 18:01:14 +01:00
scrawl
e8662bea31 Change the way that image origin is converted to OpenGL's lower-left convention
Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
2016-02-05 21:03:11 +01:00
scrawl
7d647088ab Make the local map cell distance configurable 2016-02-05 01:19:45 +01:00
scrawl
ffcb6ec381 Change the default near clip distance to 1 (Fixes #3155) 2016-01-21 23:38:23 +01:00
scrawl
ef20962fc5 Disable fog of war rendering on the HUD map by default 2016-01-11 22:58:08 +01:00
scrawl
0da6d249fe Fix the window pinning button's borders not accepting mouse clicks 2016-01-11 22:57:53 +01:00
scrawl
190bf15887 SettingsWindow: support auto-updating of slider labels through the layout file 2016-01-11 22:57:16 +01:00
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Chris Robinson
f1faeeae3a Use separate config options for min and mag texture filters 2015-12-13 17:05:19 -08:00
Chris Robinson
b830a413d3 Rename the texture filter options
To avoid compatibility issues with upgrading from or downgrading to older
builds.
2015-12-13 16:02:09 -08:00
Chris Robinson
fb6abb53ae Simplify the in-game texture options
This makes it behave like it originally did, although the config options remain
expanded.
2015-12-13 15:02:36 -08:00
Chris Robinson
76bde5ee13 Separate and expand texture filtering options 2015-12-13 11:25:01 -08:00
scrawl
0f3660e268 Update comment in settings-default.cfg
There are antialiasing techniques that address texture/shading aliasing, but the one we use (MSAA) does not.
2015-12-12 02:01:19 +01:00
scrawl
3890afd6f5 Merge pull request #843 from kcat/master
Add HRTF options and fix an incorrect SoundID
2015-12-08 13:59:15 +01:00
scrawl
e520d37c87 Override the field of view for first person meshes (Fixes #858, Fixes #3051) 2015-12-07 16:29:30 +01:00
scrawl
9621b66b78 Move field of view setting to Camera section 2015-12-07 16:23:06 +01:00
scrawl
9d4af59860 Don't attempt to create quest log buttons if textures are unavailable (Fixes #3063) 2015-12-07 15:33:04 +01:00
Chris Robinson
c75303b652 Add an option to select and enable HRTF 2015-12-05 17:14:53 -08:00
Chris Robinson
d4238a6d91 Add config options for the sound buffer cache size
The cache size is specified with a min/max range, intended to avoid constant
unloading once the limit is reached. This way, buffers can be unloaded down to
a reasonable mimimum, allowing some more buffers to be subsequently loaded
without causing more unloading.
2015-11-26 02:13:37 -08:00
cfcohen
fa610c447c Fix typos. Add "e.g." in places where ranges are only
recommmendations.  Add more factual limits where that's easy.
2015-11-25 17:42:10 -05:00
cfcohen
ac2eedcb7d Change wording in warning to be clearer. Correct ranges on contrast
and gamma.
2015-11-25 09:24:38 -05:00
cfcohen
e0752ccdd0 Prioritize warning about user settings. Make recommendations for
screen number more generic.   Remove resolution recommendation.
2015-11-24 00:10:23 -05:00
cfcohen
89100088f3 The latest version of the settings.cfg without any code changes. 2015-11-23 20:07:48 -05:00
cfcohen
d7e27fa9f4 New brief comments version of settings.cfg. 2015-11-23 16:36:59 -05:00
cfcohen
89329dfbaf Merge remote-tracking branch 'upstream/master' 2015-11-23 16:33:15 -05:00
scrawl
3fe38e3556 Remove unused setting 2015-11-23 03:26:21 +01:00
cfcohen
7b64b35eb3 Added comments (and commentary) to the settings-default.cfg file. 2015-11-22 19:28:09 -05:00
scrawl
34350ddeb1 Fix bug #3028 2015-11-22 15:46:04 +01:00
scrawl
75f11f781c Use the ScalingLayer for Scroll window 2015-11-08 18:32:41 +01:00
scrawl
516f2765a1 Use the ScalingLayer for journal, books and scrolls 2015-11-08 18:30:22 +01:00
scrawl
08a55febc8 Adjust Scroll window layout to better match MW 2015-11-08 17:52:39 +01:00
scrawl
d85d74e615 Use AdditiveLayer for the hit fader 2015-11-07 18:05:16 +01:00
scrawl
a90ef8afd0 layer renaming 2015-11-07 17:49:11 +01:00
scrawl
13c7235b6b Remove old FPS setting code 2015-11-07 00:13:13 +01:00
scrawl
47664e1370 Hide the defunct FPS checkbox in settings menu, added hint text for f3 binding 2015-11-07 00:10:49 +01:00
scrawl
a41ebd6695 Comment out object shaders in the settings menu 2015-11-07 00:04:34 +01:00
scrawl
4cc200680c Comment out shadows tab in settings menu 2015-11-06 23:59:06 +01:00
scrawl
c9d7078b4b Water: add texture quality setting to the settings window 2015-10-29 00:27:42 +01:00
scrawl
60bc7dbabc Improve MW_ComboBox skin 2015-10-29 00:25:24 +01:00
scrawl
8cb2c7a9fb Water: remove defunct "reflect <object type>" settings
Not really useful
2015-10-29 00:25:24 +01:00
scrawl
8433e0679f Water: connect to settings window 2015-10-29 00:25:24 +01:00
scrawl
9f8d36b573 Water code cleanup 2015-10-29 00:25:24 +01:00
scrawl
09631385c3 Use boost ifstream for water resources 2015-10-29 00:25:24 +01:00
scrawl
51e40cf1b8 Water: minor shader cleanup 2015-10-29 00:25:24 +01:00
scrawl
d485dd0782 Water: fix world UV coords 2015-10-29 00:25:24 +01:00
scrawl
9f2f503d37 Water: pass the near and far planes 2015-10-29 00:25:24 +01:00
scrawl
37c9c12962 Water: clipping plane offset 2015-10-29 00:25:23 +01:00
scrawl
e13eb625d3 New water WIP
Changes compared to old (Ogre) water:
- Uses depth-texture readback to handle the underwater fog in the water shader, instead of handling it in the object shader
- Different clipping mechanism (glClipPlane instead of a skewed viewing frustum)
- Fixed bug where the reflection camera would look strange when the viewer was very close to the water surface
- Toned down light scattering, made the waterColor a bit darker at night
- Fixed flipped water normals and strange resulting logic in the shader

Still to do: see comments...
2015-10-29 00:25:23 +01:00
scrawl
169d76b49b Fix scrollbar step in count dialog 2015-09-26 01:20:20 +02:00
Emmanuel Anne
29a84452ab durations in tooltips : use "show effect duration" setting 2015-09-16 22:42:54 +02:00
scrawl
481f23d955 Implement framerate limit setting
The framerate limit can be used to reduce strain on the CPU and GPU, in a way similar to VSync, but without the increased input lag that is typical with VSync.
2015-09-07 16:05:51 +02:00
Marc Zinnschlag
d436dc332b Merge remote-tracking branch 'jeffreyhaines/gametimetracker' 2015-08-20 20:39:44 +02:00
Jeffrey Haines
d91f197119 Time played display setting 2015-08-19 11:31:43 -04:00
scrawl
67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
2015-08-15 22:37:09 +02:00
Alexandre Moine
8c8c5328dc Rewrite of the description 2015-08-04 22:50:53 +02:00
Alexandre Moine
581ea26605 Add appdata file for openmw and install it 2015-08-04 13:06:43 +02:00
Pawel Kubik
47922f6c35 Changed a settings variable responsible for number of loaded exterior cells. 2015-07-24 22:01:49 +02:00
Jiří Kuneš
a5b4e087c5 define owned colours in settings.cfg 2015-07-18 22:17:46 +02:00
Jiří Kuneš
cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 2015-07-18 21:29:38 +02:00
Jiří Kuneš
75f5972898 show owned - better settings 2015-07-18 17:13:20 +02:00
Jiří Kuneš
df077f8649 color tooltip red when taking item would result in crime 2015-07-18 16:56:57 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version'
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
2015-07-18 12:22:37 +02:00
Marc Zinnschlag
edde1fb727 Merge remote-tracking branch 'scrawl/master' 2015-07-18 11:40:36 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
2015-07-18 03:09:04 +02:00
Jiří Kuneš
15107ca5cf crosshair owned - settings option 2015-07-17 17:48:38 +02:00
scrawl
9a115fedbc Add ability to copy&paste the version label in the main menu 2015-07-16 20:11:33 +02:00
scrawl
76328677ef Add some values to launcher's antialiasing combobox 2015-06-05 02:48:51 +02:00
scrawl
89fc473fae Remove Render System combo box from the launcher UI 2015-06-05 02:35:13 +02:00
scrawl
a2e211675d Update openmw_layers.xml to newer version 2015-06-04 02:35:52 +02:00
scrawl
c2131e7c31 Make near clip distance configurable 2015-05-24 02:34:20 +02:00
scrawl
c748ea7363 Fix view distance slider 2015-05-24 01:40:49 +02:00
scrawl
22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
scrawl
0fb59178b6 Settings file cleanup 2015-05-22 20:15:50 +02:00
scrawl
bec9abd319 Remove name extension for internal MyGUI textures
Since they're no longer loaded from disk, the extension makes no sense.
2015-05-15 23:21:29 +02:00
scrawl
49df07ea7f Implement UI scaling factor 2015-05-15 00:41:21 +02:00
scrawl
a73362f036 Settings file cleanup 2015-05-14 21:45:18 +02:00
scrawl
24bb2e152c Apply texture filter setting changes 2015-05-14 21:42:04 +02:00
scrawl
5442bf23a6 Apply video mode & gamma setting changes 2015-05-14 20:31:16 +02:00
scrawl
3e86dd7df0 Apply runtime changes to field of view & view distance 2015-05-14 18:46:28 +02:00
scrawl
4dd96f3318 Fix missing tiling in skin 2015-05-14 01:32:46 +02:00
scrawl
fd3d49c171 Fix typo in settings layout 2015-05-14 01:18:24 +02:00
scrawl
4825744a03 Fix inconsistent health bar skin 2015-05-13 17:25:54 +02:00
scrawl
033719ccd7 Correct the icon used for custom map markers 2015-05-11 16:38:15 +02:00
dteviot
b0c4be2316 Multi-select + context menu. (Fixes #2480)
Content selector, added multi-select + context menu to allow check/uncheck the multi-selected items.
2015-05-04 14:52:47 +12:00
scrawl
c1edc30ad7 Dead code removal 2015-05-04 03:29:12 +02:00
scrawl
157d8bfedd Remove unused mygui files 2015-05-03 17:26:12 +02:00
scrawl
8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 2015-05-02 17:48:24 +02:00
scrawl
cac288d5be Remove OgreInit 2015-05-01 21:49:36 +02:00
scrawl
a592c1a1c2 Remove unused resources 2015-05-01 18:42:44 +02:00
scrawl
c92592493e OpenMW: create a window and render the starting cell(s) 2015-04-12 15:38:30 +02:00
scrawl
4e69e7cc0f OpenMW compiles and runs w/o render window 2015-04-01 17:02:15 +02:00
Ivy Foster
f708944657 Remove toggle sneak menu option
Users can change the option in settings.cfg.
2015-03-08 16:15:43 -05:00
Ivy Foster
ba7fc8609c Add toggle sneak option; fix bug #2119
To enable toggle sneak mode, set "toggle sneak = true" in
the [Input] section of settings.cfg.

Outstanding issues:
    - In toggle sneak mode, holding the Sneak button causes
      rapid, repeated toggling.
    - The button in the settings menu doesn't do anything.
2015-03-08 15:23:46 -05:00
Marc Zinnschlag
8b84fa5579 Merge remote-tracking branch 'scrawl/master' 2015-03-02 20:01:31 +01:00
Marc Zinnschlag
36ea374c10 Merge remote-tracking branch 'sandstranger/fixes-for-glsles2' 2015-03-02 19:34:25 +01:00
scrawl
fb0fdf0312 New look for fps counter 2015-03-01 23:58:16 +01:00
sylar
4c57cfc2d3 fixes for glsles2 2015-03-01 09:49:33 +04:00
scrawl
960e99c4f3 Loading screen align fix 2015-02-28 17:43:15 +01:00
scrawl
76732b475a Remove leftover 2015-02-28 16:37:06 +01:00
scrawl
0cd5437595 gamecontrollerdb.txt updated from upstream, added link and license 2015-02-27 22:37:29 +01:00
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
Marc Zinnschlag
44d1f43b2b Merge remote-tracking branch 'sandstranger/fixes-for-android' 2015-02-27 10:34:41 +01:00
sylar
edd3f9f95c small fix for float 2015-02-27 08:58:00 +04:00
sylar
cef725012c fix transpose error fo gles2 2015-02-27 08:56:20 +04:00
Marc Zinnschlag
093c577895 Merge remote-tracking branch 'dteviot/Bug2344' 2015-02-26 19:05:30 +01:00
scrawl
68f89318e7 Fix canvas align in skill view 2015-02-22 20:56:47 +01:00
dteviot
accc078e0e Morrowind.ini import progress bar. (Fixes #2344)
1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files.
2015-02-22 08:46:12 +13:00