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

19395 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bret Curtis
a747318c90
Merge branch 'master' into terrainbleeding 2018-06-13 09:20:49 +02:00
Marc Zinnschlag
4c4d4672d4 Merged pull request #1752 2018-06-13 09:06:20 +02:00
Marc Zinnschlag
1ba0317905 Merged pull request #1670 2018-06-13 09:02:31 +02:00
Marc Zinnschlag
48711bbdde Merged pull request #1592 2018-06-13 08:58:06 +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
wareya
bd4badc153 update changelog 2018-06-12 21:05:12 -04:00
wareya
94f695cffc Fix #4452 and remove dead code 2018-06-12 21:04:27 -04: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
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
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
wareya
8f45b0d53a remove unnecessary conditions 2018-06-09 10:11:43 -04:00
Andrei Kortunov
fba0c155df Fix assertion fail related to NiLookAtController 2018-06-09 17:07:38 +04:00
Andrei Kortunov
ae87e0d3fc Do not reset mUpperBodyState for weapon->weapon switch (regression #4446) 2018-06-09 15:34:08 +04:00
Andrei Kortunov
5ead6353ac Add missing changelog entry 2018-06-09 13:10:44 +04:00
Andrei Kortunov
4ba361fea6 Unhardcode sunset and sunrise settings (bug #1990) 2018-06-09 13:09:17 +04:00
Marc Zinnschlag
7d9de93fd3 Merged pull request #1477 2018-06-09 10:52:35 +02:00
Marc Zinnschlag
551a69f1b1 Merged pull request #1559 2018-06-09 10:51:02 +02:00
Marc Zinnschlag
efb4abbb7f Merged pull request #1623 2018-06-09 10:49:04 +02:00
Marc Zinnschlag
619110ca4c Merged pull request #1737 2018-06-09 10:47:54 +02:00
Marc Zinnschlag
76972bb2f6 Merged pull request #1709 2018-06-09 10:46:02 +02:00
Marc Zinnschlag
6a4cd975b6 Merge remote-tracking branch 'capostrophic/goodbye' 2018-06-09 10:44:14 +02:00
Thunderforge
dfa9968565 Renaming Launcher::DataFilesPage::signalSelectedFilesChanged to signalLoadedCellsChanged 2018-06-08 19:18:23 -05:00