mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 12:56:38 +00:00
Code Issues Releases Wiki Activity
19586 commits 115 branches 76 tags 128 MiB
Commit graph

19586 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bret Curtis
032768a505 try to use as many cores as possible 2018-06-13 12:38:03 +00:00
Bret Curtis
3f4d5598a5 Update README.md to be more generic about OpenMW 2018-06-13 11:55:33 +00:00
Bret Curtis
da37585a8e Update .gitlab-ci.yml so that we only build with -j2 2018-06-13 10:15:07 +00:00
Bret Curtis
559754fa76 try this dance again 2018-06-13 09:31:39 +00:00
Bret Curtis
a49649c313 Try to get it to run and build on my docker instance. 2018-06-13 09:29:30 +00:00
Bret Curtis
674925dfb5 Merge branch 'psi29a-master-patch-17094' into 'master' 
what does this give us from a CI perspective?

See merge request OpenMW/openmw!1732
 2018-06-13 09:19:01 +00:00
Miloslav Číž
dcfbd554bb Remove try catch block 2018-06-13 11:12:46 +02:00
Bret Curtis
2e2be76e3f Update .gitlab-ci.yml 2018-06-13 08:20:31 +00:00
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue 2018-06-13 10:04:32 +02:00
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
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
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
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
Nikolay Kasyanov
224b94c0ce Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 2018-06-12 20:32:02 +02: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
Andrei Kortunov
bce6d79ad3 Add changelog entries, related to animations 2018-06-12 16:19:28 +04:00
Andrei Kortunov
f299be8158 Play scripted animations even if SkipAnim is used 2018-06-12 16:07:36 +04: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
Andrei Kortunov
25bb7c1826 Make 'PlayGroup idle' to cancel scripted animations 2018-06-12 14:04:03 +04: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
Andrei Kortunov
0e441d48ac Give scripted animations highest priority (bug #4286) 2018-06-12 12:55:28 +04: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