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

19485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrei Kortunov
9c3da41130 Add murder bounty when a player follower commits murder (bug #2852) 2018-06-15 14:31:09 +04:00
Bret Curtis
ccfc07e7e3
Merge pull request #1548 from drummyfish/screenshot360 
360° screenshots
 2018-06-13 23:11:06 +02:00
Miloslav Číž
dd00e438fe Merge branch 'screenshot360' of https://github.com/drummyfish/openmw into screenshot360 2018-06-13 21:35:03 +02:00
Miloslav Číž
7178ee3a6e Add FIXME comment 2018-06-13 21:34:43 +02:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Miloslav Číž
5387e3ba8f Update CHANGELOG 2018-06-13 21:15:22 +02:00
Bret Curtis
60d2678cff
Merge pull request #1755 from akortunov/master 
Add missing changelog entries
 2018-06-13 20:58:17 +02:00
Andrei Kortunov
e814843cdb Add missing changelog entries 2018-06-13 22:48:09 +04:00
Marc Zinnschlag
2b35c5efd7 Merge remote-tracking branch 'upstream/master' 2018-06-13 18:13:15 +02:00
Marc Zinnschlag
aea481eacb Merged pull request #1753 2018-06-13 18:12:38 +02:00
Marc Zinnschlag
f62df90960 Merged pull request #1572 2018-06-13 18:11:31 +02:00
Marc Zinnschlag
17db4b4db3 Merged pull request 1754 2018-06-13 18:05:59 +02:00
Bret Curtis
48d74a8781 Disable testing for now, not yet necessary. 2018-06-13 15:34:13 +00:00
Bret Curtis
a275972361 Merge branch 'add_pipeline_badge' into 'master' 
Update README.md to indicate that our gitlab pipeline is building

See merge request OpenMW/openmw!1734
 2018-06-13 14:59:36 +00:00
Andrei Kortunov
61c968d550 Ignore broken items when search for replacement (bug #4453) 2018-06-13 18:39:02 +04:00
Bret Curtis
45957dd707
Merge pull request #1647 from Capostrophic/fatigue 
Improve the logic of trading formulae (bug #2222)
 2018-06-13 16:21:45 +02:00
Marc Zinnschlag
7ca56ccd29 set search status bar to 'no results' message when search yields no results 2018-06-13 15:48:24 +02:00
Andrei Kortunov
81b78a82e8 AI: try to open doors every AI_REACTION_TIME seconds (bug #4454) 2018-06-13 17:47:32 +04:00
Bret Curtis
9bd940e153 Update README.md to indicate that our gitlab pipeline is building 2018-06-13 13:06:37 +00:00
Marc Zinnschlag
7d2394273e added statusbar to search window (Fixes #3276) 2018-06-13 14:55:03 +02:00
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
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
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