49d81241db
Merge branch 'master' into pathfinder_detour
6 years ago
f62ca24356
[macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665
6 years ago
3d97e96f55
Add dependency to recastnavigation
6 years ago
0124be5713
Merge upstream/master
6 years ago
e627f49df4
Fix AppVeyor build
6 years ago
2073218fc6
Use specific googletest version
6 years ago
80082308f0
Merge upstream (shadermanager log system revamp)
6 years ago
ef631a0961
Add dependency for GMock
6 years ago
cc23a968d1
Merge upstream/master
7 years ago
65de028e0d
Merge pull request #462 from OpenMW/master
...
Add OpenMW commits up to 23 Jul 2018
7 years ago
84b80ae405
no spaces in assignment
7 years ago
b910106713
Catch an unbound variable before it happens.
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
739c49d59b
Merge branch 'master' into 'win10_ci'
...
# Conflicts:
# CI/before_script.msvc.sh
7 years ago
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
57e2573593
Update before_script.msvc.sh
...
check if temp directory exists, error out and warn user about it.
7 years ago
70e9d5c0a0
; it?
7 years ago
11030e56c4
detect existing dir
7 years ago
4f07ca28a6
Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv.
7 years ago
d4c9586bd0
try just converting the \ to a /
7 years ago
af75c1e909
Update before_script.msvc.sh
...
reverting back to what works
7 years ago
4d60fe5a76
reverting back
7 years ago
b8b07b52f0
try this...
7 years ago
4177fd04eb
Update before_script.msvc.sh
...
Does it blend?
7 years ago
209359bbc3
Try this on for size...
7 years ago
78a3f95ee4
Update before_script.msvc.sh
7 years ago
2bf0d598cf
Update before_script.msvc.sh
...
Wrap in quites
7 years ago
c474709127
Update before_script.msvc.sh
7 years ago
ca0f6fff4a
Update before_script.msvc.sh
7 years ago
dc48a46e50
Update before_script.msvc.sh
7 years ago
a6d6dd5995
updating for the nits
7 years ago
8811c7141a
Update before_script.msvc.sh
...
taking nits into account :)
7 years ago
c2ff30c4d7
correcting from GH/AV feedback, testing on GL.
7 years ago
a532aef935
Update before_script.msvc.sh
...
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
7 years ago
4c0e475092
Update before_script.msvc.sh
...
Use powershell trick with boost_temp so there is little chance of collision.
7 years ago
bccd83c656
Use 1.67
7 years ago
bc830a9c45
use boost_temp
7 years ago
63bbc77ee7
try using the powershell trick from AnyOldName3
7 years ago
3379eafd33
Update before_script.msvc.sh
7 years ago
3ceb9116de
Give pwd -W a try
7 years ago
c4a4111b2e
Update before_script.msvc.sh
7 years ago
fb6ad9faec
try %TMP% ?
7 years ago
4ad3d66629
try using just ${TMP}
7 years ago
8be52d228e
Update before_script.msvc.sh
...
small fixes
7 years ago
60ec340fa3
remove toolset_real, use just toolset, do proper comparison
7 years ago
71314f0c3a
Use boost 1.67 instead of 1.61
7 years ago
46575d8de7
Update before_script.msvc.sh
...
1.61 -> 1.67
7 years ago
660193ae1b
Update before_script.msvc.sh
...
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
7 years ago
1c4363eaa6
Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd.
7 years ago
7bf502dd02
Bash it out!
7 years ago
1061270ac0
Try using @TEMP@ instead of hard coding it.
7 years ago
45d77372a0
with 260 char path fixed, this should work.
7 years ago
f17426cbcd
give boost 1.67 a spin with msvc 14.1
7 years ago
bd602847b5
fix broken QT 5.7.0 link
7 years ago
59a4251a6a
try to extract boost higher up in dir, then move.
7 years ago
b6fc204dd3
be more aggressive about suppressing message boxes
7 years ago
f7e1083ba4
get more output from boost
7 years ago
e068ee3533
tell unzip to overwrite all files
7 years ago
308d78e3da
only download via curl if file on server is different than what is currently cached on VM.
7 years ago
ae4cb0c3ee
no need for macos_qt_formula since on osx there is no more qt4, just qt5
7 years ago
9df59720e4
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
90ccf5b42b
[macOS, CI] Build using macOS 10.13 SDK
7 years ago
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
937cbfa0a1
small commit to rigger AV
7 years ago
a1ab1dc7fe
Add easily understood error messages to the prebuild script instead of vague/silent failures.
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
...
AppVeyor: build with Release configuration
7 years ago
de2513653e
AppVeyor: build with Release configuration
7 years ago
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
ba3a02ad05
[macOS, CI] Do not upload a nightly if there's already one of the same commit
7 years ago
9ff31cc80d
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
815d17d9db
Merge pull request #433 from OpenMW/master
...
Add OpenMW commits up to 21 May 2018
7 years ago
d05de8e411
Give boost the correct toolset for 2017
7 years ago
3bd8dc3ef6
Use the right boost version for Appveyor
7 years ago
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor
7 years ago
ea6c73333b
Bumping Qt to 5.10 for Appveyor
7 years ago
44b2cf2b7f
Merge upstream.
7 years ago
cf5bd0dca7
Travis: use qt5, newer boost libraries, callff, gcc/clang builds...
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
07f0cc2b0e
Merge pull request #353 from OpenMW/master
...
Add OpenMW commits up to 4 Dec 2017
7 years ago
50deed126b
Update SDL to 2.0.7
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
04af200ae8
Downgrade MyGUI to 3.2.2 for Windows builds
7 years ago
ef8a7d1cb9
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
7 years ago
32bdd500af
Updating OSG packages to 3.4.1
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
147455626e
Merge OpenMW/master
7 years ago
20607bdcd9
Actually add shadow DLL under Windows automatically for real this time
7 years ago
c2cd338086
Add shadow DLL under Windows automatically
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
b94bbe00cb
Merge remote-tracking branch 'upstream/master' into osgshadow-test
7 years ago
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
c598f1313c
[macOS, CI] Update dependencies
...
The following changes are included:
- https://github.com/OpenMW/openmw-deps-mac/pull/37
- https://github.com/OpenMW/openmw-deps-mac/pull/38
7 years ago
elsid
Nikolay Kasyanov
AnyOldName3
Capostrophic
David Cernat
Bret Curtis
Andrei Kortunov
Alexander "Ananace" Olofsson
Kyle Cooley
Harald H
Nikolay Kasyanov