David Cernat
993cc3dfd6
[Server] Rename server "plugins"/"mods" into "modules" for clarity
...
The terms "plugins" and "mods" were used interchangeably to refer to collections of server scripts, which was bound to cause confusion later on, especially with client data files frequently being referred to as "plugins" and "mods" as well.
Moreover, the server configuration file now starts its manual ordering with "Module1" for consistency with the pluginlist.json (soon to be dataFileList.json) of the CoreScripts.
2017-12-02 15:39:08 +02:00
David Cernat
7e322f1f8b
Merge pull request #352 from TES3MP/master while resolving conflicts
...
# Conflicts:
# README.md
2017-11-30 10:10:38 +02:00
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
Koncord
382f56178c
[Client] Add custom windows
2017-11-25 23:50:14 +08:00
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master
...
Add master commits up to 23 Nov 2017
2017-11-23 04:53:27 +02: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
068f733d1e
Merge pull request #338 from TES3MP/master
...
Add master commits up to 16 Nov 2017
2017-11-16 08:50:27 +02: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
ac7a588632
[General] Update config files
2017-11-13 02:18:58 +02:00
scrawl
b7eda61f7a
Fix overlapping widgets in trade window layout ( Fixes #4205 )
2017-11-11 21:59:21 +00:00
David Cernat
700e4d032e
Merge pull request #334 from TES3MP/master
...
Add master commits up to 11 Nov 2017
2017-11-11 03:47:22 +02: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
4dbada69bf
Merge pull request #332 from TES3MP/master while resolving conflicts
2017-11-10 08:50:28 +02: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 Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
2017-10-28 16:05:30 +00:00
Koncord
ba8613a179
[Browser] Add "no password" filter to browser
2017-10-21 12:42:38 +08:00
Koncord
fc3f2483ee
[Server] Add manual Server Plugins sort
2017-10-19 10:24:17 +08:00
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
2017-10-16 07:47:37 +03: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
4845599bda
Merge pull request #308 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/main.cpp
2017-10-08 06:50:15 +03:00
David Cernat
08f34e5356
[Client] Fix recent problems with password window
2017-10-08 02:42:41 +03:00
David Cernat
7a38a0b223
Merge pull request #305 from TES3MP/master
...
Add master commits up to 6 Oct 2017
2017-10-06 19:19:49 +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
Koncord
846f83e3e4
[Master] Use RakNet ban system instead homebrew
2017-10-03 03:17:25 +08:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
2017-09-28 22:31:13 +00:00
Miloslav Číž
64793a55dc
get rid of buggy shader trick
2017-09-28 20:44:43 +02:00
Miloslav Číž
c9c6326d87
fix non-refraction water rain ripples
2017-09-28 19:23:37 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
David Cernat
841a4f90c1
Merge pull request #301 from TES3MP/master
...
Add master commits up to 28 Sep 2017
2017-09-28 11:13:51 +03: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
Miloslav Číž
4a332a1807
improve rain ripples
2017-09-27 21:25:14 +02:00
David Cernat
b1aacd5028
Merge pull request #299 from OpenMW/master
...
Add OpenMW commits up to 27 Sep 2017
2017-09-27 21:29:56 +03:00
Miloslav Číž
5c50506c83
water shader refactor plus basic rain ripples
2017-09-27 17:13:21 +02:00
scrawl
2d873a13ac
Merge pull request #1469 from drummyfish/master
...
water shader improvements (partially fixes #3365 )
2017-09-27 13:14:22 +00: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
