Commit graph

82943 commits

Author SHA1 Message Date
David Rowe
42036b2746 Merge branch 'master' into feature/openvr-update 2020-05-09 07:25:40 +12:00
daleglass
affcc6f918
Merge pull request #300 from thoys/feature/gha_vircadia
GitHub Actions (with artifact uploading)
2020-05-08 17:17:45 +02:00
kasenvr
69eb3e11f5
Merge pull request #339 from ctrlaltdavid/fix/tabs-css
Fix whitespace and line endings in tabs.css
2020-05-07 23:24:54 -04:00
David Rowe
c6774016b5 Further fixes 2020-05-08 15:12:09 +12:00
David Rowe
395f950cb3 Fix whitespace and line endings in tabs.css 2020-05-08 14:59:01 +12:00
David Rowe
5e08b96655
Merge pull request #338 from kasenvr/fix/packet-version-size
Bump packet version size up.
2020-05-08 14:34:23 +12:00
Kasen IO
430d748b29 Bump packet version size up. 2020-05-07 21:33:20 -04:00
Thijs Wenker
b9d4791af2
fix CR style error 2020-05-08 00:55:43 +02:00
kasenvr
c6f47eca23
Merge pull request #78 from HifiExperiments/zoneOcclusion
Zone occlusion
2020-05-07 16:30:28 -04:00
HifiExperiments
91e177f68b add spaces after fors 2020-05-07 13:23:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
kasenvr
fa6d40f81c
Merge pull request #193 from AleziaKurdis/kasen/core
Create app: Properties editor: tabs
2020-05-07 15:46:45 -04:00
Thijs Wenker
8a76753135 Merge branch 'master' of https://github.com/kasenvr/project-athena into feature/gha_vircadia 2020-05-07 11:07:28 +02:00
David Rowe
be8d97cbf7 Use new audio setting API values 2020-05-07 16:05:49 +12:00
David Rowe
f83ea58a10 Fix erroneous hard-coded audio setting string 2020-05-07 15:42:30 +12:00
Alezia Kurdis
5180c9b247
Minor Code Adjustment 2020-05-06 23:36:39 -04:00
Alezia Kurdis
f43b0f52f5
Minor code adjustments
Add missing space between ":" and the value for many class attributes.
2020-05-06 23:16:56 -04:00
Alezia Kurdis
cc308c11b6
Minor Code Adjustment
Line 50: removed extra space char.
2020-05-06 23:06:33 -04:00
Thijs Wenker
748439f055 add retry command for packaging, since linux screenshare has about a 50% chance to fail a build 2020-05-06 23:20:21 +02:00
kasenvr
0e914c6bbc
Merge pull request #334 from jug007/master
Change standard snapshot name to vircadia
2020-05-06 16:15:39 -04:00
MotoFufu9k
a710142871
Change "FILENAME_PATH_FORMAT" to "vircadia..." 2020-05-05 00:39:25 +02:00
MotoFufu9k
0d02f62ad5
Change all mentions of "hifi-snap-by-" to "vircadia-snap-by-" 2020-05-05 00:37:41 +02:00
Thijs Wenker
488cea43cd disk usage github actions, for debugging linux build issue 2020-05-04 11:28:35 +02:00
David Rowe
da2aefb6b2 There are no longer so-called "high quality" overlays 2020-05-04 21:04:17 +12:00
David Rowe
5c7e6446d0 Update to build using latest OpenVR SDK package 2020-05-04 21:03:13 +12:00
Alezia Kurdis
1671887602
Merge branch 'master' into kasen/core 2020-04-29 12:02:12 -04:00
Alezia Kurdis
962d4671eb
To avoid a regression at some point 2020-04-27 22:49:42 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression 2020-04-27 22:20:19 -04:00
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
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
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
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
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
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