Commit Graph

19627 Commits (f06dd39892a45df02525ea79a78c9772b0576e75)
 

Author SHA1 Message Date
Marc Zinnschlag f06dd39892 Merge remote-tracking branch 'upstream/master' 7 years ago
Bret Curtis f07d50e5bf
Merge pull request #1785 from akortunov/warnfix
Fix some GCC warnings
7 years ago
Bret Curtis 102266d08d
Merge pull request #1784 from nikolaykasyanov/revert-sdl-get-attribute
Revert "Retrieve SDL window settings instead of using magic numbers"
7 years ago
Andrei Kortunov d9a1de0ec7 Do not use deprecated function 7 years ago
Andrei Kortunov 5455490ad2 Avoid fall-through in spell selection 7 years ago
Nikolay Kasyanov 5fcb091127 Replace FIXME with a detailed explanation of the issue 7 years ago
Nikolay Kasyanov 9c78364c45 Revert "Merge pull request #1771 from Xenkhan/master"
This reverts commit 9667dd051c, reversing
changes made to f52e06fc19.
7 years ago
Bret Curtis 87d9a4ff0b Merge branch 'zini_updates' into 'master'
last minute updates from zini

See merge request OpenMW/openmw!7
7 years ago
Marc Zinnschlag 520e65f822 last minute updates from zini 7 years ago
Marc Zinnschlag 5ee731d86f updated roadmap section 7 years ago
Marc Zinnschlag 8bc6c85396 last minute changes (this time for real; forgot to merge in the last update from the private repo) 7 years ago
Bret Curtis f64d949169
Merge pull request #1780 from akortunov/persistanims
Ignore movement from scripted animations
7 years ago
Marc Zinnschlag 8cda355af6 last minute changes to design doc 7 years ago
Marc Zinnschlag 2afcea3870 added post-1.0 design document 7 years ago
Andrei Kortunov 3c7ab976c3 Ignore movement from scripted animations (bug #4475) 7 years ago
Bret Curtis 26615d588e Merge branch 'multi_build' into 'master'
Multi build

See merge request OpenMW/openmw!4
7 years ago
Bret Curtis 4d6ca2c387 preserve dmg artifact 7 years ago
Bret Curtis 9e7731259d what if we try make -j2 package ? 7 years ago
Bret Curtis cfcd9c3fc6 What happens when we don't make install? 7 years ago
Bret Curtis dd60b8f179 only delete files inside OpenMW.app dir 7 years ago
Bret Curtis c1aee49b76 clean up after our previous build. 7 years ago
Bret Curtis 06eb9539bd Let make install do it's thing, it's more reasonable on macos and let's only archive that. 7 years ago
Bret Curtis e068ee3533 tell unzip to overwrite all files 7 years ago
Bret Curtis 9e2c6d9fe1 actually step into the build directory and build! 7 years ago
Bret Curtis 308d78e3da only download via curl if file on server is different than what is currently cached on VM. 7 years ago
Bret Curtis ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 7 years ago
Marc Zinnschlag 705b2dca0e Merged pull request #1777 7 years ago
Marc Zinnschlag baeaff2309 Merged pull request #1778 7 years ago
Bret Curtis a0cae78cb2
Merge pull request #1779 from akortunov/coverity
Fix some code coverity issues
7 years ago
Andrei Kortunov 97d8cc0efe Check if the local was not found, just for sure 7 years ago
Andrei Kortunov 7dff8d8fe2 Check cell for null 7 years ago
Andrei Kortunov 441463327c Validate map size 7 years ago
Andrei Kortunov 359e748c28 Initialize some missing fields in constructors 7 years ago
Bret Curtis d008cd0c46 Update .gitlab-ci.yml 7 years ago
Bret Curtis 87f367ec11 Update .gitlab-ci.yml 7 years ago
Capostrophic d6a170f848
Update changelog 7 years ago
Capostrophic ecafcefae9
Fall back to regular head when getVampireHead fails 7 years ago
Bret Curtis f1158e8129 Update .gitlab-ci.yml 7 years ago
Bret Curtis 55de1c1a72 Update .gitlab-ci.yml 7 years ago
Capostrophic afbe8f2161
Update changelog 7 years ago
Capostrophic 35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 7 years ago
Bret Curtis 40a9d8ac06 Update .gitlab-ci.yml 7 years ago
Bret Curtis c2826ca878 Update .gitlab-ci.yml 7 years ago
Bret Curtis 393ec99944 Update .gitlab-ci.yml 7 years ago
Bret Curtis 88555c0463 Update .gitlab-ci.yml 7 years ago
Bret Curtis 601b69b36c Update .gitlab-ci.yml 7 years ago
Bret Curtis dcba3a1058 Update .gitlab-ci.yml 7 years ago
Bret Curtis 516fc0283b Update .gitlab-ci.yml 7 years ago
Bret Curtis 64cc3b3a6a
Merge pull request #1774 from nikolaykasyanov/ci-macos-1013
[macOS, CI] Build using macOS 10.13 SDK
7 years ago
Bret Curtis 9667dd051c
Merge pull request #1771 from Xenkhan/master
Retrieve SDL window settings instead of using magic numbers
7 years ago