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

1830 commits

Author SHA1 Message Date
AnyOldName3
3d18ddc8e4 Take into account previous #line directives when expanding @foreach shader macros 2017-11-17 17:18:33 +00:00
David Cernat
5aff515d3f
Merge pull request #337 from OpenMW/master 
Add OpenMW commits up to 15 Nov 2017
 2017-11-16 08:49:56 +02:00
scrawl
5a93b6a324 Enable word-wrapping for the console history 2017-11-15 17:20:05 +00:00
Miloslav Číž
af38d3a47d get rid of sphericalscreenshot class 2017-11-15 17:01:16 +01:00
Miloslav Číž
226fb9c26b render cubemaps in OGL coordinates 2017-11-15 16:07:01 +01:00
Miloslav Číž
1c3d45f641 dirty 360 screenshot GPU setup 2017-11-15 15:20:59 +01:00
scrawl
b7eda61f7a Fix overlapping widgets in trade window layout (Fixes #4205) 2017-11-11 21:59:21 +00:00
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master 
Add OpenMW commits up to 11 Nov 2017
 2017-11-11 03:46:21 +02:00
scrawl
b9baee51d5 Fix overlapping widgets in trade window layout (Fixes #4205) 2017-11-10 22:51:29 +00:00
David Cernat
f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 2017-11-10 08:43:50 +02:00
AnyOldName3
590531595b Create @foreach shader preprocessor macro in preparation for moving shadow setup out of shadermanager.cpp 2017-11-10 02:02:27 +00:00
AnyOldName3
25432146f7 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2017-11-07 22:08:21 +00:00
AnyOldName3
715f29165b Dynamically adjust shaders to have the required number of shadow maps. 2017-11-07 20:22:45 +00:00
AnyOldName3
56fa33af66 Enable parallel split shadow maps 2017-11-07 00:32:04 +00:00
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
David Cernat
e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-10-16 07:37:29 +03: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
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03:00
AnyOldName3
b94bbe00cb Merge remote-tracking branch 'upstream/master' into osgshadow-test 2017-10-08 00:18:02 +01:00
David Cernat
38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 2017-10-06 04:10:04 +03: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
David Cernat
b1aacd5028 Merge pull request #299 from OpenMW/master 
Add OpenMW commits up to 27 Sep 2017
 2017-09-27 21:29:56 +03: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
David Cernat
73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwgui/container.cpp
 2017-09-22 19:12:41 +03: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
David Cernat
4d4eb1bb9f Merge pull request #292 from OpenMW/master 
Add OpenMW commits up to 18 Sep 2017
 2017-09-19 09:40:45 +03:00
Andrei Kortunov
3fb3c4c20f Add scrollbar to a birth effect lists (bug #4105) 2017-09-17 14:06:01 +04:00
David Cernat
960b91a53c Merge pull request #290 from OpenMW/master 
Add OpenMW commits up to 17 Sep 2017
 2017-09-17 10:53:33 +03:00
Chris Robinson
ec01b89e59 Increase the default buffer cache sizes 2017-09-14 16:00:42 -07:00
John
0060e457a6 [General] Add .desktop file for Server Browser 2017-09-02 16:30:52 +02:00
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-08-31 15:14:13 +03: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
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
 2017-08-05 00:09:34 +03: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
David Cernat
bfbf1bbac4 Merge pull request #247 from OpenMW/master 
Add OpenMW commits up to 26 Jul 2017
 2017-07-26 14:01:01 +03: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
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master 
Add OpenMW commits up to 19 Jul 2017
 2017-07-19 20:49:56 +03:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
David Cernat
fd046e42ef Merge pull request #242 from OpenMW/master 
Add OpenMW commits up to 16 Jul 2017
 2017-07-17 21:34:44 +03: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
David Cernat
c9c00d921e [Build] Add tes3mp_text_input to MyGUI's CMakeLists 2017-07-10 12:38:40 +03:00
David Cernat
c899525e30 [General] Use address keys with clearer meaning in tes3mp config files 2017-07-03 01:31:48 +03:00
David Cernat
1f682749d6 [General] Add optional notes to PasswordDialogs 2017-07-02 13:07:36 +03:00
David Cernat
89f6c6df96 Merge pull request #225 from OpenMW/master 
Add OpenMW commits up to 4 Jun 2017
 2017-06-05 03:38:58 +03: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
David Cernat
315ec46ff6 Merge pull request #224 from OpenMW/master 
Add OpenMW commits up to 3 Jun 2017
 2017-06-03 17:19:34 +03:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
David Cernat
41de1876a3 Merge pull request #223 from OpenMW/master 
Add OpenMW commits up to 31 May 2017
 2017-06-01 08:11:46 +03: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
David Cernat
0cce9908be Merge pull request #222 from OpenMW/master 
Add OpenMW commits up to 29 May 2017
 2017-05-29 04:53:23 +03:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips 
Tooltips layout fixes
 2017-05-29 00:13:34 +02:00
David Cernat
cdfc2db2d1 Merge pull request #220 from OpenMW/master 
Add OpenMW commits up to 26 May 2017
 2017-05-26 17:38:59 +03: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
Koncord
6739233aa3 [General] Change master server port to 25560 2017-05-01 18:56:09 +08: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
David Cernat
f2ec6ce02c Merge pull request #209 from OpenMW/master 
Add OpenMW commits up to 30 Apr 2017
 2017-04-30 13:31:16 +03:00
scrawl
9f1527b7da Merge pull request #1272 from akortunov/guifixes 
Service menus layout fixes
 2017-04-30 12:27:21 +02:00
Koncord
8492929738 [Client] Use RussoOne for chat 2017-04-30 01:08:19 +08:00
Koncord
26c00c3141 [Client] Change chat font to RussoOne for better visibility 2017-04-29 20:34:36 +08:00
Koncord
e53916da10 [Browser] Add Rules tab to ServerInfo 2017-04-27 11:41:45 +08:00
Koncord
3e00d42067 [Server] Reworking MasterClient to new master server 2017-04-24 20:01:05 +08:00
Andrei Kortunov
bc9080d9d7 Removed 31 symbols cap from service menus 2017-04-23 08:56:54 +04:00
David Cernat
a5484d237b Merge pull request #203 from OpenMW/master 
Add OpenMW commits up to 21 Apr 2017, part 2
 2017-04-21 21:07:37 +03:00
David Cernat
fec82dc033 Merge pull request #202 from OpenMW/master 
Add OpenMW commits up to 21 Apr 2017
 2017-04-21 07:58:13 +03: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
David Cernat
bf17464074 Merge pull request #198 from OpenMW/master 
Add OpenMW commits up to 14 Apr 2017
 2017-04-15 05:36:50 +03:00
scrawl
f63b1e81cd Merge pull request #1228 from akortunov/master 
Options to show hidden weapon parameters
 2017-04-14 20:01:08 +02:00
David Cernat
c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-04-13 07:07:49 +03: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
David Cernat
106c9edead Merge pull request #192 from OpenMW/master 
Add OpenMW commits up to 3 Apr 2017
 2017-04-04 01:48:43 +03: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
David Cernat
7647715dac Merge pull request #190 from OpenMW/master 
Add OpenMW commits up to 27 Mar 2017
 2017-03-28 08:05:23 +03: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
David Cernat
60037e4081 Merge pull request #185 from OpenMW/master 
Add OpenMW commits up to 14 Mar 2017
 2017-03-15 11:20:06 +02: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
Koncord
ea9c31a8f7 [Client] Add password to client params and to config file 2017-02-20 22:40:09 +08:00
Koncord
158e9b3b09 [Server] Add ability to set password to server from config & scripts 2017-02-20 22:40:09 +08:00
David Cernat
2ed9ae5739 Merge pull request #149 from OpenMW/master 
Add OpenMW commits up to 14 Feb 2017
 2017-02-14 10:27:53 +02:00
scrawl
e295a72d43 Add align=Center to GUI dialogs (Fixes #2289) 2017-02-14 07:58:16 +01:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02: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
David Cernat
ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2017-02-09 12:17:27 +02: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
David Cernat
3a29b2d41d Merge pull request #141 from OpenMW/master 
Add OpenMW commits up to 5 Feb 2017
 2017-02-05 07:11:45 +02: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
David Cernat
44e27148d5 Merge pull request #140 from OpenMW/master 
Add OpenMW commits up to 4 Feb 2017
 2017-02-04 07:37:17 +02: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
Koncord
1808cf815f [Browser] Some minor fixes 2017-02-01 18:00:03 +08:00
David Cernat
9f8f62b765 Merge pull request #137 from OpenMW/master 
Add OpenMW commits up to 1 Feb
 2017-02-01 09:28:23 +02: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
David Cernat
8e4a51dc17 Merge pull request #136 from OpenMW/master 
Add OpenMW commits up to 31 Jan
 2017-01-31 09:50:52 +02:00
David Cernat
8e1dff8e02 [Browser] Change "Not fully" into "Not full" 2017-01-30 07:30:58 +02:00
Koncord
c147d13a73 [Browser] Move hardcoded title to UI 2017-01-30 07:22:32 +08:00
Koncord
e3a304dd03 [Browser] Add filters to UI 2017-01-30 07:16:22 +08:00
Nikolay Kasyanov
9e8e9aef86 Update gamecontrollerdb.txt from upstream 2017-01-28 11:02:06 +01:00
David Cernat
268a1501ad [GUI] Make tes3mp_dialog_list larger 2017-01-27 11:59:26 +02:00
David Cernat
0917184359 [GUI] Replace "Yes" button with "OK" in tes3mp_dialog_list 2017-01-27 10:29:55 +02:00
Koncord
0af5e1269a Move browser xml files to files/tes3mp/ui 2017-01-22 15:00:28 +08:00
David Cernat
0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 2017-01-19 12:14:25 +02:00
David Cernat
b2577498a9 Use tes3mp icon for netlauncher 2017-01-18 16:37:06 +02:00
David Cernat
2e3f508a56 Fix broken default keys and enable master server in configs 2017-01-13 10:33:21 +02:00
Koncord
968546b20c Use master server address from config file 2017-01-11 22:58:50 +08:00
Koncord
cb799ee446 Server browser 2017-01-11 22:05:40 +08:00
Koncord
f510a5583f Move MasterClient to Networking class 
Rename MOTD to hostname
 2017-01-10 19:21:31 +08:00
David Cernat
973db7c78a Merge pull request #113 from OpenMW/master 
Add OpenMW commits up to 17 Dec
 2016-12-17 23:27:09 +02:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
David Cernat
7bbeed629d Merge pull request #109 from OpenMW/master 
Add OpenMW changes up to 25 Nov
 2016-11-26 01:58:43 +02: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
David Cernat
49a78d8462 Merge pull request #105 from OpenMW/master 
Add OpenMW changes up to 19 Nov
 2016-11-19 22:24:48 +02:00
MiroslavR
7e5ba4d435 Fix default values of some GMSTs 2016-11-17 19:43:02 +01:00
David Cernat
48ca4d29bc Merge pull request #99 from OpenMW/master 
Add OpenMW commits up to 7 Nov
 2016-11-08 00:24:39 +02:00
MiroslavR
e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 2016-11-06 11:01:46 +01:00
Koncord
adb49b7c7d Add New GUI dialog: ListBox 
Example:

local GUI_LISTBOX = 42

function OnPlayerSendMessage(pid, message)
    if message == "/lb" then
        local items = "consectetur adipiscing elit\nsed do eiusmod tempor incididunt ut labore\net dolore magna aliqua." -- items can be separated through newline
        local label = "Lorem ipsum dolor sit amet"
        tes3mp.ListBox(pid, GUI_LISTBOX, label, items)
    end
end

function OnGUIAction(pid, idGui, data)
    if idGui == GUI_LISTBOX then
        print("ID: " .. idGui .. " data: " .. tostring(data)) -- if value higher than last item id
    end
end
 2016-11-04 00:24:16 +08:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03: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
David Cernat
3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2016-10-14 18:34:17 +03: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
David Cernat
08a5cdc4f3 Make tes3mp config files less confusing 2016-09-27 16:40:12 +03:00
Koncord
fbfa9bccd0 added master address to client config 2016-08-24 16:21:04 +08:00
David Cernat
f93e382b8b Use tes3mp icon for executable, part 2 2016-08-24 04:01:05 +03:00
David Cernat
d6083552f1 Add tes3mp icon 2016-08-23 23:47:05 +03:00
David Cernat
a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 2016-08-18 05:21:25 +03:00
Koncord
35991fcd15 Add logger to client 2016-08-18 07:58:37 +08:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
Koncord
a92ef8b6bd Some fixes 2016-08-15 22:49:34 +08:00
Koncord
c695923825 Added master server stuff 2016-08-15 07:48:55 +08:00
scrawl
f291aabc4b Fix shader compile error for objects without diffuse map 2016-08-09 01:04:02 +02:00
David Cernat
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03: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
David Cernat
723a109fcd Move new logo to correct location 2016-08-06 04:20:10 +03:00
Koncord
166bc255a3 Add logo to repo 2016-08-02 17:38:16 +08:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
Stanislav Zhukov
131887c981 Delete script.pwn 
Not for this repo.
 2016-07-13 02:49:14 +08:00
Alexander Kurtz
ff3b7de0e7 Update gamecontrollerdb.txt from upstream. 2016-07-07 18:31:49 +02:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08: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
scrawl
a5847afdac Fix ignored clicks on HUD mini-map (Fixes #2388) 2015-02-20 00:00:13 +01:00
scrawl
93ffdb427c Small tweak to ripples 2015-02-14 15:53:01 +01:00
scrawl
a139e4efb0 Grey out completed quests in journal quests list 2015-02-13 16:51:34 +01:00
jacmoe
ee574e08ef MIT License header added to all terrain component files. 2015-02-09 20:16:29 +01:00
scrawl
c27c20a859 Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	files/materials/water.shader
 2015-02-09 19:40:59 +01:00
scrawl
dbd4abd6fe Fix ripples for D3D - added simpler effect (Fixes #1649) 2015-02-09 19:30:11 +01:00
Marc Zinnschlag
e9d6e4f6df Merge remote-tracking branch 'ace/include-cleanup' 2015-02-09 18:03:28 +01:00
scrawl
e81d2a9dde Merge remote-tracking branch 'upstream/openmw-35' into HEAD 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2015-02-08 21:28:29 +01:00
scrawl
c63ab673e1 Revert "Add freedesktop.org mimeinfo for OpenMW save game files" 
This reverts commit 94002b0758.

Conflicts:
	CMakeLists.txt
 2015-02-07 23:24:27 +01:00
MiroslavR
1230cf49bf Properly center jail progress widget, fix a bug with it not disappearing if the console is open 2015-02-07 18:38:41 +01:00
scrawl
9ce3e4b4e1 UI consistency fix in levelup dialog 2015-02-06 01:27:17 +01:00
Marc Zinnschlag
8292b22e2f Merge remote-tracking branch 'lazaroth/Tweaks' 2015-02-03 20:02:10 +01:00
Lazaroth
42363191a4 Layout tweaks 2015-02-03 15:25:36 +01:00
Marc Zinnschlag
0557d45bd1 renamed opencs into openmw-cs 2015-02-03 13:18:03 +01:00
Lazaroth
7685de1d50 MyGUI tweaks 
Feedback / testing is needed on this.

Some small button location tweaks and more importantly, some changes to
bring consistency between the Potion maker screen (already in openmw),
Trading screen (already in openmw), Spellmaker screen, Travel screen and
Training screen. It's mainly the top bar I'm talking about and
resizability.

It is not 1:1 towards vanilla, but looks better (IMO) and again, creates
some consistency. This can probably be expanded to the remaining screens
such as Enchanting and Spell and perhaps even the save/load screen to
have OpenMW wide consistency.
 2015-02-03 08:13:29 +01:00
Lazaroth
7aa5dbc27e Default sound level tweak 
These settings closer match vanilla relative sound levels.
 2015-02-03 02:31:03 +01:00
Lazaroth
fc6bd8e784 Water tweaks 
As per https://forum.openmw.org/viewtopic.php?f=3&t=2492
Also did a quick remove trailing spaces.
 2015-02-03 00:23:30 +01:00
Nikolay Kasyanov
6ac4b48705 Update executable name in Info.plist 2015-02-01 16:02:01 +02:00
scrawl
57a259c526 Remove references to no longer used font 2015-01-31 22:40:43 +01:00
scrawl
efbbe73c2a Fix pinned window caption 2015-01-31 22:40:41 +01:00
scrawl
417f60f467 Use the mooncircle textures (Fixes #1624, Fixes #1743) 2015-01-31 22:40:38 +01:00
scrawl
e0d0997409 Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter 2015-01-31 22:40:38 +01:00
scrawl
dac1290597 Reduce size of water plane and increase subdivisions (Fixes #969) 2015-01-31 22:40:37 +01:00
scrawl
9bcc84ceec Add option to stretch menu backgrounds/cutscenes to the whole screen 2015-01-28 00:22:56 +01:00
scrawl
cfdbe35b0f Dialogue window text area tweak 2015-01-27 23:12:20 +01:00
scrawl
3d80bb3207 Fix overlap for long window captions 2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e Split window caption bars so that the caption can be transparent (Fixes #531) 
Fix transparent window background not applying to the header bar (Fixes #2294)
 2015-01-27 23:05:19 +01:00
scrawl
e2fe9693f3 Add missing tooltips in edit effect dialog 2015-01-11 17:04:58 +01:00
Marc Zinnschlag
7c959c8494 Merge remote-tracking branch 'dteviot/Bug811' 2015-01-11 12:30:32 +01:00
scrawl
f9227beedd Add warning when loading a savegame that depends on non-existing content files (Fixes #2261) 2015-01-11 00:06:52 +01:00
dteviot
063388e0eb Change "Profile" to "Content List" in user visible strings in Launcher. (Fixes #810) 2015-01-10 15:04:45 +13:00
Marc Zinnschlag
f8a3ec3ee3 Merge remote-tracking branch 'scrawl/cmdline-savegame' 2015-01-08 20:57:49 +01:00
scrawl
94002b0758 Add freedesktop.org mimeinfo for OpenMW save game files 
This allows us to launch OpenMW when the user opens a save game file through the file manager.
 2015-01-07 15:08:57 +01:00
scrawl
d02e075bab Add setting for exterior cell grid size (Fixes #1537) 2015-01-07 02:34:29 +01:00
scrawl
e6be979350 Fix default position for spell window 2015-01-05 18:57:23 +01:00
Marc Zinnschlag
ec1df719fe Merge remote-tracking branch 'mrcheko/master' 2015-01-02 18:08:47 +01:00
mrcheko
a8621e6230 defaults are set to 1.0; remove contrast setting 
(can be changed in config though); disable gamma control for not Windows
OSs
 2015-01-02 16:49:22 +03:00
mrcheko
60a74d5eb8 increase robustness for gamma to persist in the system; 
use GMST strings for gamma interface
 2014-12-31 18:40:01 +03:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
mrcheko
04d95810d1 gamma/contrast system reworked 2014-12-30 18:33:11 +03:00
scrawl
9b33eca368 Use scaling factor for HUD map to match original MW 2014-12-24 15:45:14 +01:00
scrawl
5d7dcafa53 Make local map widget size configurable 2014-12-24 15:45:14 +01:00
scrawl
a47de06492 Make local map resolution configurable and use lower default value 
This seems to be the resolution the original engine is using. The change also significantly reduces cell loading time.
 2014-12-24 15:45:14 +01:00
scrawl
703b9c59e9 Add missing tooltips to spell creation dialog 2014-12-24 15:45:13 +01:00
scrawl
37e11b7272 Adjust loading box size for large captions 2014-12-24 15:45:12 +01:00
Sebastian Wick
e85df00158 change setting "borderless" to "window border" 
set window border on setting changes
disable window border checkbox in the launcher if fullscreen is enabled
 2014-12-24 15:09:50 +01:00
Sebastian Wick
ebd384455f disable borderless window by default 
fix positioning of the in-game graphics settings
 2014-12-22 02:56:07 +01:00
Sebastian Wick
639fbfad0b make borderless setting available to the UI 2014-12-22 02:44:20 +01:00
Sebastian Wick
ec18a2cfa0 add support for borderless windows 2014-12-22 02:16:30 +01:00
scrawl
79237d16a7 Refactor spell window to use model/view and remove duplicated code in QuickKeysMenu 
This should also improve window resizing performance, the widgets are now just resized instead of recreated.
 2014-12-15 13:28:03 +01:00
Digmaster
61d73d186d Fixed part of settings window being in the incorrect place 2014-12-09 14:56:40 -06:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
073a2f0674 Fixed issue with walking 2014-12-09 00:02:18 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
Marc Zinnschlag
6c8a662042 label local/global openmw.cfg files (Fixes #2196) 2014-12-08 20:08:59 +01:00
scrawl
b650338d69 Implement drawMode of NiStencilProperty (Feature #1057) 2014-12-03 18:28:35 +01:00
scrawl
077c619611 Implement Clamp mode for NiTexturingProperty (Fixes #2050) 2014-12-01 23:09:46 +01:00
scrawl
6960cac5eb Disable third person zoom feature by default due to usability issues (Fixes #2129) 2014-12-01 23:09:46 +01:00
Marc Zinnschlag
e04ead2bd5 new element visibility button icons 2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f updated run button 2014-11-27 09:27:29 +01:00
Sergey Shnatsel Davidoff
f1ff2b2d6a Add offscreen credits and a note about the use of "Play" icon from elementary icon theme to the SVG masters. Clean up unused offscreen objects in scene view icon. 2014-11-26 00:28:11 +03:00
Sergey Shnatsel Davidoff
54ac54b347 Add the "scene-play.png" icon for launching the game from OpenCS. Also included are SVG source and the GIMP XCF with transparency mask on the edges. 2014-11-26 00:20:45 +03:00
Marc Zinnschlag
7e1f86793c Merge remote-tracking branch 'shnatsel/master' 2014-11-24 11:27:28 +01:00
cc9cii
69134e3ac2 Add icon to windows executable. 2014-11-24 12:48:36 +11:00
Sergey Shnatsel Davidoff
5a16420231 supply the correct icon (without the red line) for the default rendering state 2014-11-23 19:47:53 +03:00
Sergey Shnatsel Davidoff
c9e7a41e1a Add my scene view icons: status overview icons, element toggle icons, parts from which they're assembled and the SVG master. 2014-11-23 17:39:01 +03:00
scrawl
e5a6049ea7 Improve clarity of label 2014-11-18 18:03:31 +01:00
scrawl
4fa303d7c4 Merge branch 'master' into HEAD 
Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt
 2014-11-18 17:43:51 +01:00
Marc Zinnschlag
5eb9fd81e1 use placeholder icons in OpenCS when no proper icon is available 2014-11-13 12:09:10 +01:00
scrawl
273a80e2c0 Merge branch 'master' of https://github.com/OpenMW/openmw 2014-11-11 15:43:46 +01:00
scrawl
07ea352e46 Fix button graphics preventing mouse clicks (Fixes #2104) 2014-11-07 00:16:41 +01:00
hasufell
0fd33e3198
Fix morrowind data files detection for custom install locations 2014-11-06 22:27:35 +01:00
Marc Zinnschlag
e5a087f8d6 Merge remote-tracking branch 'miroslavr/master' 2014-10-27 07:17:56 +01:00
Marc Zinnschlag
9d15e0d56f Merge remote-tracking branch 'sandstranger/fixes-shadows-on-glsles-shaders' 2014-10-27 07:16:32 +01:00
sylar
a5b509ca70 Merge branch 'fixes-shadows-on-glsles-shaders' of https://github.com/sandstranger/openmw 2014-11-26 06:56:28 +04:00
sylar
925f1487b0 fix for world_matrix error 2014-11-26 06:55:41 +04:00
MiroslavR
450e951b2d Adjusted book layout to better match vanilla 2014-10-26 01:54:25 +02:00
scrawl
c8a273f552 Stats window layout fix 2014-10-25 19:57:01 +02:00
sylar
c9750dc7c6 fixes shadows on glsles 2014-10-25 19:00:23 +04:00
Marc Zinnschlag
18b63d2e16 Merge remote-tracking branch 'lgro/issue_1982_long_class_names_are_cut_off' 2014-10-25 12:05:01 +02:00
Lukasz Gromanowski
d7716e7314 Fixes #1982: Long class names are cut off in the UI 
Corrected HBox, AutoSizedTextBox and TextBox positions and alignment.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-25 09:37:51 +02:00
Marc Zinnschlag
94ae222f0e Merge branch 'settings' 2014-10-19 13:44:15 +02:00
scrawl
6d7f4085a5 Add shader implementation of alpha test 2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:02:31 +02:00
Lukasz Gromanowski
02f0b7caa3 Fixes #1982: Long class names are cut off in the UI 
Added HBox widget with AutoSizedTextBox, spacer,
and TextBox for level, race, class caption and text pairs.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-16 23:22:22 +02:00
scrawl
c4e81adb83 Fix settings window being too small for all tabs on some localizations 2014-10-16 15:49:01 +02:00
Marc Zinnschlag
7de6360695 Removed all content from opencs.ini 
Not needed since we already have reasonable default values within the code. Keeping the file to allow global modifications to these values.
 2014-10-16 14:50:25 +02:00
scrawl
c3853b376d Fix outdated core_layouteditor.xml 2014-10-15 22:48:15 +02:00
Lukasz Gromanowski
f29c4086cd Fixes #1982: Long class names are cut off in the UI 
Increased length of text filed for race, class name
in stats window, and class name cation in chargen create
class window.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2014-10-12 15:18:37 +02:00
MiroslavR
29f5cb46ac Merge branch 'master' of github.com:OpenMW/openmw 2014-10-09 19:17:39 +02:00
sylar
70fd531722 None texturing filtering enable for android by default 2014-10-08 00:15:22 +04:00
sylar
3a625c567d fixes for shaders glsles 2014-10-07 23:32:19 +04:00
sylar
f75721a217 Add none texture filtering .It is fixes a bug with black objects in shaders glsles 2014-10-07 23:30:31 +04:00
MiroslavR
de2cb8926a Feature #1697: Queue fade operations, implement hit fader & werewolf overlay 2014-10-05 17:53:50 +02:00
scrawl
7d36a202a8 Implement cell loading threshold (Fixes #1874) 
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.

Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
 2014-10-02 16:50:10 +02:00
scrawl
a33514fa1d More shader compatibility fixes 2014-10-02 13:55:36 +02:00
scrawl
88da7f5157 Adjust border skin for loading bar and message boxes to match vanilla MW 2014-10-02 00:27:03 +02:00
scrawl
c826de49a5 Potential shader compatibility fix 2014-09-30 22:57:00 +02:00
scrawl
358257ca6b Rename some skin files to .skin.xml for consistency 2014-09-28 18:11:19 +02:00
scrawl
ff0b4e0583 Add debug window (F10), displays Bullet's profiler output 2014-09-28 18:02:49 +02:00
scrawl
fedfd7129d Add spacing between buttons to TabControl skin 2014-09-28 15:33:36 +02:00
scrawl
97df7c9b22 Get rid of markers.png and use original MW texture, cleanup 2014-09-26 13:40:10 +02:00
scrawl
4f0fc79ea4 Change global map cell size from 24 to 18 and make it configurable 2014-09-26 12:47:33 +02:00
scrawl
764c6287e1 Remove some garbage 2014-09-26 12:36:55 +02:00
scrawl
9fbc7ebc02 Tweak CountDialog layout 
First time using the LayoutEditor. Success!
 2014-09-25 21:04:59 +02:00
scrawl
b75b464495 Move Cancel buttons to right side of dialog (Fixes #1715) 2014-09-25 21:04:58 +02:00
scrawl
0bc840aadd Add NumericEditBox widget 2014-09-25 21:04:51 +02:00
scrawl
f721b7adfb Change skin files to use ResourceSkin (Skin is deprecated) - now the SkinEditor can load them 2014-09-25 16:41:27 +02:00
scrawl
6b65502557 Add properties for new widget classes to MyGUI plugin 2014-09-25 16:25:08 +02:00
scrawl
ad318c1f9d Add XML definition file for the MyGUI plugin 2014-09-25 15:07:15 +02:00
scrawl
088d01d727 Minor cleanup 2014-09-24 23:50:28 +02:00
Marc Zinnschlag
56858c98b1 Merge remote-tracking branch 'miroslavr/master' 2014-09-23 13:23:00 +02:00
MiroslavR
c362ec0f95 Book formatting: Handle line endings as per vanilla, fix tall images causing infinite loop, cleanup 2014-09-21 19:47:52 +02:00
scrawl
ef43196ef2 Add spacing to savegame dialog 2014-09-20 18:34:01 +02:00
scrawl
f5868f7ae1 Fix layout problems in generate class result dialog 2014-09-20 13:07:38 +02:00
scrawl
4cc95cf952 Tweak spacing on some tooltips 2014-09-20 11:02:44 +02:00
scrawl
e42cb8020e Change all skins to get font colors from fallback settings (Fixes #704) 2014-09-20 10:40:09 +02:00
MiroslavR
4f89c3e77a Rework book formatter (Fixes #1148) 2014-09-20 00:11:04 +02:00
Marc Zinnschlag
65ddf7acfe Merge remote-tracking branch 'scrawl/master' 2014-09-19 15:59:59 +02:00
scrawl
9c0649c11d Add basic framework to retrieve font colors from fallback settings (Feature #704) 2014-09-19 11:53:35 +02:00
scrawl
e94268b4e6 Remove some garbage 2014-09-19 10:54:43 +02:00
scrawl
cbc242d857 Move item count text to ItemWidget 2014-09-19 09:29:00 +02:00
scrawl
c5fa0768f1 Fix broken minimum track size for scrollbars 2014-09-14 10:23:23 +02:00
scrawl
413bad2dc6 Fix a MyGUI warning 2014-09-14 09:40:34 +02:00
Marc Zinnschlag
5dd424b6c6 Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-11 14:14:02 +02:00
scrawl
36a90198e2 Add option to change screenshot image format 2014-09-11 04:32:31 +02:00
cc9cii
6d12374ace Move windows platform specific files into a common directory. 2014-09-05 22:36:33 +10:00
cc9cii
fa0b3eb298 Add an icon to opencs.exe as well 2014-09-05 20:30:50 +10:00
Marc Zinnschlag
86995adc4a Merge remote-tracking branch 'cc9cii/Bug-No-1655' 2014-09-05 09:00:12 +02:00
cc9cii
e0e561a105 Add icon to windows exe 2014-09-05 07:17:31 +10:00
MiroslavR
386bb98fd2 Do not attach coin widgets to a box 2014-09-03 03:03:03 +02:00
MiroslavR
5977860e09 Fix broken coin placement in levelup dialog + possible memleak 2014-09-02 22:06:02 +02:00
MiroslavR
98e7ab1b79 Add missing tooltips to enchant dialog 2014-09-01 03:40:11 +02:00
scrawl
4f92044d71 Allow user-created markers on local map (Fixes #1571) 2014-08-26 17:45:23 +02:00
MiroslavR
fc21d898f2 Add hand-to-hand tooltip 2014-08-25 03:15:28 +02:00
MiroslavR
e8a245bea3 Enchanting dialog: follow vanilla behavior more closely 2014-08-24 16:41:17 +02:00
MiroslavR
e2f15181f9 Make the "Choose an Attribute" text centered 2014-08-24 16:36:19 +02:00
scrawl
e9e7e96c5f SaveGameDialog: use ComboBox accept event, not changePosition (improves keyboard navigation) 2014-08-23 16:18:46 +02:00
scrawl
0a9a0a3b14 Slightly improve count dialog layout 2014-08-16 17:11:57 +02:00
MiroslavR
063b40a0ee Correct tooltip for maxed out skills 2014-08-16 13:30:49 +02:00
scrawl
44b517f66d Implement hiding inventory windows by double click on caption (Fixes #1690) 2014-08-06 20:13:58 +02:00
Marc Zinnschlag
33c36bf0df Merge remote-tracking branch 'scrawl/master' 2014-08-03 22:23:48 +02:00
scrawl
6cb9382bf0 Adjust screen-sized widgets automatically using Stretch align 2014-08-01 17:15:28 +02:00
scrawl
a18cec7c8e Use a MyGUI widget to render the screen fader (Fixes #1741, Fixes #1719) 2014-08-01 16:25:41 +02:00
Marc Zinnschlag
7a5f73de9e added navigation mode icons to buttons 2014-07-30 17:02:23 +02:00
Marc Zinnschlag
bb741eb8d7 Merge remote-tracking branch 'crysthala/master' 2014-07-30 16:49:27 +02:00
crysthala
f25e0b13b2 render window controls icons 
eyeball dude: first person
flying eye: free cam
orbit2: orbiting cam
 2014-07-30 07:55:21 -05:00
Marc Zinnschlag
7991dfb907 Merge remote-tracking branch 'scrawl/master' 2014-07-28 09:03:17 +02:00
Marc Zinnschlag
c9cd7fb6b7 Merge branch 'scripts' 2014-07-28 09:02:24 +02:00
scrawl
fdc6dd6985 Shader compatibility fixes for GLSL ES 2014-07-27 20:33:44 +02:00
Marc Zinnschlag
5e543ac806 added script doortestwarp to blacklist 2014-07-25 11:53:30 +02:00
Marc Zinnschlag
4421e7a5cc added lighting mode toolbar icons 2014-07-25 11:15:04 +02:00
Marc Zinnschlag
151ef14b67 some cleanup 2014-07-25 11:10:12 +02:00
Marc Zinnschlag
358c76a049 Merge remote-tracking branch 'crysthala/master' 2014-07-24 22:29:29 +02:00
crysthala
919632a505 render lighting icons 2014-07-24 13:12:44 -05:00
scrawl
469d2afffa Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwgui/levelupdialog.cpp
 2014-07-24 02:33:46 +02:00
Marc Zinnschlag
f55084463b added MockChangeScript to script blacklist 2014-07-23 12:35:15 +02:00
scrawl
038a811f16 Rename travel window Ok button to Cancel (Fixes #1676) 2014-07-21 23:44:33 +02:00
MiroslavR
3b67e9b329 Rework level up dialog to behave more like vanilla 2014-07-21 20:56:02 +02:00
Marc Zinnschlag
d87630b41a blacklisting for scripts in OpenMW 2014-07-21 09:34:10 +02:00
scrawl
28a0899d2b Implement difficulty scaling (Fixes #1505) 2014-07-20 16:38:20 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
44fd526c98 Don't show disposition bar for creatures 2014-06-26 15:36:19 +02:00
Marc Zinnschlag
85965bfd47 Merge remote-tracking branch 'scrawl/master' 2014-06-25 09:58:00 +02:00
scrawl
8eab3abb15 Fix initial view offset for large world maps (Fixes #1523) 2014-06-19 19:03:12 +02:00
Marc Zinnschlag
30f8e279ed Merge remote-tracking branch 'scrawl/master' 2014-06-19 10:35:28 +02:00
scrawl
5645c9185b Fix location of local data path 2014-06-18 17:18:48 +02:00
scrawl
224163e5a2 Fix console text becoming unreadable when selected (Fixes #1530) 2014-06-18 16:57:54 +02:00
scrawl
d4678a8d55 Fix level up dialogue layout (Fixes #1393) 2014-06-18 16:57:53 +02:00
scrawl
cb6f1d3a52 Fix wait dialog arrow button step (Fixes #1524) 2014-06-17 14:58:11 +02:00
Marc Zinnschlag
2683aa9503 Merge remote-tracking branch 'filkry/bug640_luminescent_water' 2014-06-17 13:08:06 +02:00
Fil Krynicki
cfea7736d9 WIP fix 
Bug is fixed, but appears to have broken vision underwater. Notes:

+ basically fixed by darkening the colour of water such that it is
darker than refracted terrain
+ also disabled sunlight scattering at night. This may actually be
desirable, but given there is no visible moon it seems unlikely to make
much sense, and blends a lot of green into the water colour appearing
luminescent at night
 2014-06-16 17:08:02 -04:00
scrawl
5f5c0c5bff Remove an unused setting 2014-06-16 03:29:02 +02:00
scrawl
468db7a9c4 Remove terrain limit warning text that no longer applies 2014-06-16 03:16:50 +02:00
scrawl
311acfa8ff Add delete button to save load menu (Fixes #1453) 2014-06-10 02:27:38 +02:00
scrawl
cdd53862cb Increase width of dialogue topic list (Fixes #1440) 2014-06-08 23:15:50 +02:00
scrawl
a3752da79f Store Always Run control state in settings 2014-06-08 19:50:39 +02:00
scrawl
6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391) 
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
 2014-06-05 22:13:18 +02:00
scrawl
d7f3cd75ac Rewrite journal GUI topic list to use MWList 2014-06-03 16:04:18 +02:00
scrawl
bbc5b125ab Rewrite journal GUI quest index 
- Use quest names as identifiers, not quest IDs. This ensures that quests with different IDs, but the same name (e.g. A2_4_MiloCaiusGone and A2_4_MiloGone) are merged properly, as they should.
 - Switch display from BookPage to MWList. Handles word-wrapping and scrolling properly.
 - Fixes a bug where the quest index would not be updated when opened.
 2014-06-03 00:28:33 +02:00
scrawl
5df9ff8e2c Respect CMAKE_INSTALL_PREFIX in the global openmw.cfg 
Fixes installing to /usr/local (Bug #1378)
 2014-06-01 23:32:05 +02:00
scrawl
a1bdf20958 Make trade balance label editable 2014-05-31 13:53:36 +02:00
scrawl
d26f756c53 Fix several edit boxes not receiving mouse input 2014-05-30 14:52:47 +02:00
pvdk
2a6a26c0d0 Minor fixes 2014-05-29 21:02:06 +02:00
pvdk
38d825b004 Merge remote-tracking branch 'upstream/master' into wizard 
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
 2014-05-29 16:42:16 +02:00
scrawl
3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
scrawl
0fe0dc33a6 Fixes #1338: Bring back a label that got lost 2014-05-19 05:35:16 +02:00
scrawl
15368188dc Fix sliders in effect editor not being precisely movable 2014-05-17 02:54:51 +02:00
scrawl
f01c3e0eac Fixes #1037: Change default footstep volume to match vanilla 2014-05-13 19:38:28 +02:00
scrawl
3ad28ec5aa Set a proper Page size for all scrollbars. Fixes scrollbars only moving very slowly when interacting with them (as opposed to using mousewheel on the content) 2014-05-11 00:09:02 +02:00
scrawl
6e9458c076 Small fix for dropping items from inventory 
Some widgets prevented clicking through
 2014-05-08 21:04:11 +02:00
graffy76
a17cb1f389 Fixed opencs.ini formatting 2014-05-06 07:37:52 -05:00
graffy76
475214ab62 Implmented QSettings for loading / saving file definitions. Also 
renamed opencs.cfg to opencs.ini to follow Ini format standards
 2014-05-05 05:56:03 -05:00
scrawl
58d868d56a Change default water setting (current fps is low enough as it is without this setting enabled) 2014-05-02 19:16:10 +02:00
scrawl
6f7fbc867f Fix several leaks 2014-05-01 16:55:15 +02:00
Marc Zinnschlag
3013c34d9b Merge remote-tracking branch 'scrawl/master' 2014-04-28 21:46:05 +02:00
Lars Söderberg
d530bbe5cd Implemented Scrawls alternative workaround. 2014-04-28 18:52:53 +02:00
scrawl
a35f7c73ae Fixes #1286 (Dialogue topic list clips with window frame) 
The first problem was with the ScrollView skin, which had a full-sized client area. Since the scrollbar starts out visible, MyGUI expects the client area to be smaller to accomodate for the scrollbar width. As a result, the starting canvas size becomes bigger than the view size.
Another bug was with the MWList code: reducing the canvas size for the scrollbar is not needed, since MyGUI is already doing that, and attempting to do it manually interferes with the view offset.
 2014-04-28 18:40:29 +02:00
Lars Söderberg
0513d0837c Alignment tweaks and autosized buttons workaround 2014-04-28 17:54:55 +02:00
Lars Söderberg
04e5b9c72c Right aligned version/revision 
I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
 2014-04-28 16:23:07 +02:00
Lars Söderberg
b0bdd233ee Center, switch and change text for confirmation buttons 
The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.

Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.

To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.

Comments?
 2014-04-28 16:05:27 +02:00
scrawl
138fb4e29a Bug #1265: Fixed confirmation buttons align 2014-04-28 12:51:46 +02:00
scrawl
4555f6ddf6 Add text shadow to progress bar labels 2014-04-28 11:19:12 +02:00
scrawl
dac0b7090a Get rid of bigbars.png and smallbars.png 
Changed loading bar colour to match vanilla
 2014-04-27 09:43:48 +02:00
scrawl
14757a856b Tweak settings window size and encumbrance bar text align 2014-04-27 08:17:14 +02:00
scrawl
dd14dec8dc Tweak loading screen progress bar positioning to match vanilla 2014-04-27 08:16:35 +02:00
Thomas
a598060071 Added autosave on rest, as well as an option in the settings menu 2014-04-23 23:12:30 -04:00
pvdk
aa07a33906 Fixed most of the memory leaks and started working on correctly exiting the thread 2014-04-18 13:17:37 +02:00