d4d46fc602
Build everything but branches until we can allow VM/CIs to run on forked projects.
6 years ago
739c49d59b
Merge branch 'master' into 'win10_ci'
...
# Conflicts:
# CI/before_script.msvc.sh
6 years ago
8c153d116b
Merge pull request #1786 from OpenMW/CI_before_script_msvc_fixes
...
Update before_script.msvc.sh to add GitLab CI support and update dependency links
6 years ago
57e2573593
Update before_script.msvc.sh
...
check if temp directory exists, error out and warn user about it.
6 years ago
70e9d5c0a0
; it?
6 years ago
11030e56c4
detect existing dir
6 years ago
4f07ca28a6
Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv.
6 years ago
d4c9586bd0
try just converting the \ to a /
6 years ago
908af3720f
Merged pull request #1791
6 years ago
47d0321366
updated credits file
6 years ago
2a367a0c35
updated changelog
6 years ago
e50c3657b3
Merged merge request !16
6 years ago
9a88f9147e
Merged merge request !15
6 years ago
e9cc697b60
Sort EnumDelegate values by name
6 years ago
f4330cf057
Editor: limit FPS in 3D preview windows (feature #3641 )
6 years ago
7cbc4eeb49
Adding missing override keywords
...
Prevents compiler warnings such as this:
```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
virtual void onOpen();
^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
virtual void onOpen() {}
^
```
6 years ago
aa5ddd6b28
Merged merge request livestreamer https://www.twitch.tv/vanguardlx best
6 years ago
5d9035c6b2
[ Fixes #4482 ] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480 )
...
because apparently i can't count to ten...
6 years ago
3660d55adf
updated credits file
6 years ago
362798bd90
updated changelog
6 years ago
2ea85d0bb6
Merge remote-tracking branch 'gl_finbar-crago/fix_quickkey_segfalt'
6 years ago
af75c1e909
Update before_script.msvc.sh
...
reverting back to what works
6 years ago
dcb2ab80f5
Merge pull request #1788 from Capostrophic/armorcond
...
Make unarmed creature attacks not affect armor condition (bug #2455 )
6 years ago
4d60fe5a76
reverting back
6 years ago
09c9bd34c3
cleanup more unnecessary struct keywords...
6 years ago
b8b07b52f0
try this...
6 years ago
4177fd04eb
Update before_script.msvc.sh
...
Does it blend?
6 years ago
209359bbc3
Try this on for size...
6 years ago
78a3f95ee4
Update before_script.msvc.sh
6 years ago
2bf0d598cf
Update before_script.msvc.sh
...
Wrap in quites
6 years ago
6e9c08083d
Add missing empty attacker checks
6 years ago
bccba24c40
Make unarmed creature attacks not affect armor condition ( fixes #2455 )
6 years ago
9b6ea0e89f
# because our CI VMs are not public, MRs can't use them and timeout
6 years ago
d3dfe17441
try limiting scope
6 years ago
69cd7031e7
Merge branch 'master' into fix_quickkey_segfalt
6 years ago
596be205c1
cleanup unnecessary struct keywords...
6 years ago
06216aa124
Update .gitlab-ci.yml
6 years ago
2722ca50fb
fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570]
6 years ago
c474709127
Update before_script.msvc.sh
6 years ago
ca0f6fff4a
Update before_script.msvc.sh
6 years ago
dc48a46e50
Update before_script.msvc.sh
6 years ago
a6d6dd5995
updating for the nits
6 years ago
8811c7141a
Update before_script.msvc.sh
...
taking nits into account :)
6 years ago
a45d86bdf3
Merge remote-tracking branch 'gl_thunderforge/4479/separate-game-advanced-settings-in-launcher-take-2'
6 years ago
f06dd39892
Merge remote-tracking branch 'upstream/master'
6 years ago
c2ff30c4d7
correcting from GH/AV feedback, testing on GL.
6 years ago
a532aef935
Update before_script.msvc.sh
...
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
6 years ago
4c0e475092
Update before_script.msvc.sh
...
Use powershell trick with boost_temp so there is little chance of collision.
6 years ago
bccd83c656
Use 1.67
6 years ago
bc830a9c45
use boost_temp
6 years ago
Bret Curtis
AnyOldName3
Marc Zinnschlag
Doc West
Andrei Kortunov
Thunderforge
Finbar Crago
Capostrophic