David Cernat
92060bd6b6
Merge pull request #370 from TES3MP/0.6.2
...
Add 0.6.2 commits up to 10 Jan 2018
7 years ago
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
David Cernat
b6a7377692
Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
...
Conflicts:
apps/openmw-mp/Networking.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.cpp
apps/openmw-mp/Script/Functions/Miscellaneous.hpp
apps/openmw/mwmp/GUI/GUIChat.cpp
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
...
Add OpenMW commits up to 1 Jan 2017
7 years ago
Thunderforge
096e734df6
Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
Thunderforge
a5e4f95ed4
Updating controller mappings to latest version
7 years ago
Bret Curtis
7367899634
update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html
7 years ago
Koncord
aa183e6844
[General] Introduce chat channels
7 years ago
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.
7 years ago
David Cernat
7e322f1f8b
Merge pull request #352 from TES3MP/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
David Cernat
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
Koncord
382f56178c
[Client] Add custom windows
7 years ago
David Cernat
1ee460bba8
Merge pull request #344 from TES3MP/master
...
Add master commits up to 23 Nov 2017
7 years ago
David Cernat
656453725b
Merge pull request #343 from OpenMW/master
...
Add OpenMW commits up to 23 Nov 2017
7 years ago
scrawl
2136003e1c
Reapply commit a3f821cdc
which got lost in a merge
7 years ago
Andrei Kortunov
ea36956ff1
Reworked trade window
7 years ago
scrawl
cc3c27f241
Clean up layout files to use Spacer class
7 years ago
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)
7 years ago
David Cernat
068f733d1e
Merge pull request #338 from TES3MP/master
...
Add master commits up to 16 Nov 2017
7 years ago
David Cernat
5aff515d3f
Merge pull request #337 from OpenMW/master
...
Add OpenMW commits up to 15 Nov 2017
7 years ago
scrawl
5a93b6a324
Enable word-wrapping for the console history
7 years ago
David Cernat
ac7a588632
[General] Update config files
7 years ago
scrawl
b7eda61f7a
Fix overlapping widgets in trade window layout ( Fixes #4205 )
7 years ago
David Cernat
700e4d032e
Merge pull request #334 from TES3MP/master
...
Add master commits up to 11 Nov 2017
7 years ago
David Cernat
01db219de4
Merge pull request #333 from OpenMW/master
...
Add OpenMW commits up to 11 Nov 2017
7 years ago
scrawl
b9baee51d5
Fix overlapping widgets in trade window layout ( Fixes #4205 )
7 years ago
David Cernat
4dbada69bf
Merge pull request #332 from TES3MP/master while resolving conflicts
7 years ago
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
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
7 years ago
David Walley
41dc82abad
Update Links to Documentation in settings.cfg files ( #1523 )
...
* Update settings-default.cfg
* Update settings.cpp
7 years ago
Koncord
ba8613a179
[Browser] Add "no password" filter to browser
7 years ago
Koncord
fc3f2483ee
[Server] Add manual Server Plugins sort
7 years ago
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
7 years ago
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
7 years ago
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
David Cernat
4845599bda
Merge pull request #308 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/main.cpp
7 years ago
David Cernat
08f34e5356
[Client] Fix recent problems with password window
7 years ago
David Cernat
7a38a0b223
Merge pull request #305 from TES3MP/master
...
Add master commits up to 6 Oct 2017
7 years ago
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
7 years ago
scrawl
12510efab7
Fade screen out during loading screen (when travelling)
7 years ago
scrawl
d7a5622485
Fix book window buttons overlap
7 years ago
Koncord
846f83e3e4
[Master] Use RakNet ban system instead homebrew
7 years ago
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
7 years ago
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
7 years ago
Miloslav Číž
64793a55dc
get rid of buggy shader trick
7 years ago
Miloslav Číž
c9c6326d87
fix non-refraction water rain ripples
7 years ago
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
7 years ago