Alezia Kurdis
c96591367b
Fix the wrong merge
2020-05-08 23:41:52 -04:00
Alezia Kurdis
74f7b324b8
Reconvert EOL to Unix style.
...
Reconvert EOL to Unix style.
2020-05-08 23:36:05 -04:00
kasenvr
ac38455d13
Merge pull request #215 from AleziaKurdis/feature/shape-alpha
...
Feature/shape alpha
2020-05-08 16:32:05 -04:00
David Rowe
42036b2746
Merge branch 'master' into feature/openvr-update
2020-05-09 07:25:40 +12:00
Alezia Kurdis
637352052b
Merge branch 'master' into feature/renderWithZones-Create-UI
2020-05-08 15:20:31 -04:00
Alezia Kurdis
096bc40aa3
Merge the "screenshare" modifs
...
Merge the "screenshare" modifs with renderWithZones update
2020-05-08 15:16:38 -04: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
Alezia Kurdis
309f330af8
Merge branch 'master' into feature/shape-alpha
2020-05-07 22:59:59 -04:00
David Rowe
395f950cb3
Fix whitespace and line endings in tabs.css
2020-05-08 14:59:01 +12:00
Alezia Kurdis
95562f7e23
Merged of "screenshare" and requested changes.
...
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611
2- Include merge for conflict (not detected by Github) for "screenshare" attribute
2020-05-07 22:46:35 -04:00
Alezia Kurdis
67578a361e
Merged of "screenshare" and requested changes.
...
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611
2- Include merge for conflict (not detected by Github) for "screenshare" attribute
3- Include tooltip for "renderWithZones" attribute (to avoid another rework on this file for PR#274) This includes some additional tooltip update done after PR215 for PR274 (no impact on functional)
2020-05-07 22:44:35 -04: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
HifiExperiments
405d557725
Merge branch 'master' into blendshapes
2020-05-07 13:38:59 -07:00
kasenvr
c6f47eca23
Merge pull request #78 from HifiExperiments/zoneOcclusion
...
Zone occlusion
2020-05-07 16:30:28 -04:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes
2020-05-07 13:27:22 -07: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
Heather Anderson
aad54a0580
renaming more of the annotations to be in a form Sentry is more likely to understand
2020-05-06 22:15:04 -07: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
91d234589e
Minor Code Adjustment
...
Minor Code Adjustment
and uncommented the new property renderWithZones
2020-05-06 23:39:11 -04:00
Alezia Kurdis
a94ed7f6c1
Minor Code Adjustments
...
Minor Code Adjustments
2020-05-06 23:37:36 -04: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
kasenvr
84d80582d2
Merge pull request #257 from odysseus654/pr/logging
...
Separate user activity logging from crash logging
2020-05-06 14:20:50 -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
8c1d80d495
To really avoid a regression
2020-04-27 22:48:47 -04:00
Alezia Kurdis
c42734cba8
adding screenshare with the real file
2020-04-27 22:47:49 -04:00
Alezia Kurdis
75747a6a2f
to avoid regression
2020-04-27 22:20:19 -04:00
Alezia Kurdis
cc6fc40b0e
to avoid regression.
2020-04-27 22:19:04 -04:00
Alezia Kurdis
e850e6fe22
Adding field screenshare
...
Adding field screenshare
to avoid conflict
2020-04-27 22:05:24 -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
