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

246 commits

Author SHA1 Message Date
AnyOldName3
d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-01 16:48:21 +00:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
afd700dab9 Ensure different Boost versions get different names 2018-10-31 23:38:10 +00:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Nikolay Kasyanov
f62ca24356 [macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665 2018-10-26 19:33:04 +02:00
elsid
3d97e96f55
Add dependency to recastnavigation 2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713 Merge upstream/master 2018-10-10 21:23:19 +01:00
Capostrophic
e627f49df4 Fix AppVeyor build 2018-10-07 20:22:52 +03:00
elsid
2073218fc6
Use specific googletest version 2018-09-28 22:39:27 +03:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00
elsid
ef631a0961
Add dependency for GMock 2018-08-11 16:52:53 +03:00
AnyOldName3
cc23a968d1 Merge upstream/master 2018-08-01 14:13:45 +01:00
Bret Curtis
84b80ae405 no spaces in assignment 2018-07-22 23:12:37 +00:00
Bret Curtis
b910106713 Catch an unbound variable before it happens. 2018-07-22 07:17:34 +00:00
Bret Curtis
739c49d59b Merge branch 'master' into 'win10_ci' 
# Conflicts:
#   CI/before_script.msvc.sh
 2018-07-04 15:21:45 +00:00
Bret Curtis
57e2573593
Update before_script.msvc.sh 
check if temp directory exists, error out and warn user about it.
 2018-07-03 15:59:51 +02:00
Bret Curtis
70e9d5c0a0 ; it? 2018-07-03 13:53:13 +00:00
Bret Curtis
11030e56c4 detect existing dir 2018-07-03 13:41:06 +00:00
Bret Curtis
4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 2018-07-03 13:00:19 +00:00
Bret Curtis
d4c9586bd0 try just converting the \ to a / 2018-07-03 12:53:30 +00:00
Bret Curtis
af75c1e909
Update before_script.msvc.sh 
reverting back to what works
 2018-06-30 08:40:21 +02:00
Bret Curtis
4d60fe5a76 reverting back 2018-06-30 06:10:26 +00:00
Bret Curtis
b8b07b52f0 try this... 2018-06-29 22:42:12 +00:00
Bret Curtis
4177fd04eb
Update before_script.msvc.sh 
Does it blend?
 2018-06-29 21:08:42 +02:00
Bret Curtis
209359bbc3 Try this on for size... 2018-06-29 19:07:39 +00:00
Bret Curtis
78a3f95ee4 Update before_script.msvc.sh 2018-06-29 18:03:25 +00:00
Bret Curtis
2bf0d598cf
Update before_script.msvc.sh 
Wrap in quites
 2018-06-29 20:01:35 +02:00
Bret Curtis
c474709127
Update before_script.msvc.sh 2018-06-29 15:26:11 +02:00
Bret Curtis
ca0f6fff4a Update before_script.msvc.sh 2018-06-29 13:25:36 +00:00
Bret Curtis
dc48a46e50 Update before_script.msvc.sh 2018-06-29 13:22:07 +00:00
Bret Curtis
a6d6dd5995 updating for the nits 2018-06-29 13:17:19 +00:00
Bret Curtis
8811c7141a
Update before_script.msvc.sh 
taking nits into account :)
 2018-06-29 15:14:23 +02:00
Bret Curtis
c2ff30c4d7 correcting from GH/AV feedback, testing on GL. 2018-06-29 09:33:51 +00:00
Bret Curtis
a532aef935
Update before_script.msvc.sh 
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
 2018-06-29 11:31:37 +02:00
Bret Curtis
4c0e475092
Update before_script.msvc.sh 
Use powershell trick with boost_temp so there is little chance of collision.
 2018-06-29 10:16:28 +02:00
Bret Curtis
bccd83c656 Use 1.67 2018-06-29 08:09:41 +00:00
Bret Curtis
bc830a9c45 use boost_temp 2018-06-29 08:00:54 +00:00
Bret Curtis
63bbc77ee7 try using the powershell trick from AnyOldName3 2018-06-29 07:51:45 +00:00
Bret Curtis
3379eafd33 Update before_script.msvc.sh 2018-06-28 20:44:22 +00:00
Bret Curtis
3ceb9116de Give pwd -W a try 2018-06-28 20:28:58 +00:00
Bret Curtis
c4a4111b2e Update before_script.msvc.sh 2018-06-28 15:33:32 +00:00
Bret Curtis
fb6ad9faec try %TMP% ? 2018-06-28 15:23:56 +00:00
Bret Curtis
4ad3d66629 try using just ${TMP} 2018-06-28 14:18:58 +00:00
Bret Curtis
8be52d228e
Update before_script.msvc.sh 
small fixes
 2018-06-28 15:12:26 +02:00
Bret Curtis
60ec340fa3 remove toolset_real, use just toolset, do proper comparison 2018-06-28 12:18:01 +00:00
Bret Curtis
71314f0c3a Use boost 1.67 instead of 1.61 2018-06-28 12:03:52 +00:00
Bret Curtis
46575d8de7
Update before_script.msvc.sh 
1.61 -> 1.67
 2018-06-28 14:01:41 +02:00
Bret Curtis
660193ae1b
Update before_script.msvc.sh 
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
 2018-06-28 13:59:23 +02:00
