David Cernat
841a4f90c1
Merge pull request #301 from TES3MP/master
...
Add master commits up to 28 Sep 2017
2017-09-28 11:13:51 +03: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
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00:00
Miloslav Číž
cde2c13900
make water depth independent of view frustum
2017-09-26 14:14:28 +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
b5ce3cebbc
Merge pull request #297 from TES3MP/master
...
Add master commits up to 22 Sep 2017
2017-09-22 19:15:42 +03: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
Koncord
5fcdff843c
[Master] Minor fixes in lua scripts
2017-09-21 16:30:05 +08: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
David Cernat
76f1a61538
Merge pull request #295 from TES3MP/master
...
Add master commits up to 20 Sep 2017
2017-09-20 16:56:46 +03: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
381a5fabc4
Merge pull request #291 from TES3MP/master
...
Add master commits up to 17 Sep 2017
2017-09-17 11:29:40 +03: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
Koncord
c2286482ae
[Master] Add 'savebans' command to RESTful API
2017-09-13 20:33:42 +08:00
Koncord
f814ae795d
[Master] Fix return from isServerValid()
...
Temporary accept all servers in OnServerAnnnounce
2017-09-13 19:11:58 +08:00
Koncord
50ef9677fe
[Master] Fix master.lua
...
Remove unban() from loadBans()
Disable strict json order from saveBans()
2017-09-13 17:59:07 +08:00
Koncord
045dc566ea
Merge branch 'master' into new-script-api
2017-09-12 21:41:25 +08:00
Koncord
f99dafbf51
[Master] Add scripts for generating certificates for testing purposes
2017-09-12 21:27:07 +08:00
Koncord
aee6fb1265
[Master] Add master lua scripts
2017-09-12 21:24:06 +08: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 014a2fc0e9http://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
