teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
19505 commits 34 branches 0 tags 66 MiB
Commit graph

19505 commits

This branch
This branch
All branches
Author SHA1 Message Date
Miloslav Číž
c3d7ee5a9e Resolve merge conflicts 2018-06-13 08:22:37 +02:00
Thunderforge
b37f325126 #4324/Updating Changelog.md 2018-06-12 22:20:16 -05:00
Thunderforge
058cfb553c Adding CFBundleIdentifier to OpenMW's Info.plist file for Macs 2018-06-12 22:18:06 -05:00
Miloslav Číž
db8aaa74d6 Start cell border debug drawing 2018-06-13 01:48:31 +02:00
Bret Curtis
3c933ebaad Update .gitlab-ci.yml 2018-06-12 19:10:15 +00:00
Bret Curtis
cc396f4dfd Update .gitlab-ci.yml 2018-06-12 19:06:59 +00:00
Andrei Kortunov
9c45cc7e48 Use player reference instead of pointer 2018-06-12 22:05:00 +04:00
Marc Zinnschlag
a3911f52a0 Merged pull request #1750 2018-06-12 19:15:14 +02:00
Marc Zinnschlag
6114cff842 updated credits file 2018-06-12 19:14:32 +02:00
Marc Zinnschlag
97773697a9 Merge remote-tracking branch 'florianjw/precise-rotations' 2018-06-12 19:05:52 +02:00
Capostrophic
1c8a20a54a Set ok button focus in settings window by default (fixes #4368) 2018-06-12 19:45:43 +03:00
Marc Zinnschlag
565922f9ad naked expressions beginning with the member operator were allowed erroneously outside of the console (Fixes issue #2971) 2018-06-12 17:52:16 +02:00
Marc Zinnschlag
296ad8424e updated changelog 2018-06-12 17:06:09 +02:00
Marc Zinnschlag
8d0f717e72 Merged pull request #1739 2018-06-12 17:04:41 +02:00
Marc Zinnschlag
90febde783 Merged pull request #1742 2018-06-12 17:03:38 +02:00
Marc Zinnschlag
816a1733dc Allow comma after Begin and End script instruction (Fixes #4451) 2018-06-12 15:29:28 +02:00
Bret Curtis
1c736ea064 Update .gitlab-ci.yml 2018-06-12 12:46:19 +00:00
Bret Curtis
a166534226 Update .gitlab-ci.yml 2018-06-12 11:41:19 +00:00
Bret Curtis
dddceba8f2 Update .gitlab-ci.yml 2018-06-12 11:32:37 +00:00
Bret Curtis
e3832cd2e2 Update .gitlab-ci.yml 2018-06-12 11:24:27 +00:00
Bret Curtis
bc0eb3349b Update .gitlab-ci.yml 2018-06-12 10:33:35 +00:00
Bret Curtis
e5dff83e38 Update .gitlab-ci.yml 2018-06-12 09:26:42 +00:00
Bret Curtis
a89441e879 Update .gitlab-ci.yml 2018-06-12 09:26:10 +00:00
Bret Curtis
20d8a424d6 Update .gitlab-ci.yml 2018-06-12 09:09:37 +00:00
Bret Curtis
8c4731728c Update .gitlab-ci.yml 2018-06-12 08:41:07 +00:00
Bret Curtis
de1cad86ab Update .gitlab-ci.yml 2018-06-12 08:37:26 +00:00
Bret Curtis
d986354d53 Update .gitlab-ci.yml 2018-06-12 08:30:18 +00:00
Bret Curtis
8714f48ce7 Update .gitlab-ci.yml 2018-06-12 08:22:44 +00:00
Bret Curtis
04dc74a1d6 Update .gitlab-ci.yml 2018-06-12 08:05:30 +00:00
Marc Zinnschlag
3af003d36b Merge branch 'test_update_workflow' into 'master' 
Update README.md with an important distinction.

See merge request OpenMW/openmw!1731
 2018-06-12 07:57:55 +00:00
Bret Curtis
7502a7dc4d what does this give us from a CI perspective? 2018-06-12 07:52:53 +00:00
Bret Curtis
5fba1c599b Update README.md with an important distinction. 2018-06-12 05:52:19 +00:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix 
Do not show any book text after last <BR> tag
 2018-06-11 17:08:26 +02:00
Bret Curtis
e53fb953bc
Merge pull request #1746 from Capostrophic/interrupt 
Make WakeUpPC interrupt waiting if it was supposed to be (bug #3629)
 2018-06-11 15:20:36 +02:00
Bret Curtis
23d16dc870
Merge pull request #1745 from Thunderforge/patch-1 
Adding Feature #4345 to Changelog.md
 2018-06-11 09:29:43 +02:00
Andrei Kortunov
66a46ff03c Do not show any book text after last <BR> tag. 2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 2018-06-10 18:42:18 +03:00
Thunderforge
ab03d238bb
Adding Feature #4345 
Implemented as part of #1623, but not added.
 2018-06-10 07:43:38 -05:00
Andrei Kortunov
acd3cba5fa Store previous items in the savegame 2018-06-10 16:21:19 +04:00
Andrei Kortunov
9fd2d57b86 Move previous items to player 2018-06-10 16:21:19 +04:00
Andrei Kortunov
f977c6876f Bound items: store item ID instead of pointer 2018-06-10 16:21:19 +04:00
Andrei Kortunov
4de9d9fa77 Split adjustBoundItem() 2018-06-10 16:21:19 +04:00
Andrei Kortunov
d1b1cb748d Reequip previous item only if the expired bound item was equipped 2018-06-10 16:21:19 +04:00
Andrei Kortunov
9b72a6ac69 Use the MWWorld::Ptr() instead of string ID 2018-06-10 16:21:19 +04:00
Andrei Kortunov
0375bedab2 Equip previous item after a bound item expires (bug #2326) 2018-06-10 16:21:19 +04:00
Bret Curtis
926ddcd47e
Merge pull request #1741 from akortunov/master 
Do not reset mUpperBodyState for weapon->weapon switch
 2018-06-10 11:56:54 +02:00
Marc Zinnschlag
dbc87e7c7d updated changelog 2018-06-10 11:28:22 +02:00
Marc Zinnschlag
25e4c52adf Merged pull request #1744 2018-06-10 11:26:54 +02:00
Thunderforge
a9ca528fb8 Adding version number of macOS build of OpenMW 2018-06-09 19:42:24 -05:00
wareya
7344323b9e remove indentation from blank lines 2018-06-09 10:31:51 -04:00