Koncord
3e00d42067
[Server] Reworking MasterClient to new master server
2017-04-24 20:01:05 +08:00
Andrei Kortunov
bc9080d9d7
Removed 31 symbols cap from service menus
2017-04-23 08:56:54 +04:00
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03: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
6c1e3a0618
Merged from upstream master
2017-04-21 08:48:22 +04: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
f0f1df3a96
Properly clear inventory
2017-04-19 20:54:09 +04:00
Andrei Kortunov
aac78d29a4
Service menus layout fixes
2017-04-16 20:30:20 +04:00
David Cernat
bf17464074
Merge pull request #198 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
2017-04-15 05:36:50 +03:00
scrawl
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02: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
scrawl
8d8f293a65
Merge pull request #1246 from akortunov/develop
...
Menu improvements
2017-04-12 23:57:00 +02:00
Andrei Kortunov
1fe3a3efe4
Count dialog layout changes
2017-04-12 19:15:22 +04:00
Andrei Kortunov
72a16dc78b
Merge branch 'master' into pinned since added PR #1250
2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d
Add option to show reach and attack speed for melee weapons
2017-04-12 09:12:25 +04:00
Andrei Kortunov
95ce7637f3
Adds persisted pin (feature #2834 , bug #2489 )
2017-04-10 10:18:00 +04:00
David Cernat
106c9edead
Merge pull request #192 from OpenMW/master
...
Add OpenMW commits up to 3 Apr 2017
2017-04-04 01:48:43 +03:00
MiroslavR
395e97cf40
Remove evil "implicit GetJournalIndex" hack from expression parser
2017-04-03 01:44:26 +02:00
Pieter van der Kloet
8d76903392
Ini-importer progress bar fills the whole width of the ui element now
2017-04-02 03:15:32 +02: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
Andrei Kortunov
1286754fb3
Add a new option to show arrow damage (feature #2923 )
2017-03-18 08:07:36 +04:00
David Cernat
60037e4081
Merge pull request #185 from OpenMW/master
...
Add OpenMW commits up to 14 Mar 2017
2017-03-15 11:20:06 +02:00
scrawl
19d516cbda
Use the QuadTreeWorld based on distant terrain setting now that it sort of works.
2017-03-14 19:27:56 +01:00
Koncord
ea9c31a8f7
[Client] Add password to client params and to config file
2017-02-20 22:40:09 +08:00
Koncord
158e9b3b09
[Server] Add ability to set password to server from config & scripts
2017-02-20 22:40:09 +08: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
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
2017-02-10 21:39:16 +02:00
scrawl
2ea0db1d1a
Merge pull request #1198 from Allofich/combat
...
Make combat engagement logic more like vanilla
2017-02-10 06:20:04 +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
scrawl
45ae8d5ffa
Add support for GL_AMBIENT colorMode to shaders as required by particle systems
2017-02-08 18:39:24 +01:00
Allofich
25c64dbb0f
Make combat engagement logic more like vanilla
...
(Fixes #2678 , Fixes #3705 )
2017-02-07 01:25:12 +09: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
44e27148d5
Merge pull request #140 from OpenMW/master
...
Add OpenMW commits up to 4 Feb 2017
2017-02-04 07:37:17 +02:00
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.
2017-02-04 02:59:28 +01:00
Koncord
1808cf815f
[Browser] Some minor fixes
2017-02-01 18:00:03 +08:00
David Cernat
9f8f62b765
Merge pull request #137 from OpenMW/master
...
Add OpenMW commits up to 1 Feb
2017-02-01 09:28:23 +02:00
scrawl
1808b8567e
Add 'small feature culling pixel size' setting specifically for water RTTs, by default set higher than the one in [Camera]
2017-02-01 06:00:14 +01:00
scrawl
fcb4129aee
Add 'small feature culling pixel size' setting
2017-02-01 06:00:14 +01:00
David Cernat
8e4a51dc17
Merge pull request #136 from OpenMW/master
...
Add OpenMW commits up to 31 Jan
2017-01-31 09:50:52 +02:00
David Cernat
8e1dff8e02
[Browser] Change "Not fully" into "Not full"
2017-01-30 07:30:58 +02:00
Koncord
c147d13a73
[Browser] Move hardcoded title to UI
2017-01-30 07:22:32 +08:00
Koncord
e3a304dd03
[Browser] Add filters to UI
2017-01-30 07:16:22 +08:00
Nikolay Kasyanov
9e8e9aef86
Update gamecontrollerdb.txt from upstream
2017-01-28 11:02:06 +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
Koncord
0af5e1269a
Move browser xml files to files/tes3mp/ui
2017-01-22 15:00:28 +08:00
David Cernat
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
2017-01-19 12:14:25 +02:00
David Cernat
b2577498a9
Use tes3mp icon for netlauncher
2017-01-18 16:37:06 +02:00
David Cernat
2e3f508a56
Fix broken default keys and enable master server in configs
2017-01-13 10:33:21 +02:00
Koncord
968546b20c
Use master server address from config file
2017-01-11 22:58:50 +08:00
Koncord
cb799ee446
Server browser
2017-01-11 22:05:40 +08:00
Koncord
f510a5583f
Move MasterClient to Networking class
...
Rename MOTD to hostname
2017-01-10 19:21:31 +08:00
David Cernat
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
2016-12-17 23:27:09 +02:00
Leon Krieg
739cd5ba45
Fixed more spelling mistakes
2016-12-15 13:09:40 +01: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
47ebd24b4a
Merge pull request #79 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# apps/openmw/mwinput/inputmanagerimp.cpp
2016-10-24 09:18:21 +03:00
MiroslavR
76ddd9bebb
Add a setting for merchant auto-equipping prevention
2016-10-19 02:22:49 +02:00
scrawl
77bc807305
Attenuate the light ambient in lighting.glsl ( Fixes #3597 )
2016-10-17 15:01:10 +02: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
David Cernat
08a5cdc4f3
Make tes3mp config files less confusing
2016-09-27 16:40:12 +03:00
Koncord
fbfa9bccd0
added master address to client config
2016-08-24 16:21:04 +08:00
David Cernat
f93e382b8b
Use tes3mp icon for executable, part 2
2016-08-24 04:01:05 +03:00
David Cernat
d6083552f1
Add tes3mp icon
2016-08-23 23:47:05 +03:00
David Cernat
a2dbeb6c95
Share skills and attributes correctly upon logging in, and fix grammar
2016-08-18 05:21:25 +03:00
Koncord
35991fcd15
Add logger to client
2016-08-18 07:58:37 +08:00
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
2016-08-15 19:14:13 +03:00
Koncord
a92ef8b6bd
Some fixes
2016-08-15 22:49:34 +08:00
Koncord
c695923825
Added master server stuff
2016-08-15 07:48:55 +08:00
scrawl
f291aabc4b
Fix shader compile error for objects without diffuse map
2016-08-09 01:04:02 +02:00
David Cernat
babba95413
Merge pull request #34 from OpenMW/master
...
Add OpenMW commits from 1st week of August
2016-08-08 15:53:56 +03:00
David Carlier
83bab29e4b
Mainly making compilable under OpenBSD.
...
Renaming one resource file as the space led to issue for qt/moc.
2016-08-06 19:00:27 +01:00
David Cernat
723a109fcd
Move new logo to correct location
2016-08-06 04:20:10 +03:00
Koncord
166bc255a3
Add logo to repo
2016-08-02 17:38:16 +08: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
Stanislav Zhukov
131887c981
Delete script.pwn
...
Not for this repo.
2016-07-13 02:49:14 +08:00
Alexander Kurtz
ff3b7de0e7
Update gamecontrollerdb.txt from upstream.
2016-07-07 18:31:49 +02:00
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
2016-07-07 23:50:48 +08:00
scrawl
bc04989448
Remove unused uniforms
2016-06-17 00:20:53 +02:00
scrawl
8e23c37668
Flip the parallax offset Y component based on tangent parity (Bug #3440 )
2016-06-16 18:07:10 +02:00
