David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
2018-07-04 01:52:29 +03:00
Marc Zinnschlag
5ee731d86f
updated roadmap section
2018-06-27 12:33:23 +02:00
Marc Zinnschlag
8bc6c85396
last minute changes (this time for real; forgot to merge in the last update from the private repo)
2018-06-27 12:24:21 +02:00
Marc Zinnschlag
8cda355af6
last minute changes to design doc
2018-06-27 12:14:34 +02:00
Marc Zinnschlag
2afcea3870
added post-1.0 design document
2018-06-27 11:59:40 +02:00
Bret Curtis
975597bac9
Merge pull request #1766 from rhtucker/master
...
Started migrating installation guide from the wiki.
2018-06-19 13:44:06 +02:00
rhtucker
fe86e7ffc7
Fixed inconsistent use of "since"
2018-06-18 12:49:48 -07:00
Ryan Tucker
7e23e6586b
Put together most of the informal guide on contributing to documentation.
2018-06-16 17:10:35 -07:00
Ryan Tucker
c5f5984c09
Started migrating installation guide from the wiki.
...
Fixed a bunch of errors that popped up on my local build.
2018-06-16 14:44:49 -07:00
Andrei Kortunov
0d3f535590
Warn about mod conflicts
2018-06-12 08:57:24 +04:00
Andrei Kortunov
fea34bd73f
Added support for per-group animation files
2018-06-08 17:04:15 +04:00
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-06-08 06:01:00 +03:00
Andrei Kortunov
02f1f71221
Use link to OpenMW Wiki page instead of direct NifSkope page
2018-06-07 18:48:49 +04:00
David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
2018-05-24 12:16:11 +03:00
Marc Zinnschlag
1daf8474a4
Merged pull request #896
2018-05-24 09:50:22 +02: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
9e176aba9f
Merge pull request #1652
2018-04-02 17:29:40 +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
Simon
9193ff4d15
Reworded one of the descriptions
2018-03-28 13:59:05 +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
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
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
