1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 19:19:55 +00:00
Commit graph

1311 commits

Author SHA1 Message Date
David Cernat
17678ee60f
Merge pull request #407 from OpenMW/master
Add OpenMW commits up to 17 Apr 2018
2018-04-17 15:25:28 +03:00
scrawl
fc72483ddf
Merge pull request #1673 2018-04-14 19:53:20 +00:00
Capostrophic
b08d7b4a3b Use centroid interpolation for shader lighting (fixes #4143) 2018-04-14 00:30:28 +03:00
David Cernat
fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
2018-04-10 06:43:24 +03:00
scrawl
0982d2175a
Merge pull request #1473 2018-04-09 20:23:43 +00:00
scrawl
35300c04cd
Merge pull request #1671 2018-04-09 20:23:35 +00:00
Capostrophic
cddc0914c8 Option to charge for all companions travelling (fixes #4064) 2018-04-09 19:19:50 +03:00
David Cernat
e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
2018-04-03 01:25:17 +03:00
scrawl
c610b8acc8
Merge pull request #1649 2018-04-02 17:37:31 +00:00
scrawl
80a8ef6d49
Merge pull request #1661 2018-04-02 17:18:39 +00:00
Capostrophic
baaf65bc2c Add vanilla enchanted weaponry behavior option, on by default (fixes #4136) 2018-03-31 11:46:23 +03:00
David Cernat
365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
2018-03-30 10:28:52 +03:00
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 2018-03-27 20:20:40 +02:00
Capostrophic
2d119e834a Add vanilla absorb attribute behavior option, on by default (Fixes #4135) 2018-03-27 14:27:23 +03:00
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
2018-03-09 21:07:46 +02:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333) 2018-03-08 23:39:35 +00:00
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
2018-03-08 21:23:24 +01:00
Chris Robinson
01dbac7b15 Don't use a different setting for distant viewing distance 2018-03-04 11:37:57 -08:00
Chris Robinson
41669467ae Make settings for distant fog parameters 2018-03-04 11:37:57 -08:00
David Cernat
37b349c2f6
Merge pull request #390 from OpenMW/master
Add OpenMW commits up to 28 Feb 2018
2018-03-01 05:33:37 +02:00
Thunderforge
4292351993 Adding Max Quicksaves setting to Launcher 2018-02-27 20:17:21 -06:00
scrawl
9e9c278527
Merge pull request #1597 2018-02-27 23:48:45 +00:00
David Cernat
9e10eb9c84
Merge pull request #389 from OpenMW/master
Add OpenMW commits up to 24 Feb 2018
2018-02-25 22:05:32 +02:00
Capostrophic
534f3ef094
Bring UI dimensions and positions more in line with Morrowind UI 2018-02-24 12:23:44 +03:00
Daniel Vukelich
104495a9a4 Set default number of quicksaves to 1 2018-02-13 21:05:24 -05:00
David Cernat
53d758ba16
Merge pull request #385 from OpenMW/master
Add OpenMW commits up to 13 Feb 2018
2018-02-13 05:22:41 +02:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting 2018-02-13 00:40:41 +00:00
David Cernat
a7e3261b0b
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
2018-02-11 06:57:54 +02:00
Thunderforge
a78acbac85 Changing page description to address Zini's concerns 2018-02-04 13:38:11 -06:00
Thunderforge
cc0f7d19dc
Removing "Use these settings at your own risk" 2018-02-02 12:09:25 -06:00
Thunderforge
04f79c34a2 Fixing typo "Tooltip" -> "Tool Tip" 2018-01-28 23:31:40 -06:00
Thunderforge
8837046d9c Adding panel for advanced settings.cfg options 2018-01-28 22:49:49 -06:00
David Cernat
5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
2018-01-27 22:52:59 +02:00
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.
2018-01-12 20:09:39 -05:00
scrawl
dd5ebe225b
Merge pull request #1580 2018-01-11 01:54:28 +00:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
2018-01-10 03:49:53 +02:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
David Cernat
65d978a3cb
Merge pull request #364 from OpenMW/master
Add OpenMW commits up to 1 Jan 2017
2018-01-02 07:50:37 +02:00
Thunderforge
096e734df6 Adding gamecontrollerdb.txt file that got left behind due to being on .gitignore 2018-01-01 22:42:45 -06:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
Thunderforge
a5e4f95ed4 Updating controller mappings to latest version 2018-01-01 22:16:54 -06:00
Bret Curtis
7367899634 update openmw.appdata.xml to fix https://lintian.debian.org/tags/appstream-metadata-legacy-format.html 2018-01-01 19:47:36 +01:00
Miloslav Číž
3b741dc4b7 Revert "Add slider for refraction size in settings window"
This reverts commit ee40b41285.
2018-01-01 13:28:14 +01:00
Miloslav Číž
ee40b41285 Add slider for refraction size in settings window 2017-12-09 14:03:56 +01:00
Miloslav Číž
b69c16e682 Add setting option to scale water refractions 2017-12-06 20:39:09 +01: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
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