Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
83055 commits 2 branches 0 tags 1.1 GiB
Commit graph

83055 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
6d5e494f43
Merge pull request #320 from ctrlaltdavid/fix/jsdoc-fixes 
Miscellaneous JSdoc fixes
 2020-04-28 13:49:41 +12:00
David Rowe
5e997d7b60 Fix up Vircadia URLs 2020-04-27 20:38:23 +12:00
kasenvr
c7be40d2fa
Merge pull request #306 from ctrlaltdavid/fix/record-app 
Update Record app
 2020-04-27 01:11:33 -04:00
Thijs Wenker
bbda0cc6d0 CR fixes 2020-04-27 01:17:45 +02:00
Seth Alves
da6b59f3f2 Don't let Linux build of glm with clang-9 fail due to stray semicolon 2020-04-26 21:54:05 +00:00
David Rowe
2d070e630b Merge branch 'master' into fix/jsdoc-fixes 
# Conflicts:
#	interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
#	interface/resources/qml/hifi/commerce/checkout/Checkout.qml
#	interface/resources/qml/hifi/commerce/purchases/Purchases.qml
#	interface/src/Application.cpp
 2020-04-26 20:38:43 +12:00
Heather Anderson
e29271d8ca rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>) 
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
 2020-04-25 20:32:38 -07:00
kasenvr
5c2dab6ba5
Merge pull request #314 from kasenvr/kasen/core 
Update master with kasen/core's latest changes
 2020-04-25 14:46:01 -04:00
Thijs Wenker
44cc1c14b4 get multiple linux artifacts to check them out 2020-04-23 14:00:23 +02:00
Thijs Wenker
3105b7f7c6 use PYTHON_EXEC for upload script to select the correct version of python 2020-04-23 12:24:45 +02:00
Thijs Wenker
5375c341a6 fix upload script path 2020-04-23 11:22:00 +02:00
Thijs Wenker
ee8ee9c611 disable build tools 2020-04-23 11:22:00 +02:00
kasenvr
ffd70f138f
Merge pull request #287 from FluffyJenkins/feature/chat 
Made Gridchat muted by default
 2020-04-22 19:25:46 -04:00
Thijs Wenker
f186c9341a linux gha fix 
# Conflicts:
#	.github/workflows/pr_build.yml
 2020-04-23 01:01:19 +02:00
Thijs Wenker
c4a0fc30bb fix not matching declaration/definition argument name 2020-04-23 00:58:49 +02:00
Thijs Wenker
b4362ea85a move template functions to header 2020-04-23 00:58:49 +02:00
Thijs Wenker
5fa8571c0b shared seems to require linking with CoreFoundation and OpenGL on OSX 2020-04-23 00:58:48 +02:00
Thijs Wenker
fd63e0ed4f set linux github action to 16.04 to maintain backward compatibility 2020-04-22 12:20:30 +02:00
Heather Anderson
2d6d205bf2 The original patch was more appropriate. We need to figure out what this needs to do, enough dancing. 
This reverts commit bc5dd45187.
 2020-04-21 23:15:08 -07:00
kasenvr
0fb1f37450
Merge pull request #277 from kasenvr/fix/api-docs-branding 
API docs rebranded to Vircadia.
 2020-04-21 23:46:55 -04:00
Kasen IO
e85c50e712 Update URL. 2020-04-19 23:44:11 -04:00
David Rowe
8cf1766df4 Update AC script URL 2020-04-20 15:43:07 +12:00
David Rowe
0f0a8ad7bf Update branding and AC script location 2020-04-20 10:42:22 +12:00
Thijs Wenker
3a4b312b53 ubuntu github actions: use pip3 instead of python 2.7 version of pip 2020-04-19 22:50:54 +02:00
Thijs Wenker
1dd843c916 set correct JOB_NAME in osx/windows GHA environment 2020-04-19 22:50:53 +02:00
Thijs Wenker
e71a94cc3e Build.md: Generating a release/debug only vcpkg build docs 2020-04-19 22:50:53 +02:00
Thijs Wenker
ba62b06f25 move comment to the code it belongs to 2020-04-19 22:50:53 +02:00
Thijs Wenker
403925ef0e add missing exceptions qt downloader 2020-04-19 22:50:52 +02:00
Thijs Wenker
0ebe33b447 change upload server 2020-04-19 22:50:52 +02:00
Thijs Wenker
35efa33b74 - set the correct artifact filter 
- add missing JOB_NAME env
 2020-04-19 22:50:52 +02:00
Thijs Wenker
53bb62756f fix more links 2020-04-19 22:50:51 +02:00
Thijs Wenker
b89ddf33ec fix missing url 2020-04-19 22:50:51 +02:00
Thijs Wenker
25932d3ab5 the new build upload script 2020-04-19 22:50:51 +02:00
Thijs Wenker
466e1a7ce3 - disable osx GHA build for now 
- fix tbb issue, the repo moved to another location which changed the hash of the source
 2020-04-19 22:50:50 +02:00
Thijs Wenker
ba7f740625 try fix osx vcpkg build 2020-04-19 22:50:50 +02:00
Thijs Wenker
0c8359816c - make vcpkg output smaller by removing downloads and packages folders 
- only build the full version of the clients for now (server+client)
- disable using a predefined vcpkg for CI builds for now.
-
 2020-04-19 22:50:50 +02:00
Thijs Wenker
3ea3330bea enable tbb for osx 2020-04-19 22:50:49 +02:00
Thijs Wenker
98e79fd698 update zlib port 2020-04-19 22:50:49 +02:00
Thijs Wenker
48ee437c00 cmake -D VCPKG_BUILD_TYPE could be set to either release debug or release in order to build vcpkg in a specific build type, otherwise it will build with debug and release 2020-04-19 22:50:49 +02:00
Thijs Wenker
997eb14ddc release mode proof portfiles 2020-04-19 22:50:48 +02:00
David Rowe
8c475d3e02 Add icon file as published in Community Apps repo 2020-04-20 08:45:59 +12:00
Thijs Wenker
4a8476dd0b
Merge pull request #285 from ctrlaltdavid/merge-hifi-master 
Merge HiFi master
 2020-04-19 22:38:29 +02:00
HifiExperiments
6b3b475a10 Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-16 16:59:24 -07:00
HifiExperiments
420af95131 models support flipped normals on double sided geometry 2020-04-16 16:18:39 -07:00
Kasen IO
84e5a27b32 Add community-apps repo to default QML whitelist. 2020-04-15 21:14:32 -04:00
Heather Anderson
0d514ed74d Merge branch 'fix/vs2019_v16_5_1' into pr/logging 2020-04-15 00:17:56 -07:00
HifiExperiments
b6db0e1348 Merge remote-tracking branch 'upstream/kasen/core' into parenting2 2020-04-13 15:39:20 -07:00
Fluffy Jenkins
f852003a46 Merge branch 'kasen/core' of https://github.com/kasenvr/hifi-community into feature/chat 2020-04-13 22:39:50 +01:00
Kasen IO
35da6721ea Do not cache newly installed scripts in the more app. 2020-04-13 00:24:35 -04:00
David Rowe
88ee66abad Further work-arounds for "?" in URLs 2020-04-13 11:02:50 +12:00