David Cernat
f50637bdd4
Merge pull request #401 from TES3MP/0.6.3 while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/world/ProcessorContainer.hpp
# apps/openmw/mwmp/WorldEvent.cpp
7 years ago
David Cernat
e3c43c6af7
Merge pull request #400 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
scrawl
c610b8acc8
Merge pull request #1649
7 years ago
scrawl
80a8ef6d49
Merge pull request #1661
7 years ago
Koncord
6131ada0ba
[Browser] Add compatibility compilation mode
7 years ago
David Cernat
5bb09d3bed
Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwmp/WorldEvent.hpp
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp
7 years ago
Koncord
2aaf9105af
[Browser] Add Client Settings and Server Settings Tabs.
...
Save Browser state to the client config
7 years ago
Capostrophic
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
7 years ago
David Cernat
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
Capostrophic
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
7 years ago
David Cernat
7ec08e125b
Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Script/Functions/Settings.cpp
apps/openmw-mp/Script/Functions/Settings.hpp
7 years ago
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333 )
7 years ago
Harald H
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
David Cernat
37b349c2f6
Merge pull request #390 from OpenMW/master
...
Add OpenMW commits up to 28 Feb 2018
7 years ago
Thunderforge
4292351993
Adding Max Quicksaves setting to Launcher
7 years ago
scrawl
9e9c278527
Merge pull request #1597
7 years ago
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
7 years ago
Capostrophic
534f3ef094
Bring UI dimensions and positions more in line with Morrowind UI
7 years ago
Daniel Vukelich
104495a9a4
Set default number of quicksaves to 1
7 years ago
David Cernat
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
7 years ago
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
7 years ago
David Cernat
ac374a8ef9
Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
apps/openmw-mp/Player.cpp
apps/openmw-mp/Script/Functions/Mechanics.cpp
apps/openmw-mp/Script/Functions/Mechanics.hpp
apps/openmw-mp/Script/Functions/Quests.cpp
apps/openmw-mp/Script/Functions/Quests.hpp
apps/openmw-mp/Script/ScriptFunctions.hpp
apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwmp/WorldEvent.cpp
apps/openmw/mwworld/worldimp.cpp
components/openmw-mp/Base/BasePlayer.hpp
7 years ago
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2018
7 years ago
Thunderforge
a78acbac85
Changing page description to address Zini's concerns
7 years ago
Thunderforge
cc0f7d19dc
Removing "Use these settings at your own risk"
7 years ago
Thunderforge
04f79c34a2
Fixing typo "Tooltip" -> "Tool Tip"
7 years ago
Thunderforge
8837046d9c
Adding panel for advanced settings.cfg options
7 years ago
David Cernat
1a8a518897
Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts
...
Conflicts:
README.md
apps/openmw-mp/Script/Functions/World.cpp
apps/openmw/mwmp/LocalPlayer.cpp
apps/openmw/mwmp/LocalPlayer.hpp
apps/openmw/mwworld/scene.cpp
components/openmw-mp/Version.hpp
7 years ago
David Cernat
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
Daniel Vukelich
97924d97c7
Add the option for multiple quicksave slots
...
With more than 1 quicksave slot, slots will be created each time you
quicksave until the maximum number (configured in settings) of
quicksaves has been reached. After that, the oldest quicksave slot will
be replaced each time you quicksave. Saves are numbered sequentially,
unless the maximum number of slots is 1, in which case it is not numbered.
7 years ago
Koncord
05fac2f67d
[Browser] Disable connect button by default
7 years ago
scrawl
dd5ebe225b
Merge pull request #1580
7 years ago
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
Miloslav Číž
3b741dc4b7
Revert "Add slider for refraction size in settings window"
...
This reverts commit ee40b41285
.
7 years ago
Miloslav Číž
ee40b41285
Add slider for refraction size in settings window
7 years ago
Koncord
aa183e6844
[General] Introduce chat channels
7 years ago
Miloslav Číž
b69c16e682
Add setting option to scale water refractions
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