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

19672 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
5a9e382efe Merged pull request #1421 2018-06-15 12:23:08 +02:00
Thunderforge
506d615acc Moving csignal import from main to graphicspage 2018-06-14 22:16:35 -05:00
Thunderforge
e51bfb46c6 Adding Changelog records 2018-06-14 19:42:40 -05:00
Thunderforge
7615e78e52 Move SDL initialization from main.cpp to graphicspage.cpp 2018-06-14 19:39:24 -05:00
Capostrophic
1abf749f03
Remove screenshot taken message 2018-06-14 22:08:53 +03:00
Andrei Kortunov
2854f6ca83 Handle exception if we try to play non-music file (bug #4416) 2018-06-14 21:32:40 +04:00
Miloslav Číž
2a23b53515 Merge branch 'drummyfish/openmw-toggleborders' 2018-06-14 15:33:08 +02:00
Miloslav Číž
477e1437d2 Resolve conflicts 2018-06-14 15:30:28 +02:00
Andrei Kortunov
49ba00a3ec Add NPC validation to esmstore (bug #2772) 2018-06-14 16:48:16 +04:00
Miloslav Číž
34f8eca7bd Fix indent 2018-06-14 13:43:32 +02:00
Miloslav Číž
31c68c534c Merge branch 'drummyfish/openmw-toggleborders' 2018-06-14 13:23:23 +02:00
Miloslav Číž
24078d4a72 Update CHANGELOG 2018-06-14 13:22:12 +02:00
Miloslav Číž
ab8de9fa14 Set node mask to cell borders 2018-06-14 13:18:37 +02:00
Miloslav Číž
414e6caafe Make tb work with distant terrain 2018-06-14 13:14:38 +02:00
Miloslav Číž
f18d57429e Move cell border management to World 2018-06-14 12:27:22 +02:00
Miloslav Číž
1b8d500c07 Make tb command work again 2018-06-14 12:01:09 +02:00
Miloslav Číž
1fd5ad3e56 Use REAL_SIZE constant 2018-06-14 01:01:22 +02: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
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