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
scrawl
6f5b68859f
Comment out UV test that is not working
2016-06-16 17:33:54 +02:00
scrawl
6a1fd05074
Fix the coordinate frame for eyeDir, minor cleanup (Bug #3440 )
2016-06-16 17:32:27 +02:00
scrawl
aa5a643e3b
Fix incorrect multiplication order of TBN matrix (Bug #3440 )
2016-06-16 17:31:17 +02:00
Marc Zinnschlag
091e1bf25d
improved scene element visibility buttons
2016-04-23 13:54:19 +02:00
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
2016-04-21 17:25:53 +03:00
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
2016-04-21 15:18:30 +03:00
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.
2016-04-17 17:17:07 +02:00
scrawl
e1dda9675d
Add "preload instances" setting, disabling this may help if you are low on memory.
2016-03-30 00:13:37 +02:00
scrawl
6f31b3d79f
Add parallax mapping for objects
2016-03-22 21:46:15 +01:00
scrawl
b59b2c6d6d
Move to parallax.glsl
2016-03-22 21:46:15 +01:00
scrawl
b4dda045a6
Pass the tangent in object space
2016-03-22 21:46:15 +01:00
scrawl
157c11398d
Add terrain parallax mapping
2016-03-22 21:46:15 +01:00
Marc Zinnschlag
563f44b823
Merge remote-tracking branch 'origin/master'
2016-03-03 12:13:11 +01:00
