mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
Code Issues Releases Wiki Activity
21770 commits 38 branches 54 tags 122 MiB
Commit graph

150 commits

Author SHA1 Message Date
David Cernat
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
 2018-07-14 03:57:05 +03:00
Bret Curtis
8834396cdd Merge branch 'patch-1' into 'master' 
Update documentationHowTo.rst

See merge request OpenMW/openmw!22
 2018-07-09 14:05:05 +00:00
Joakim Berg
ba15d0a848
Fixed spelling error 2018-07-09 10:19:32 +00:00
Joakim Berg
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.
 2018-07-09 08:58:01 +00:00
Ryan Tucker
380384ff39 Migrated textures section of wiki. 2018-07-07 10:08:13 -07:00
David Walley
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
 2018-07-06 19:06:32 +00:00
David Walley
9ebcd65634 Update docs/source/reference/documentationHowTo.rst 2018-07-05 10:58:52 +00:00
David Walley
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
 2018-07-05 08:45:09 +00:00
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