krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
20922 commits 35 branches 0 tags 65 MiB
Commit graph

1319 commits

Author SHA1 Message Date
Miloslav Číž
3b741dc4b7 Revert "Add slider for refraction size in settings window" 
This reverts commit ee40b41285.
 2018-01-01 13:28:14 +01:00
Miloslav Číž
ee40b41285 Add slider for refraction size in settings window 2017-12-09 14:03:56 +01:00
Miloslav Číž
b69c16e682 Add setting option to scale water refractions 2017-12-06 20:39:09 +01:00
David Cernat
e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	README.md
 2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master 
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
 2017-11-29 22:37:50 +00:00
David Cernat
656453725b
Merge pull request #343 from OpenMW/master 
Add OpenMW commits up to 23 Nov 2017
 2017-11-23 04:51:13 +02:00
scrawl
2136003e1c
Reapply commit a3f821cdc which got lost in a merge 2017-11-21 22:43:56 +00:00
Andrei Kortunov
ea36956ff1 Reworked trade window 2017-11-21 10:00:53 +04:00
scrawl
cc3c27f241 Clean up layout files to use Spacer class 2017-11-20 23:20:04 +00:00
scrawl
a3f821cdcd Disable keyboard for trade +/- buttons 
For one, because their RepeatClick handler breaks the keyboard function, and because its redundant anyway (just press Up/Down arrow with the edit box focused to do the same thing)
 2017-11-20 23:20:04 +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
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
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
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
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
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03: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
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
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