1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Commit graph

19759 commits

Author SHA1 Message Date
Doc West
467989cdd5 Moved crashcatcher to a component and also use it in CS
Reworked debugger detection (failed on gdb 7.11), it now uses /proc to detect the debugger
2018-07-09 16:25:55 +02: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
Bret Curtis
13d8fba223
Merge pull request #1797 from Capostrophic/moveobject
Fix double call of addContainerScripts on player in moveObject (bug #4490)
2018-07-09 15:16:04 +02:00
Bret Curtis
7f4320feb0
Merge pull request #1799 from lysol90/patch-1
Updates to the texture modding page
2018-07-09 15:14:43 +02:00
Joakim Berg
ba15d0a848
Fixed spelling error 2018-07-09 10:19:32 +00:00
Capostrophic
d09c327b20 Update changelog 2018-07-09 12:36:19 +03: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
Capostrophic
14d3b213a1
Fix double call of addContainerScripts on player in moveObject (fixes #4490) 2018-07-08 23:08:57 +03:00
Bret Curtis
a3a002e008
Merge pull request #1790 from rhtucker/master
Migrating necessary parts of Wiki over to RTD.
2018-07-08 20:59:08 +02:00
Marc Zinnschlag
caad14093e Merged pull request #1795 2018-07-08 11:01:27 +02: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
Capostrophic
bded697f07
Make Goodbye block using hyperlinks 2018-07-06 19:38:36 +03:00
Bret Curtis
f4146d0079 Merge branch 'patch-1' into 'master'
Update documentationHowTo.rst - extend to integrate GitLab into PyCharm

See merge request OpenMW/openmw!20
2018-07-06 14:50:12 +00:00
Marc Zinnschlag
d9de8ccb5b Merged pull request #1781 2018-07-06 11:55:45 +02:00
Marc Zinnschlag
dd08194c75 Merged merge request !18 2018-07-06 11:37:15 +02:00
Marc Zinnschlag
7ba512b389 Merged merge request !17 2018-07-06 11:27:35 +02:00
Bret Curtis
94ea9e7dd0
Merge pull request #1793 from Capostrophic/death
Ensure forward-compatibility of death animations of pre-0.43.0 saves (bug #4274)
2018-07-06 10:23:51 +02:00
Capostrophic
33c462c3c2
Update changelog 2018-07-05 22:56:09 +03:00
Capostrophic
9abfabb065
Ensure forward-compatibility of death animations in old saves (fixes #4274) 2018-07-05 22:49:40 +03:00
Doc West
f9b565a46e Removed QDebug include, moved updateUndoRedoAction to an anonymous namespace 2018-07-05 17:29:58 +02:00
Doc West
61109d70b1 Removed invalid / unused signal / slot connection 2018-07-05 17:21:32 +02:00
David Walley
9ebcd65634 Update docs/source/reference/documentationHowTo.rst 2018-07-05 10:58:52 +00:00
Bret Curtis
b36bd75b59
Merge pull request #1792 from Capostrophic/character
Make spellcasting stance transition more smooth (bug #4358)
2018-07-05 11:45:31 +02: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
Capostrophic
5bc073603e
Update changelog 2018-07-05 01:59:14 +03:00
Capostrophic
faf3e9ba5a Make spellcasting stance transition more smooth (fixes #4358)
If a movement animation was identical to the previous one that was played, restart it from the point the previous animation ended
2018-07-05 01:57:34 +03:00
Doc West
1c1b5986e9 Updated change log 2018-07-04 22:05:07 +02:00
Doc West
5d38160239 Updated change log 2018-07-04 22:03:42 +02:00
Doc West
2c39dba83b Updated change log 2018-07-04 22:01:45 +02:00
Doc West
baf21362e1 Fixed undo / redo actions losing their shortcuts 2018-07-04 21:47:16 +02:00
Doc West
414f626309 Implemented search case sensitivity 2018-07-04 21:03:54 +02:00
Bret Curtis
2ff9dc34a4 Merge branch 'win10_ci' into 'master'
see if we can get win10 going

See merge request OpenMW/openmw!8
2018-07-04 16:54:28 +00:00
Bret Curtis
d4d46fc602 Build everything but branches until we can allow VM/CIs to run on forked projects. 2018-07-04 16:51:57 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci'
# Conflicts:
#   CI/before_script.msvc.sh
2018-07-04 15:21:45 +00:00
AnyOldName3
8c153d116b
Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes
Update before_script.msvc.sh to add GitLab CI support and update dependency links
2018-07-04 15:44:25 +01:00
Bret Curtis
57e2573593
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00:00
Marc Zinnschlag
908af3720f Merged pull request #1791 2018-07-03 09:37:51 +02:00
Marc Zinnschlag
47d0321366 updated credits file 2018-07-03 09:09:48 +02:00
Marc Zinnschlag
2a367a0c35 updated changelog 2018-07-03 09:09:05 +02:00
Marc Zinnschlag
e50c3657b3 Merged merge request !16 2018-07-03 09:05:59 +02:00
Marc Zinnschlag
9a88f9147e Merged merge request !15 2018-07-03 08:59:57 +02:00
Doc West
e9cc697b60 Sort EnumDelegate values by name 2018-07-03 00:52:23 +02:00
Andrei Kortunov
f4330cf057 Editor: limit FPS in 3D preview windows (feature #3641) 2018-07-02 12:20:34 +04:00
Thunderforge
7cbc4eeb49 Adding missing override keywords
Prevents compiler warnings such as this:

```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void onOpen();
                     ^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
        virtual void onOpen() {}
                     ^
```
2018-07-01 19:17:50 -05:00
Marc Zinnschlag
aa5ddd6b28 Merged merge request livestreamer https://www.twitch.tv/vanguardlx best 2018-07-01 15:25:38 +02:00