mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Code Issues Releases Wiki Activity
19293 commits 38 branches 54 tags 122 MiB
Commit graph

108 commits

Author SHA1 Message Date
David Cernat
93bd3207db Merge pull request #212 from OpenMW/master 
Add OpenMW commits up to 6 May 2017
 2017-05-06 18:39:42 +03:00
Alexander "Ace" Olofsson
fd03c76e68 And apparently they're only doing zips now 2017-05-06 09:38:14 +02:00
Alexander "Ace" Olofsson
ae05c37a46 Update Windows CI scripts to use ffmpeg 3.2.4 2017-05-06 09:21:02 +02:00
David Cernat
e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 2017-03-07 21:53:49 +01:00
Nikolay Kasyanov
57c5ecfba8 [macOS, CI] Use most recent prebuilt dependencies 2017-03-05 23:01:16 +01:00
Nikolay Kasyanov
f1abc5d7cb [macOS, CI] Use Release configuration 2017-03-05 23:01:16 +01:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02:00
Alexander "Ace" Olofsson
cda83559aa Update Bullet to 2.86 2017-02-10 11:37:36 +01:00
Koncord
316e5fa22e [CI] Disable Browser 2017-01-27 19:44:35 +08:00
David Cernat
dfb87e9e0d Merge pull request #124 from OpenMW/master 
Add OpenMW commits up to 11 Jan
 2017-01-11 13:30:22 +02:00
Nikolay Kasyanov
7bd95c8ce3 [macOS] Use https link to download dependencies on CI 2017-01-05 14:06:52 +03:00
Nikolay Kasyanov
07423f973f [macOS] Use newer prebuilt dependencies on CI 2017-01-05 14:02:10 +03:00
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master 
Add OpenMW changes up to 26 Dec
 2016-12-26 01:09:20 +02:00
Nikolay Kasyanov
a0990e5899 [macOS] Switch CI to Xcode 8.2 2016-12-24 16:05:24 +01:00
David Cernat
bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
 2016-12-20 05:21:24 +02:00
Nikolay Kasyanov
37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
6d8d9e5dbc [macOS] Take Qt prefix path from Homebrew for CI resilience 
Recent CI failure was caused by path changed by Homebrew.
 2016-12-18 18:22:43 +01:00
David Cernat
ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 2016-11-06 19:03:35 +02:00
Nikolay Kasyanov
3adf4cb97f Link OpenMW with libz on macOS 2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874 Revert "Link OpenMW with libz on macOS" 
This reverts commit 0c4dd05118.
 2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118 Link OpenMW with libz on macOS 2016-11-05 12:09:47 +01:00
David Cernat
4d72e7ce37 Merge pull request #91 from OpenMW/master 
Add OpenMW commits up to 31 Oct
 2016-10-31 12:22:37 +02:00
Nikolay Kasyanov
cf2e59c983 [OS X] Use Qt 5.5 on CI 
Newer Qt versions require C++11.
 2016-10-30 21:36:43 +01:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Koncord
e5e9c90441 Travis: disable build server for clang 2016-09-04 19:10:39 +08:00
Koncord
485a1b1e3b Disable OS X in Travis CI 2016-09-04 17:58:28 +08:00
Koncord
9abd4e5a16 Fail :D 2016-09-04 17:03:07 +08:00
Koncord
b2f1bb06f2 fix travis 2 2016-09-04 16:51:16 +08:00
Koncord
9a4edff122 Disable unnecessary builds 2016-09-04 16:06:49 +08:00
Koncord
31c372a0e7 resolve depends for travis 2016-09-04 15:44:37 +08:00
Alexander "Ace" Olofsson
123e57a65c Include the OpenAL32.dll file into builds 2016-09-02 06:57:36 +02:00
scrawl
20da3bc240 Merge pull request #1037 from ace13/appveyor 
Visual Studio 2015 support
 2016-08-29 12:40:09 +02:00
Alexander "Ace" Olofsson
bcaf160eab Add some missing Qt DLLs 2016-08-29 07:07:50 +02:00
Alexander "Ace" Olofsson
c93f7b90c5 Disable the version changing on AppVeyor 
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
 2016-08-29 00:37:20 +02:00
Alexander "Ace" Olofsson
61d9729767 A final bit of script cleanup and caching 2016-08-29 00:29:30 +02:00
Alexander "Ace" Olofsson
6abc3c04bd One letter wrong, oops 2016-08-28 23:26:02 +02:00
Alexander "Ace" Olofsson
d781846f53 Fix the /bigobj issue and some script cleanup 
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
 2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
bc6aa86b8a And escaping the printf input 2016-08-28 21:56:53 +02:00
Alexander "Ace" Olofsson
e47f4a9016 Missing STEP variable 2016-08-28 21:54:41 +02:00
Alexander "Ace" Olofsson
83de1f2de9 And use the correct OpenAL version 
Should really have run these on a clean dir locally, but time
constraints...
 2016-08-28 21:52:32 +02:00
Alexander "Ace" Olofsson
81a9258de9 Don't reset the APPVEYOR and CI variables 2016-08-28 21:48:00 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5 Visual Studio 2015 support 2016-08-28 21:42:48 +02:00
Allofich
c89293770f Link Clang paths 2016-08-28 21:25:09 +09:00
scrawl
b26478b860 Merge pull request #1028 from kpp/find_osg_plugins 
Find osg_plugins
 2016-08-16 17:05:44 +02:00
Roman Proskuryakov
95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 2016-08-16 06:06:30 +03:00
Roman Proskuryakov
9d51e1966f Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation 2016-08-15 23:55:53 +03:00
scrawl
dae4a8353a Merge pull request #1024 from kpp/kpp_travis_improvements 
Improve Travis config
 2016-08-15 20:05:33 +02:00
Roman Proskuryakov
f4f81a14c9 Use Travis addons.apt.packages to install packages 2016-08-15 18:45:29 +03:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui 
Find mygui
 2016-08-15 16:36:48 +02:00