krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
19618 commits 35 branches 0 tags 65 MiB
Commit graph

19618 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrei Kortunov
5455490ad2 Avoid fall-through in spell selection 2018-06-28 11:12:48 +04:00
Bret Curtis
87d9a4ff0b Merge branch 'zini_updates' into 'master' 
last minute updates from zini

See merge request OpenMW/openmw!7
 2018-06-27 11:33:01 +00:00
Marc Zinnschlag
520e65f822 last minute updates from zini 2018-06-27 13:32:08 +02:00
Bret Curtis
f64d949169
Merge pull request #1780 from akortunov/persistanims 
Ignore movement from scripted animations
 2018-06-27 12:18:48 +02:00
Marc Zinnschlag
2afcea3870 added post-1.0 design document 2018-06-27 11:59:40 +02:00
Andrei Kortunov
3c7ab976c3 Ignore movement from scripted animations (bug #4475) 2018-06-27 08:22:45 +04:00
Bret Curtis
26615d588e Merge branch 'multi_build' into 'master' 
Multi build

See merge request OpenMW/openmw!4
 2018-06-26 19:45:49 +00:00
Bret Curtis
4d6ca2c387 preserve dmg artifact 2018-06-26 17:45:20 +00:00
Bret Curtis
9e7731259d what if we try make -j2 package ? 2018-06-26 15:40:06 +00:00
Bret Curtis
cfcd9c3fc6 What happens when we don't make install? 2018-06-26 15:36:53 +00:00
Bret Curtis
dd60b8f179 only delete files inside OpenMW.app dir 2018-06-26 15:18:18 +00:00
Bret Curtis
c1aee49b76 clean up after our previous build. 2018-06-26 15:09:51 +00:00
Bret Curtis
06eb9539bd Let make install do it's thing, it's more reasonable on macos and let's only archive that. 2018-06-26 14:51:55 +00:00
Bret Curtis
e068ee3533 tell unzip to overwrite all files 2018-06-26 14:01:10 +00:00
Bret Curtis
9e2c6d9fe1 actually step into the build directory and build! 2018-06-26 13:57:13 +00:00
Bret Curtis
308d78e3da only download via curl if file on server is different than what is currently cached on VM. 2018-06-26 13:54:37 +00:00
Bret Curtis
ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 2018-06-26 13:50:45 +00:00
Marc Zinnschlag
705b2dca0e Merged pull request #1777 2018-06-25 11:58:12 +02:00
Marc Zinnschlag
baeaff2309 Merged pull request #1778 2018-06-25 11:57:45 +02:00
Bret Curtis
a0cae78cb2
Merge pull request #1779 from akortunov/coverity 
Fix some code coverity issues
 2018-06-25 10:33:07 +02:00
Andrei Kortunov
97d8cc0efe Check if the local was not found, just for sure 2018-06-25 11:21:00 +04:00
Andrei Kortunov
7dff8d8fe2 Check cell for null 2018-06-25 10:26:58 +04:00
Andrei Kortunov
441463327c Validate map size 2018-06-25 09:57:40 +04:00
Andrei Kortunov
359e748c28 Initialize some missing fields in constructors 2018-06-25 09:35:42 +04:00
Bret Curtis
d008cd0c46 Update .gitlab-ci.yml 2018-06-24 21:26:53 +00:00
Bret Curtis
87f367ec11 Update .gitlab-ci.yml 2018-06-24 17:52:57 +00:00
Capostrophic
d6a170f848
Update changelog 2018-06-24 14:58:54 +03:00
Capostrophic
ecafcefae9
Fall back to regular head when getVampireHead fails 2018-06-24 14:39:48 +03:00
Bret Curtis
f1158e8129 Update .gitlab-ci.yml 2018-06-23 13:50:58 +00:00
Bret Curtis
55de1c1a72 Update .gitlab-ci.yml 2018-06-23 13:22:20 +00:00
Capostrophic
afbe8f2161
Update changelog 2018-06-23 14:29:15 +03:00
Capostrophic
35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 2018-06-23 14:27:40 +03:00
Bret Curtis
40a9d8ac06 Update .gitlab-ci.yml 2018-06-23 07:19:05 +00:00
Bret Curtis
c2826ca878 Update .gitlab-ci.yml 2018-06-22 16:41:20 +00:00
Bret Curtis
393ec99944 Update .gitlab-ci.yml 2018-06-22 15:29:27 +00:00
Bret Curtis
88555c0463 Update .gitlab-ci.yml 2018-06-22 15:20:38 +00:00
Bret Curtis
601b69b36c Update .gitlab-ci.yml 2018-06-22 15:14:09 +00:00
Bret Curtis
dcba3a1058 Update .gitlab-ci.yml 2018-06-22 15:13:09 +00:00
Bret Curtis
516fc0283b Update .gitlab-ci.yml 2018-06-22 15:07:39 +00:00
Bret Curtis
64cc3b3a6a
Merge pull request #1774 from nikolaykasyanov/ci-macos-1013 
[macOS, CI] Build using macOS 10.13 SDK
 2018-06-22 10:21:00 +02:00
Bret Curtis
9667dd051c
Merge pull request #1771 from Xenkhan/master 
Retrieve SDL window settings instead of using magic numbers
 2018-06-21 22:22:42 +02:00
Bret Curtis
a55583a395
Merge branch 'master' into master 2018-06-21 22:22:01 +02:00
Xenkhan
f0acc64544
Update changelog 2018-06-21 15:04:04 -05:00
Marc Zinnschlag
f52e06fc19 Merge branch 'glsl-editorconfig' into 'master' 
Update .editorconfig to include GLSL

See merge request OpenMW/openmw!3
 2018-06-21 18:29:31 +00:00
AnyOldName3
d1736ad0c8 Update .editorconfig to include GLSL 2018-06-21 14:23:30 +00:00
Xenkhan
405a0caf29
Remove unneeded whitespace 2018-06-20 13:56:00 -05:00
Xenkhan
5a4817c147
Get rid of reinterpret_cast<> 2018-06-20 13:33:59 -05:00
Nikolay Kasyanov
90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 2018-06-20 19:59:55 +02:00
Marc Zinnschlag
22eb037c18 Merged pull request #1773 2018-06-20 19:08:50 +02:00
Bret Curtis
6655b7e512
Merge pull request #1740 from nikolaykasyanov/software-cursor-decompression 
Decompress cursors using SDL software renderer on Mac or if OSG >= 3.5.8 or if OPENMW_DECOMPRESS_TEXTURES is set
 2018-06-20 17:19:48 +02:00