Bret Curtis
2d5f71e5be
Update .gitlab-ci.yml
2018-06-27 12:35:02 +00:00
Bret Curtis
edd22342f2
Update .gitlab-ci.yml
2018-06-27 12:32:18 +00:00
Bret Curtis
218353e452
Update .gitlab-ci.yml
2018-06-27 12:19:03 +00:00
Bret Curtis
0105a48a4f
give %% a try
2018-06-27 12:15:29 +00:00
Bret Curtis
6d1a83e667
Update .gitlab-ci.yml
2018-06-27 12:10:09 +00:00
Bret Curtis
51179a2c38
try a wildcard?
2018-06-27 12:01:51 +00:00
Bret Curtis
1fdffd6ef9
see if we can get win10 going
2018-06-27 13:57:51 +02: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
Marc Zinnschlag
5ee731d86f
updated roadmap section
2018-06-27 12:33:23 +02:00
Marc Zinnschlag
8bc6c85396
last minute changes (this time for real; forgot to merge in the last update from the private repo)
2018-06-27 12:24:21 +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
8cda355af6
last minute changes to design doc
2018-06-27 12:14:34 +02:00
Marc Zinnschlag
2afcea3870
added post-1.0 design document
2018-06-27 11:59:40 +02:00
Andrei Kortunov
ec73011617
Clean temporary storage if we assign new AI package (bug #4464 )
2018-06-27 12:52:43 +04:00
Andrei Kortunov
ee45f54b53
Refactor AiTemporaryStorage usage
2018-06-27 12:48:34 +04:00
Andrei Kortunov
3c7ab976c3
Ignore movement from scripted animations (bug #4475 )
2018-06-27 08:22:45 +04:00
Finbar Crago
cac6d59140
Merge branch 'master' into fix_quickkey_segfalt
2018-06-27 12:58:43 +10: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
Finbar Crago
43c9fd4cec
check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips
2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f
rm ContainerStore/refItem
2018-06-26 13:35:04 +10: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
Finbar Crago
46c6abcf54
add string vectors for name/id in QuickKeysMenu for item lookups
2018-06-25 16:02:28 +10: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
Finbar Crago
da4c55d5ad
prevent segfalt in QuickKeysMenu when item has been removed from player inventory
...
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().
(storing the RefId could be a better solution but would probably leave tooltips broken...)
2018-06-23 17:51:32 +10: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