a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
6 years ago
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
7 years ago
65de028e0d
Merge pull request #462 from OpenMW/master
...
Add OpenMW commits up to 23 Jul 2018
7 years ago
9f2ef1e68a
Added CSS to drop shadow of figure images
7 years ago
a54b779672
Revert "Revert "remove breath/doxygen autodoc""
...
This reverts commit 038d5a5566
7 years ago
038d5a5566
Revert "remove breath/doxygen autodoc"
...
This reverts commit f2fc8351bb
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
8834396cdd
Merge branch 'patch-1' into 'master'
...
Update documentationHowTo.rst
See merge request OpenMW/openmw!22
7 years ago
ba15d0a848
Fixed spelling error
7 years ago
efcad5e751
Updates to the texture modding page
...
There were some errors in the texture modding page about normal maps, so I did a quick change. Please do review if I made some errors, spelling or factual.
7 years ago
380384ff39
Migrated textures section of wiki.
7 years ago
b5abe6a230
Update documentationHowTo.rst
...
Add a section, under the provisional name "Baby Steps" to describe a minimal process for editing/contributing. Basically just create an account on GitLab, fork openmw there, then edit the relevant document to create Merge Request
7 years ago
9ebcd65634
Update docs/source/reference/documentationHowTo.rst
7 years ago
d03f9125e3
Update documentationHowTo.rst - extend to integrate GitLab into PyCharm
...
A subsequent MR will suggest moving most of this to a separate document for intermediate-level contributors, and replacing it with much simpler instructions for beginners - basically edit directly on GitLab as suggested by Psi29a on the forum here - https://forum.openmw.org/viewtopic.php?f=43&p=56458#p56457
7 years ago
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
7 years ago
5ee731d86f
updated roadmap section
7 years ago
8bc6c85396
last minute changes (this time for real; forgot to merge in the last update from the private repo)
7 years ago
8cda355af6
last minute changes to design doc
7 years ago
2afcea3870
added post-1.0 design document
7 years ago
975597bac9
Merge pull request #1766 from rhtucker/master
...
Started migrating installation guide from the wiki.
7 years ago
fe86e7ffc7
Fixed inconsistent use of "since"
7 years ago
7e23e6586b
Put together most of the informal guide on contributing to documentation.
7 years ago
c5f5984c09
Started migrating installation guide from the wiki.
...
Fixed a bunch of errors that popped up on my local build.
7 years ago
0d3f535590
Warn about mod conflicts
7 years ago
fea34bd73f
Added support for per-group animation files
7 years ago
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
02f1f71221
Use link to OpenMW Wiki page instead of direct NifSkope page
7 years ago
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
7 years ago
1daf8474a4
Merged pull request #896
7 years ago
e3c43c6af7
Merge pull request #400 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
c610b8acc8
Merge pull request #1649
7 years ago
9e176aba9f
Merge pull request #1652
7 years ago
80a8ef6d49
Merge pull request #1661
7 years ago
baaf65bc2c
Add vanilla enchanted weaponry behavior option, on by default ( fixes #4136 )
7 years ago
9193ff4d15
Reworded one of the descriptions
7 years ago
2d119e834a
Add vanilla absorb attribute behavior option, on by default ( Fixes #4135 )
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
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
37b349c2f6
Merge pull request #390 from OpenMW/master
...
Add OpenMW commits up to 28 Feb 2018
7 years ago
9e9c278527
Merge pull request #1597
7 years ago
81d90d7fb7
break for all errors that would raise when checking for version, make them UNRELEASED
7 years ago
3393ad623f
fix rtd
7 years ago
9e10eb9c84
Merge pull request #389 from OpenMW/master
...
Add OpenMW commits up to 24 Feb 2018
7 years ago
dd3d3f5a8b
Merge pull request #1610
7 years ago
46377fa348
Update [Windows] documentation
7 years ago
ea028a2076
Improve settings documentation
7 years ago
104495a9a4
Set default number of quicksaves to 1
7 years ago
53d758ba16
Merge pull request #385 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2018
7 years ago
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting
7 years ago
5d4b97645d
Merge pull request #374 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
7 years ago
David Cernat
Capostrophic
Ryan Tucker
Bret Curtis
Joakim Berg
David Walley
Marc Zinnschlag
rhtucker
Andrei Kortunov
scrawl
Capostrophic
Simon
Harald H
Daniel Vukelich