792a0585c0
Add recastnavigation as subdirectory
6 years ago
afd700dab9
Ensure different Boost versions get different names
6 years ago
3785ba6aa0
Merge upstream/master
6 years ago
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
f50063402d
Adjust shaders to support shadows
7 years ago
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
ffcdedced3
[macOS, CI] Use FTP URL from environment
...
This URL is also subject to change, moving to Travis settings.
8 years ago
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
8 years ago
c23b75ab9a
Merge pull request #1339 from PlutonicOverkill/vs2017-support
...
Add Visual Studio 2017 support (Feature #3952 )
8 years ago
2c1ece79fc
Merge pull request #245 from OpenMW/master
...
Add OpenMW commits up to 22 Jul 2017
8 years ago
411b78562e
[macOS, CI] Use most recent dependencies
...
Includes a fix for https://bugs.openmw.org/issues/3904 .
8 years ago
0eb54fa96a
Remove TOOLSET and XP_TOOLSET
8 years ago
2d7689b978
Add Visual Studio 2017 support
...
The new VS2017 configuration uses all the same settings as the
VS2015 one, but uses a different generator.
CMake by default looks for Boost libraries based on the compiler
being used, but Boost only has binaries for VS2015, so a hack is
used to make sure it looks for the correct ones.
I don't know what TOOLSET and XP_TOOLSET are for but I left them
just in case.
8 years ago
df67ae4689
Merge pull request #229 from OpenMW/master
...
Add OpenMW commits up to 20 Jun 2017
8 years ago
fad760cc1d
msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
016da1f10c
[macOS, CI] Use most recent dependencies
8 years ago
dd882b69c6
[macOS, CI] Use Release configuration
8 years ago
071419db4a
[macOS, CI] Enable OpenCS build and see what happens
8 years ago
c16506d07c
[OS X, CI] Use Xcode 8/macOS 10.12 SDK
8 years ago
6260e15852
[OS X] Temporarily disable OpenCS build on CI
8 years ago
231908d9cf
[OS X, CI] Use dependencies build against libc++
8 years ago
b6ee76b77b
Switch to latest Qt5 version which is C++11-compatible
8 years ago
315ec46ff6
Merge pull request #224 from OpenMW/master
...
Add OpenMW commits up to 3 Jun 2017
8 years ago
224fcc9a4a
[macOS, CI] Fix dependency installation
8 years ago
93bd3207db
Merge pull request #212 from OpenMW/master
...
Add OpenMW commits up to 6 May 2017
8 years ago
fd03c76e68
And apparently they're only doing zips now
8 years ago
ae05c37a46
Update Windows CI scripts to use ffmpeg 3.2.4
8 years ago
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
e24cb0fe5d
[macOS, CI] Configure deployment of nightly builds to FTP
8 years ago
57c5ecfba8
[macOS, CI] Use most recent prebuilt dependencies
8 years ago
f1abc5d7cb
[macOS, CI] Use Release configuration
8 years ago
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
8 years ago
cda83559aa
Update Bullet to 2.86
8 years ago
316e5fa22e
[CI] Disable Browser
8 years ago
dfb87e9e0d
Merge pull request #124 from OpenMW/master
...
Add OpenMW commits up to 11 Jan
8 years ago
7bd95c8ce3
[macOS] Use https link to download dependencies on CI
8 years ago
07423f973f
[macOS] Use newer prebuilt dependencies on CI
8 years ago
5bdfb72752
Merge pull request #116 from OpenMW/master
...
Add OpenMW changes up to 26 Dec
8 years ago
a0990e5899
[macOS] Switch CI to Xcode 8.2
8 years ago
bf0a96d552
Merge pull request #114 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
8 years ago
37c8a36dd8
[macOS] Parametrize Qt5 version used on CI
8 years ago
6d8d9e5dbc
[macOS] Take Qt prefix path from Homebrew for CI resilience
...
Recent CI failure was caused by path changed by Homebrew.
8 years ago
ec211e58d0
Merge pull request #98 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
8 years ago
3adf4cb97f
Link OpenMW with libz on macOS
8 years ago
0115a3a874
Revert "Link OpenMW with libz on macOS"
...
This reverts commit 0c4dd05118
8 years ago
0c4dd05118
Link OpenMW with libz on macOS
8 years ago
4d72e7ce37
Merge pull request #91 from OpenMW/master
...
Add OpenMW commits up to 31 Oct
8 years ago
cf2e59c983
[OS X] Use Qt 5.5 on CI
...
Newer Qt versions require C++11.
8 years ago
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
e5e9c90441
Travis: disable build server for clang
8 years ago
485a1b1e3b
Disable OS X in Travis CI
8 years ago
9abd4e5a16
Fail :D
8 years ago
b2f1bb06f2
fix travis 2
8 years ago
9a4edff122
Disable unnecessary builds
8 years ago
31c372a0e7
resolve depends for travis
8 years ago
123e57a65c
Include the OpenAL32.dll file into builds
8 years ago
20da3bc240
Merge pull request #1037 from ace13/appveyor
...
Visual Studio 2015 support
8 years ago
bcaf160eab
Add some missing Qt DLLs
8 years ago
c93f7b90c5
Disable the version changing on AppVeyor
...
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
8 years ago
61d9729767
A final bit of script cleanup and caching
8 years ago
6abc3c04bd
One letter wrong, oops
8 years ago
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago
bc6aa86b8a
And escaping the printf input
8 years ago
e47f4a9016
Missing STEP variable
8 years ago
83de1f2de9
And use the correct OpenAL version
...
Should really have run these on a clean dir locally, but time
constraints...
8 years ago
81a9258de9
Don't reset the APPVEYOR and CI variables
8 years ago
dd5b6a46f5
Visual Studio 2015 support
8 years ago
c89293770f
Link Clang paths
8 years ago
b26478b860
Merge pull request #1028 from kpp/find_osg_plugins
...
Find osg_plugins
9 years ago
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
9 years ago
9d51e1966f
Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation
9 years ago
dae4a8353a
Merge pull request #1024 from kpp/kpp_travis_improvements
...
Improve Travis config
9 years ago
f4f81a14c9
Use Travis addons.apt.packages to install packages
9 years ago
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
9 years ago
4cffdb67d8
Uses case-sensitive MyGUI_* variables
9 years ago
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
9 years ago
57640b8161
Improve the MSVC prebuild script to allow compiled binaries to be run directly with no further modification
9 years ago
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
f23b551bfa
Rename FFMPEG_SDK -> FFMPEG_HOME as it is said in wiki
...
Fix #942
9 years ago
4821abc8af
Fixes MSVC CI for FFmpeg
9 years ago
697b809c79
Reactivate OS X CI
9 years ago
63665104bf
Remove optimization build flags on Travis-CI to speed up the build
9 years ago
b3e985fca2
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
10609ca5d1
how much memory in our vm?
9 years ago
339fbe23a7
remove precise cruft
9 years ago
f422fe49f8
Slight improvement to the build setup
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
c8145a1b91
Let's see if we can't get AppVeyor to work
9 years ago
c226d015ac
AppVeyor doesn't pass the platform env variable?
9 years ago
f3187b17c8
Update OpenAL soft link, get qtbinpatcher to run
9 years ago
9d5e7b34c6
use ffmpeg from our repo
9 years ago
1e8eddc5b4
another try
9 years ago
bdfd1c217b
try using precise ffmpeg library instead of libav
9 years ago
6bf3932279
Fix the check_tabs.sh script choking on QT generated UI files when doing an in-source build
9 years ago
4ddb2feebb
Let's try building everything, see how far we get
9 years ago
2e174fd1b5
Readd SDL2 main
9 years ago
33175b44b8
Disable SDL main library
9 years ago
fec08ef73e
Run unity build
9 years ago
ead82742cd
Merge branch 'unity-fixes' into appveyor
9 years ago
ab97a90c76
Add travis-ci script to detect tab characters in the code
9 years ago
90af7060ea
Forgot an echo
10 years ago
27a4af26ab
Cleaning up AppVeyor scripts
10 years ago
3a0293480e
Update boost in travis-ci to fix build failure
10 years ago
a831e89a43
Fix MyGUI include dir, and properly return error codes
10 years ago
f8485211a1
Fix merge issue
10 years ago
0a47104c53
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
10 years ago
ad47fb7b51
Fix build script
10 years ago
4319255d7b
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
10 years ago
24593d70ad
Merge remote-tracking branch 'upstream/appveyor' into appveyor-osg
10 years ago
331d87d738
Bring over some more OSG changes to the Appveyor scripts, and properly use Qt
10 years ago
b93cba9a69
Push messages properly
10 years ago
9b09c7bbb0
Test the pre-existing Qt 5.4.1 install on Appveyor
10 years ago
a1e29162bd
Bring Ogre pre-build script up to OSG standard
10 years ago
c71bbd02bf
Finish up the OSG build scripts and configuration
...
Sadly it seems like Appveyor can't build OpenMW without timing out yet.
More build-time improvements are in order
10 years ago
4f2cd17119
Let's get some OSG builds going
10 years ago
c40f59179f
Merge remote-tracking branch 'scrawl/osg' into appveyor-osg
10 years ago
30053140a1
Add cmake-data workaround to travis script
10 years ago
7fe86a7fe0
Adjust travis config -ogre, -boost_wave, +osg
10 years ago
e49cf2888d
Let's disable everything except OpenMW itself
...
Just to check if it's at all possible to use AppVeyor
10 years ago
3425e9b1d1
And done.
...
Switched to a slight less shallow clone too, for better versioning
10 years ago
108c2719a8
And yet I forgot about msbuild, should work now
10 years ago
20b7c7b46c
Hopefully the last fixes, build should run
10 years ago
ba9b21bc29
Moving dependencies to a better place
10 years ago
0a1454d5ec
Final fixes, moving to Appveyor unstable for boost
10 years ago
6993fbaece
And yet more issues slip past
10 years ago
d7494128a2
More script fixes
10 years ago
cd4042109a
Fix the script issues
10 years ago
956234cde9
Add preliminary appveyor data
10 years ago
154bb04a77
add scan-build to travis matrix
10 years ago
6b0ca73352
CI: use Qt from our homebrew tap
10 years ago
2fa39c4581
Do not install formulae that are already present on Travis instances, let's check if that would make Travis happy
10 years ago
8b2b54d89a
Travis CI: enable OS X build
...
Refactor platform-specific calls from .travis.yml to separate .sh scripts.
Test suite still needs to be enabled & tested for OS X though.
10 years ago
elsid
AnyOldName3
Nikolay Kasyanov
Capostrophic
David Cernat
Bret Curtis
Andrei Kortunov
Alexander "Ananace" Olofsson
Kyle Cooley
Harald H
Nikolay Kasyanov
scrawl
PlutonicOverkill
tlmullis
Koncord
Koncord
scrawl
Allofich
Roman Proskuryakov
Nikolay Kasyanov
Scott Howard