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

573 commits

Author SHA1 Message Date
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
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
Andrei Kortunov
e4df17ccaf Make inventory avatar to fit within border (bug #4003) 2017-08-11 09:02:50 +04: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
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
196eedf1b0 Fix key focus issue with the journal hotkey 2017-07-30 23:51:07 +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
1f682749d6 [General] Add optional notes to PasswordDialogs 2017-07-02 13:07:36 +03: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
Andrei Kortunov
da828a1089 Class choice layout fix 2017-05-01 21:37:37 +04:00
Andrei Kortunov
ba78e187c7 Listbox spacing fix 2017-05-01 21:28:42 +04:00
Andrei Kortunov
0e35e6a700 Class generation menu layout fixes 2017-05-01 20:51:54 +04:00
Andrei Kortunov
1520a4d7db Levelup menu layout fixes 2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0 Tooltips: faction, magic effects layout fixes 2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 2017-04-30 22:39:05 +04:00
Andrei Kortunov
27181367e2 Tooltips: skills and attributes layout fixes 2017-04-30 21:26:13 +04:00
Andrei Kortunov
6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 2017-04-30 19:45:36 +04:00
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
Andrei Kortunov
bc9080d9d7 Removed 31 symbols cap from service menus 2017-04-23 08:56:54 +04: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
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
aac78d29a4 Service menus layout fixes 2017-04-16 20:30:20 +04: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
Andrei Kortunov
1fe3a3efe4 Count dialog layout changes 2017-04-12 19:15:22 +04: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
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
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
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
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
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
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
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
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
2016-07-07 23:50:48 +08:00
scrawl
1232607385 Remove pointless widget names in settings layout file 2016-02-18 19:41:06 +01:00
scrawl
3969675afa Remove unused settings 2016-02-18 19:38:34 +01:00
scrawl
7f89bb273a Add 'reflect actors' setting for the water shader, default off 2016-02-18 19:36:17 +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
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
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
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