1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-28 18:45:33 +00:00
Commit graph

661 commits

Author SHA1 Message Date
David Cernat
43e7df6df8 Add OpenMW commits up to 11 Mar 2020 2020-03-11 22:17:17 +02:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00
Frederic Chardon
78d58a344d Item search in inventory (feature #4831) 2020-02-24 18:14:40 +00:00
David Cernat
60b6f92fa3 Add OpenMW commits up to 13 Jan 2020
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
2020-01-15 07:49:26 +02:00
Andrei Kortunov
2b8e976c6a Adjust settings menu 2020-01-10 14:07:53 +04:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
2019-11-19 17:16:48 +02:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
Andrei Kortunov
bfc07afa28 Restore normal size of quests buttons in journal 2019-11-09 14:36:22 +04:00
David Cernat
4d40f05576 [GUI] Make TES3MP text input window resize itself automatically 2019-10-10 05:04:44 +03:00
David Cernat
63f55ce762 [GUI] Fix chat window layout after 1ce370e7fa made it stop working 2019-08-27 10:53:26 +03:00
David Cernat
ed05125f6a Add OpenMW commits up to 2 Aug 2019
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
2019-08-22 15:38:15 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-22 11:42:02 +03:00
David Cernat
5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
2019-08-22 08:40:32 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
2019-08-21 17:29:24 +03:00
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
2019-08-21 15:48:07 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-21 14:37:54 +03:00
David Cernat
fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
2019-08-20 13:15:00 +03:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
unknown
d9439389e6 fix #4665 2019-06-21 21:37:38 +02:00
Andrei Kortunov
ae935a8084 Add separate textures for scrollbars (feature #5051) 2019-06-01 16:12:03 +04:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell
Add a button to delete spells from spellwindow
2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning
Allow to maximize windows via Shift + Double Click
2019-05-04 20:21:30 +03:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Andrei Kortunov
6e7bdfe329 Make progress bar close to vanilla 2019-04-27 12:31:20 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2d94fa20d2 spell window layout: make longer to fit russian translation 2019-04-25 06:24:32 -04:00
Ilya Zhuravlev
04de2fcc54 spell window: Use sDeleteSpell instead of hardcoding string caption 2019-04-24 19:57:15 -04:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Andrei Kortunov
7e0bf40dbe Allow to shrink tooltip width to its actual text width (bug #3812) 2019-04-21 08:27:14 +04:00
Andrei Kortunov
31ddb0a482 Allow to calculate UI skin size based on texture resolution (feature #4968) 2019-04-10 10:34:07 +04:00
Capostrophic
168e758921 Correct look and behavior of some setting sliders 2019-03-17 06:44:42 +03:00
Andrei Kortunov
5505582a97 Fix localized 'Invert Y axis' label cutoff 2019-03-03 20:53:05 +04:00
Andrei Kortunov
9398117ea7 Allow to do not reflect terrain 2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184 Add more settings to water reflections in exteriors (feature #4859) 2019-03-02 14:26:14 +04:00
Capostrophic
39dcbacf44 Option to disable controller (feature #3980) 2019-02-15 18:40:22 +03:00
Andrei Kortunov
8580a58ba0 Optimize HUD update (do not do unnecessary work) 2019-01-25 21:15:29 +04:00
Capostrophic
7b5932a49d Add Invert X Axis option (feature #3610) 2018-12-01 19:08:02 +03:00
Andrei Kortunov
06d226a1b7 Minor tweaks for actors processing range setting 2018-10-28 15:08:24 +04:00
Andrei Kortunov
e7de6b974a Optimize actors processing
1. Do not update physics and animations for actors outside processing range (bug #4647)
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
2018-10-25 22:52:59 +04:00
Andrei Kortunov
276b7830a9 Mass potion creation (feature #4642) 2018-09-20 15:45:14 +04:00
Andrei Kortunov
c9c0230d2a Scale journal fonts separately from common ones 2018-09-12 14:31:01 +04:00
Andrei Kortunov
8da099713e Minor layout fixes to fit different font size 2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca Improve GUI scaling (bug #3288) 2018-09-12 14:31:01 +04:00
David Cernat
26ac29e8b1 [Client] Add disclaimer to save dialog about singleplayer-only saves 2018-07-09 22:55:11 +03:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
2018-05-27 16:10:16 +03:00
Andrei Kortunov
9ac752ea70 Implement filtering in the spells window 2018-05-24 10:48:46 +04: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
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 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
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
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
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
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
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
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