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

117 commits

Author SHA1 Message Date
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
scrawl
9e9c278527
Merge pull request #1597 2018-02-27 23:48:45 +00:00
bret curtis
81d90d7fb7 break for all errors that would raise when checking for version, make them UNRELEASED 2018-02-27 18:57:37 +01:00
bret curtis
3393ad623f fix rtd 2018-02-27 16:15:43 +01: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
scrawl
dd3d3f5a8b
Merge pull request #1610 2018-02-24 16:41:02 +00:00
Capostrophic
46377fa348
Update [Windows] documentation 2018-02-24 12:25:11 +03:00
scrawl
ea028a2076
Improve settings documentation 2018-02-22 18:50:07 +00: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
5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
2018-01-27 22:52:59 +02:00
Thunderforge
36843ed31e Adding a tutorial for placing the ring in plain sight (#1598)
* Rearranging sections

* Adding instructions to place the ring in plain sight
2018-01-15 07:51:57 +01: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
Miloslav Číž
a73ab39fdd Update refraction scaling docs 2018-01-01 13:42:16 +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 Číž
d13fc06baf Add basic refraction scale documentation 2017-12-09 12:52:28 +01: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 Cernat
4d4eb1bb9f Merge pull request #292 from OpenMW/master
Add OpenMW commits up to 18 Sep 2017
2017-09-19 09:40:45 +03:00
David Cernat
960b91a53c Merge pull request #290 from OpenMW/master
Add OpenMW commits up to 17 Sep 2017
2017-09-17 10:53:33 +03:00
David Walley
6b56f25f9e Update tour.rst 2017-09-17 07:47:27 +01:00
David Walley
19d034f370 Docs CS-Manual - tour - add ring to chest
Extend the ring tutorial in the CS-Manual to put the ring in a chest.

Images omitted pending decisions on style and where to store them
2017-09-17 07:43:26 +01:00
David Walley
d2b5f7dea5 Update differences.rst 2017-09-16 15:04:15 +01:00
David Cernat
c98e6dc833 Merge pull request #288 from OpenMW/master
Add OpenMW commits up to 14 Sep 2017
2017-09-15 03:30:20 +03:00
David Walley
b9de4b1eac Update tour.rst 2017-09-13 12:27:51 +01:00
David Walley
7e83caab11 Manual modding - extend mod installation instructions (#1448)
Add section on .bsa files
Extend plugins to include .esm files
Fix typo propper->proper.
2017-09-13 11:11:01 +00:00
David Cernat
b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
Thunderforge
10fff499a2 Adding that Reflect Actors can be toggled in the video panel 2017-09-02 19:02:55 -05:00
David Cernat
4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
2017-08-31 15:14:13 +03:00
David Walley
47d6c5091f OpenMW CS Manual - typo fixes etc (#1422)
* Update files-and-directories.rst
* OpenMW CS Manual - minor typo fixes
2017-08-29 22:39:24 +00:00
Hristos N. Triantafillou
663f3088d1
Use "Remove Branch" instead of "Remove" in normals tutorial
* Pherim over at nexusmods advised me that using "Remove" leaves stranded references at the end of the file, and that the proper way to fully remove the unwanted `NiTextureEffect` block is to use "Remove Branch".  This commit clarifies that in the normal map conversion tutorial.
2017-08-24 19:50:53 -05:00
scrawl
2611377081 Merge pull request #1350 from akortunov/deathanimationfix
Do not allow to loot fighting actors during death animation (bug #3528)
2017-08-18 22:04:12 +00:00
Andrei Kortunov
dd919b9f2c Do not allow to loot fighting actors during death animation (bug #3528) 2017-08-07 09:55:50 +04:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
2017-08-05 00:09:34 +03:00
Bret Curtis
69359b6b4b expand to max-depth 3 and remove indices and tables 2017-07-28 13:13:45 +02:00
Bret Curtis
f2fc8351bb remove breath/doxygen autodoc 2017-07-28 10:42:30 +02:00
David Cernat
b8b3856c73 Merge pull request #244 from OpenMW/master
Add OpenMW commits up to 19 Jul 2017
2017-07-19 20:49:56 +03:00
scrawl
20606a2aff Add 'prediction time' setting for cell/terrain pre-loading 2017-07-19 16:44:37 +02:00
David Cernat
89f6c6df96 Merge pull request #225 from OpenMW/master
Add OpenMW commits up to 4 Jun 2017
2017-06-05 03:38:58 +03:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
David Cernat
315ec46ff6 Merge pull request #224 from OpenMW/master
Add OpenMW commits up to 3 Jun 2017
2017-06-03 17:19:34 +03:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
David Cernat
cdfc2db2d1 Merge pull request #220 from OpenMW/master
Add OpenMW commits up to 26 May 2017
2017-05-26 17:38:59 +03:00
Andrei Kortunov
f17badb3cd Makes cells cache size configurable 2017-05-25 13:09:40 +04:00
David Cernat
252a28fe24 Merge pull request #217 from OpenMW/master
Add OpenMW commits up to 15 May 2017
2017-05-16 10:03:30 +03:00
Ryan Tucker
d555c21c28 Converted all settings files to semantic linefeeds.
Corrected default segments in Windows settings.
Removed all default declarations in the prose of the setting descriptions except where clarification or additional information was also provided.
Some minor, but not thorough grammar corrections.
2017-05-14 22:04:20 -07:00
Koncord
26c00c3141 [Client] Change chat font to RussoOne for better visibility 2017-04-29 20:34:36 +08:00
Andrei Kortunov
6c1e3a0618 Merged from upstream master 2017-04-21 08:48:22 +04:00