Bret Curtis
1c4363eaa6 Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd. 2018-06-28 11:22:54 +00:00
Bret Curtis
7bf502dd02 Bash it out! 2018-06-28 11:09:27 +00:00
Bret Curtis
1061270ac0 Try using @TEMP@ instead of hard coding it. 2018-06-28 11:05:10 +00:00
Bret Curtis
45d77372a0 with 260 char path fixed, this should work. 2018-06-28 10:41:12 +00:00
Bret Curtis
f17426cbcd give boost 1.67 a spin with msvc 14.1 2018-06-27 20:24:08 +00:00
Bret Curtis
bd602847b5 fix broken QT 5.7.0 link 2018-06-27 15:07:53 +00:00
Bret Curtis
59a4251a6a try to extract boost higher up in dir, then move. 2018-06-27 14:36:20 +00:00
Bret Curtis
b6fc204dd3 be more aggressive about suppressing message boxes 2018-06-27 14:02:30 +00:00
Bret Curtis
f7e1083ba4 get more output from boost 2018-06-27 13:34:37 +00:00
Bret Curtis
e068ee3533 tell unzip to overwrite all files 2018-06-26 14:01:10 +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
AnyOldName3
9df59720e4 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-06-24 23:41:14 +01:00
Nikolay Kasyanov
90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 2018-06-20 19:59:55 +02:00
AnyOldName3
553094669b Merge upstream/master (& fix merge conflicts) 2018-06-20 00:11:23 +01:00
Bret Curtis
937cbfa0a1
small commit to rigger AV 2018-06-07 17:09:39 +02:00
AnyOldName3
a1ab1dc7fe Add easily understood error messages to the prebuild script instead of vague/silent failures. 2018-06-07 15:28:45 +01:00
Bret Curtis
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor 
AppVeyor: build with Release configuration
 2018-05-29 10:25:02 +02:00
Andrei Kortunov
de2513653e AppVeyor: build with Release configuration 2018-05-28 09:08:30 +04:00
AnyOldName3
759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master' 2018-05-27 15:41:42 +01:00
Nikolay Kasyanov
ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 2018-05-24 23:00:59 +02:00
AnyOldName3
9ff31cc80d Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-05-22 00:14:07 +01:00
Alexander "Ananace" Olofsson
d05de8e411
Give boost the correct toolset for 2017 2018-05-20 18:51:28 +02:00
Alexander "Ananace" Olofsson
3bd8dc3ef6
Use the right boost version for Appveyor 2018-05-20 18:22:02 +02:00
Alexander "Ananace" Olofsson
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor 2018-05-20 18:09:31 +02:00
Alexander "Ananace" Olofsson
ea6c73333b
Bumping Qt to 5.10 for Appveyor 2018-05-20 17:14:32 +02:00
AnyOldName3
44b2cf2b7f Merge upstream. 2018-05-11 19:15:04 +01:00
bret curtis
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 2018-03-27 20:20:40 +02:00
Harald H
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
 2018-03-08 21:23:24 +01:00
AnyOldName3
0e481a457e Merge remote-tracking branch 'refs/remotes/upstream/master' 2017-12-08 23:26:08 +00:00
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7 2017-12-02 21:48:57 +01:00
Alexander "Ace" Olofsson
04af200ae8 Downgrade MyGUI to 3.2.2 for Windows builds 2017-10-28 13:37:41 +02:00
AnyOldName3
ef8a7d1cb9 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2017-10-26 23:40:05 +01:00
Alexander "Ace" Olofsson
32bdd500af Updating OSG packages to 3.4.1 2017-10-22 23:13:01 +02:00
AnyOldName3
147455626e Merge OpenMW/master 2017-10-13 21:39:15 +01:00
AnyOldName3
20607bdcd9 Actually add shadow DLL under Windows automatically for real this time 2017-10-13 18:17:49 +01:00
AnyOldName3
c2cd338086 Add shadow DLL under Windows automatically 2017-10-13 18:05:25 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
AnyOldName3
b94bbe00cb Merge remote-tracking branch 'upstream/master' into osgshadow-test 2017-10-08 00:18:02 +01:00
Nikolay Kasyanov
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
 2017-10-03 17:34:45 +02:00
AnyOldName3
f50063402d Adjust shaders to support shadows 2017-09-21 00:25:48 +01:00
Nikolay Kasyanov
ffcdedced3 [macOS, CI] Use FTP URL from environment 
This URL is also subject to change, moving to Travis settings.
 2017-08-01 20:35:10 +02:00
scrawl
c23b75ab9a Merge pull request #1339 from PlutonicOverkill/vs2017-support 
Add Visual Studio 2017 support (Feature #3952)
 2017-07-25 21:07:34 +00:00
Nikolay Kasyanov
411b78562e [macOS, CI] Use most recent dependencies 
Includes a fix for https://bugs.openmw.org/issues/3904.
 2017-07-22 21:25:59 +02:00
PlutonicOverkill
0eb54fa96a Remove TOOLSET and XP_TOOLSET 2017-07-22 17:58:04 +12:00
PlutonicOverkill
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.
 2017-07-14 12:07:16 +12:00
tlmullis
fad760cc1d msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh 2017-06-19 06:00:42 -07:00
Nikolay Kasyanov
016da1f10c [macOS, CI] Use most recent dependencies 2017-06-13 08:44:55 +02:00
Nikolay Kasyanov
dd882b69c6 [macOS, CI] Use Release configuration 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
071419db4a [macOS, CI] Enable OpenCS build and see what happens 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 2017-06-09 16:49:25 +02:00