Commit Graph

1351 Commits (7a646494ee737495b706a83b69b6fded430cbc49)

Author SHA1 Message Date
scrawl 2611377081 Merge pull request #1350 from akortunov/deathanimationfix
Do not allow to loot fighting actors during death animation (bug #3528)
7 years ago
scrawl 1f2b62c541 Merge pull request #1388 from akortunov/guifixes
Make inventory avatar to fit within border
7 years ago
Andrei Kortunov e4df17ccaf Make inventory avatar to fit within border (bug #4003) 7 years ago
scrawl 0f983144a4 Merge pull request #1383 from akortunov/guifixes
Enable transparency for interactive messageboxes and tooltips in game mode
7 years ago
Thunderforge f41a4bb937 Changing "New Installation" to "Retail CD/DVD" for clarity 7 years ago
Andrei Kortunov 56f5a5dee3 Added transparency to 'owned' tooltip 8 years ago
Andrei Kortunov 8c1c80ab91 Disable transparency for persuation dialogue menu 8 years ago
Andrei Kortunov 6cb3c83248 Add transparency for interactive messageboxes in game mode 8 years ago
Andrei Kortunov dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 8 years ago
David Cernat 721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
8 years ago
Andrei Kortunov 56a30d7aec Journalbook layout fixes 8 years ago
Andrei Kortunov a03cc8216e Fixed count widget buttons alignment 8 years ago
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.
8 years ago
scrawl 7d97d1d513 Merge pull request #1247 from pvdk/progressbar
Ini-importer progress bar fills the whole width of the ui element now
8 years ago
Thunderforge b98e175161 Renaming duplicate horizontalSpacer variable 8 years ago
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)
8 years ago
scrawl 196eedf1b0 Fix key focus issue with the journal hotkey 8 years ago
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.
8 years ago
David Cernat bfbf1bbac4 Merge pull request #247 from OpenMW/master
Add OpenMW commits up to 26 Jul 2017
8 years ago
Thunderforge 072fbcaee3 UI adjustments to prevent parchment scroll from being cut off (fixes #3910) 8 years ago
Thunderforge 8ded95201d Move Morrowind Content Language label to section header 8 years ago
David Cernat b8b3856c73 Merge pull request #244 from OpenMW/master
Add OpenMW commits up to 19 Jul 2017
8 years ago
scrawl 20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 8 years ago
David Cernat fd046e42ef Merge pull request #242 from OpenMW/master
Add OpenMW commits up to 16 Jul 2017
8 years ago
Andrei Kortunov 6795163265 Disable transparency for all popup lists 8 years ago
Andrei Kortunov 5bb9f1b187 Make popup in character select menu non-transparent 8 years ago
Andrei Kortunov 2b22d10ebc Spellview fixes 8 years ago
Andrei Kortunov 9179a019df Quick keys menu fixes 8 years ago
Andrei Kortunov 5be1c81913 Fixed Close button handler in EditEffectDialog (fixes #3956) 8 years ago
David Cernat c9c00d921e [Build] Add tes3mp_text_input to MyGUI's CMakeLists 8 years ago
David Cernat c899525e30 [General] Use address keys with clearer meaning in tes3mp config files 8 years ago
David Cernat 1f682749d6 [General] Add optional notes to PasswordDialogs 8 years ago
David Cernat 89f6c6df96 Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
8 years ago
Andrei Kortunov f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 8 years ago
David Cernat 315ec46ff6 Merge pull request #224 from OpenMW/master
Add OpenMW commits up to 3 Jun 2017
8 years ago
Andrei Kortunov 9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 8 years ago
David Cernat 41de1876a3 Merge pull request #223 from OpenMW/master
Add OpenMW commits up to 31 May 2017
8 years ago
scrawl 9fd0d54a35 Merge pull request #1289 from akortunov/newrepair
Improved repair and recharge widgets
8 years ago
Andrei Kortunov 10d4cb15ad Improved repair widget 8 years ago
Andrei Kortunov 1164c3f16e Improved recharge widget 8 years ago
scrawl 2638327593 Merge pull request #1303 from akortunov/guifixes
Character generation layout fixes
8 years ago
Andrei Kortunov 2b28d1a6d2 Select specialization menu layout fix 8 years ago
David Cernat 0cce9908be Merge pull request #222 from OpenMW/master
Add OpenMW commits up to 29 May 2017
8 years ago
scrawl a1661af864 Merge pull request #1301 from akortunov/tooltips
Tooltips layout fixes
8 years ago
David Cernat cdfc2db2d1 Merge pull request #220 from OpenMW/master
Add OpenMW commits up to 26 May 2017
8 years ago
Andrei Kortunov f17badb3cd Makes cells cache size configurable 8 years ago
Andrei Kortunov da828a1089 Class choice layout fix 8 years ago
Andrei Kortunov ba78e187c7 Listbox spacing fix 8 years ago
Andrei Kortunov 0e35e6a700 Class generation menu layout fixes 8 years ago
Andrei Kortunov 1520a4d7db Levelup menu layout fixes 8 years ago
Koncord 6739233aa3 [General] Change master server port to 25560 8 years ago
Andrei Kortunov 26ec467df0 Tooltips: faction, magic effects layout fixes 8 years ago
Andrei Kortunov 987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 8 years ago
Andrei Kortunov 27181367e2 Tooltips: skills and attributes layout fixes 8 years ago
Andrei Kortunov 6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 8 years ago
David Cernat f2ec6ce02c Merge pull request #209 from OpenMW/master
Add OpenMW commits up to 30 Apr 2017
8 years ago
scrawl 9f1527b7da Merge pull request #1272 from akortunov/guifixes
Service menus layout fixes
8 years ago
Koncord 8492929738 [Client] Use RussoOne for chat 8 years ago
Koncord 26c00c3141 [Client] Change chat font to RussoOne for better visibility 8 years ago
Koncord e53916da10 [Browser] Add Rules tab to ServerInfo 8 years ago
Koncord 3e00d42067 [Server] Reworking MasterClient to new master server 8 years ago
Andrei Kortunov bc9080d9d7 Removed 31 symbols cap from service menus 8 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
David Cernat fec82dc033 Merge pull request #202 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017
8 years ago
Andrei Kortunov 6c1e3a0618 Merged from upstream master 8 years ago
Andrei Kortunov c65c643abe Fixed race menu skills layout 8 years ago
Andrei Kortunov 0a90b48e60 Fixed progressbars layout in review menu 8 years ago
Andrei Kortunov f0f1df3a96 Properly clear inventory 8 years ago
Andrei Kortunov aac78d29a4 Service menus layout fixes 8 years ago
David Cernat bf17464074 Merge pull request #198 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
8 years ago
scrawl f63b1e81cd Merge pull request #1228 from akortunov/master
Options to show hidden weapon parameters
8 years ago
David Cernat c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
scrawl 8d8f293a65 Merge pull request #1246 from akortunov/develop
Menu improvements
8 years ago
Andrei Kortunov 1fe3a3efe4 Count dialog layout changes 8 years ago
Andrei Kortunov 72a16dc78b Merge branch 'master' into pinned since added PR #1250 8 years ago
Andrei Kortunov 506cc47c9d Add option to show reach and attack speed for melee weapons 8 years ago
Andrei Kortunov 95ce7637f3 Adds persisted pin (feature #2834, bug #2489) 8 years ago
David Cernat 106c9edead Merge pull request #192 from OpenMW/master
Add OpenMW commits up to 3 Apr 2017
8 years ago
MiroslavR 395e97cf40 Remove evil "implicit GetJournalIndex" hack from expression parser 8 years ago
Pieter van der Kloet 8d76903392 Ini-importer progress bar fills the whole width of the ui element now 8 years ago
Andrei Kortunov df5a43363a Confirmation dialogs size fix 8 years ago
Andrei Kortunov e5a0f89934 List scroll fix 8 years ago
David Cernat 7647715dac Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
8 years ago
Andrei Kortunov edadcb338c Savegame dialog improvements 8 years ago
Andrei Kortunov a35d4334c3 Encumberance text fix 8 years ago
Andrei Kortunov c9cf0ec977 Buttons and widgets captions vertical alignment 8 years ago
Andrei Kortunov 7d09a5d644 Progress bars vertical alignment 8 years ago
Andrei Kortunov 4daa88351b Vanilla style progress bars 8 years ago
Andrei Kortunov b89fdcfd27 Vanilla style drowning widget (partially fixes bug #3801). 8 years ago
Andrei Kortunov 1286754fb3 Add a new option to show arrow damage (feature #2923) 8 years ago
David Cernat 60037e4081 Merge pull request #185 from OpenMW/master
Add OpenMW commits up to 14 Mar 2017
8 years ago
scrawl 19d516cbda Use the QuadTreeWorld based on distant terrain setting now that it sort of works. 8 years ago
Koncord ea9c31a8f7 [Client] Add password to client params and to config file 8 years ago
Koncord 158e9b3b09 [Server] Add ability to set password to server from config & scripts 8 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl e295a72d43 Add align=Center to GUI dialogs (Fixes #2289) 8 years ago
David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
8 years ago
scrawl 2ea0db1d1a Merge pull request #1198 from Allofich/combat
Make combat engagement logic more like vanilla
8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl 93c582064e Remove item shadows for equipped weapon/spell indicators 8 years ago
scrawl 45ae8d5ffa Add support for GL_AMBIENT colorMode to shaders as required by particle systems 8 years ago
Allofich 25c64dbb0f Make combat engagement logic more like vanilla
(Fixes #2678, Fixes #3705)
8 years ago
David Cernat 3a29b2d41d Merge pull request #141 from OpenMW/master
Add OpenMW commits up to 5 Feb 2017
8 years ago
scrawl 5f2539adb6 Optimize scrollbar/progress skins by using one widget for the track instead of one widget per pixel 8 years ago
David Cernat 44e27148d5 Merge pull request #140 from OpenMW/master
Add OpenMW commits up to 4 Feb 2017
8 years ago
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.
8 years ago
Koncord 1808cf815f [Browser] Some minor fixes 8 years ago
David Cernat 9f8f62b765 Merge pull request #137 from OpenMW/master
Add OpenMW commits up to 1 Feb
8 years ago
scrawl 1808b8567e Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera] 8 years ago
scrawl fcb4129aee Add 'small feature culling pixel size' setting 8 years ago
David Cernat 8e4a51dc17 Merge pull request #136 from OpenMW/master
Add OpenMW commits up to 31 Jan
8 years ago
David Cernat 8e1dff8e02 [Browser] Change "Not fully" into "Not full" 8 years ago
Koncord c147d13a73 [Browser] Move hardcoded title to UI 8 years ago
Koncord e3a304dd03 [Browser] Add filters to UI 8 years ago
Nikolay Kasyanov 9e8e9aef86 Update gamecontrollerdb.txt from upstream 8 years ago
David Cernat 268a1501ad [GUI] Make tes3mp_dialog_list larger 8 years ago
David Cernat 0917184359 [GUI] Replace "Yes" button with "OK" in tes3mp_dialog_list 8 years ago
Koncord 0af5e1269a Move browser xml files to files/tes3mp/ui 8 years ago
David Cernat 0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 8 years ago
David Cernat b2577498a9 Use tes3mp icon for netlauncher 8 years ago
David Cernat 2e3f508a56 Fix broken default keys and enable master server in configs 8 years ago
Koncord 968546b20c Use master server address from config file 8 years ago
Koncord cb799ee446 Server browser 8 years ago
Koncord f510a5583f Move MasterClient to Networking class
Rename MOTD to hostname
8 years ago
David Cernat 973db7c78a Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
8 years ago
Leon Krieg 739cd5ba45 Fixed more spelling mistakes 8 years ago
David Cernat 7bbeed629d Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
8 years ago
scrawl 5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
8 years ago
Nikolay Kasyanov db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
8 years ago
David Cernat 49a78d8462 Merge pull request #105 from OpenMW/master
Add OpenMW changes up to 19 Nov
8 years ago
MiroslavR 7e5ba4d435 Fix default values of some GMSTs 8 years ago
David Cernat 48ca4d29bc Merge pull request #99 from OpenMW/master
Add OpenMW commits up to 7 Nov
8 years ago
MiroslavR e80636f0ca Improve performance of repairing/recharging (Fixes #2493) 8 years ago
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
8 years ago
David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
MiroslavR 76ddd9bebb Add a setting for merchant auto-equipping prevention 8 years ago
scrawl 77bc807305 Attenuate the light ambient in lighting.glsl (Fixes #3597) 8 years ago
David Cernat 3136a12051 Resolve conflicts in pull request #75
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
8 years ago
scrawl e7154c3f7c Add the ItemShadow to various other skins 8 years ago
scrawl 612c3e995f Add drop shadow to ItemWidget (Fixes #3545) 8 years ago
David Cernat 08a5cdc4f3 Make tes3mp config files less confusing 8 years ago
Koncord fbfa9bccd0 added master address to client config 8 years ago
David Cernat f93e382b8b Use tes3mp icon for executable, part 2 8 years ago
David Cernat d6083552f1 Add tes3mp icon 8 years ago
David Cernat a2dbeb6c95 Share skills and attributes correctly upon logging in, and fix grammar 8 years ago
Koncord 35991fcd15 Add logger to client 8 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 8 years ago
Koncord a92ef8b6bd Some fixes 8 years ago
Koncord c695923825 Added master server stuff 8 years ago
scrawl f291aabc4b Fix shader compile error for objects without diffuse map 9 years ago
David Cernat babba95413 Merge pull request #34 from OpenMW/master
Add OpenMW commits from 1st week of August
9 years ago
David Carlier 83bab29e4b Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
9 years ago
David Cernat 723a109fcd Move new logo to correct location 9 years ago
Koncord 166bc255a3 Add logo to repo 9 years ago
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
9 years ago
Stanislav Zhukov 131887c981 Delete script.pwn
Not for this repo.
9 years ago
Alexander Kurtz ff3b7de0e7 Update gamecontrollerdb.txt from upstream. 9 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
9 years ago
scrawl bc04989448 Remove unused uniforms 9 years ago
scrawl 8e23c37668 Flip the parallax offset Y component based on tangent parity (Bug #3440) 9 years ago
scrawl 6f5b68859f Comment out UV test that is not working 9 years ago
scrawl 6a1fd05074 Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440) 9 years ago
scrawl aa5a643e3b Fix incorrect multiplication order of TBN matrix (Bug #3440) 9 years ago
Marc Zinnschlag 091e1bf25d improved scene element visibility buttons 9 years ago
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 9 years ago
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 9 years ago
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.
9 years ago
scrawl e1dda9675d Add "preload instances" setting, disabling this may help if you are low on memory. 9 years ago
scrawl 6f31b3d79f Add parallax mapping for objects 9 years ago
scrawl b59b2c6d6d Move to parallax.glsl 9 years ago
scrawl b4dda045a6 Pass the tangent in object space 9 years ago
scrawl 157c11398d Add terrain parallax mapping 9 years ago
Marc Zinnschlag 563f44b823 Merge remote-tracking branch 'origin/master' 9 years ago
Aesylwinn 9d985d883b added grid icon 9 years ago
scrawl 6e7c6fdd7e Implement NiTexturingProperty::DecalTexture 9 years ago
scrawl 414c19f717 Fix detailMapUV bug 9 years ago
scrawl 5e105da3ba Generate texture coordinates per-pixel when normal map + environment map are used 9 years ago
scrawl 900b522d13 Rename viewPos to viewDirection 9 years ago
scrawl 09684adeff Update settings documentation 9 years ago
scrawl 0db7163363 Add specular mapping for terrain 9 years ago
scrawl f01e8a6950 Add specular mapping for objects 9 years ago
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'
9 years ago
scrawl e2dc46c92e Update settings 9 years ago
scrawl 6000e48bba Add terrain shaders and normal map support
Textures with _n filename suffix are automatically recognized as terrain normal maps.
9 years ago
scrawl 5e12a1b4ef Add enchanted item glow to the shader 9 years ago
scrawl 1232607385 Remove pointless widget names in settings layout file 9 years ago
scrawl a73512afb7 Add shader settings to settings.cfg 9 years ago
scrawl 3969675afa Remove unused settings 9 years ago
scrawl e5a37a7023 Add normal map code 9 years ago
scrawl 18e80d5627 Add per-pixel lighting code 9 years ago
scrawl 1223bca3d4 Move doLighting to separate file 9 years ago
scrawl 456816f707 Use diffuse.a / vertex.a, use material emission 9 years ago
scrawl 5fd84074c5 Reimplement detailMap, darkMap and emissiveMap 9 years ago
scrawl e845c576d4 Use the texture matrix 9 years ago
scrawl 3859c58a8a Assign gl_ClipVertex in the vertex shader to make clip planes work 9 years ago
scrawl 9376811213 Vertex lighting shader 9 years ago
scrawl 044e0a829a Add fog 9 years ago
scrawl a9ad1b09e2 Introduce ShaderManager & ShaderVisitor
Actual shaders still to be written.
9 years ago
scrawl 7f89bb273a Add 'reflect actors' setting for the water shader, default off 9 years ago
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'.
9 years ago