Commit graph

83212 commits

Author SHA1 Message Date
kasenvr
69b407f001
Update BUILD.md
I removed a build variable that does not exist and added one that does after doing a codebase search.
2020-06-27 20:26:35 -04:00
kasenvr
7af73db252
Merge pull request #482 from kasenvr/v2020.2.2-rc
v2020.2.2-rc -> master
2020-06-25 17:30:14 -04:00
kasenvr
4480d3e7bf
Merge pull request #478 from kasenvr/fix/unused-track-script
Remove script that no longer exists created by the Vive Pro Eye PR.
2020-06-25 17:27:46 -04:00
Kasen IO
fc418fa9e4 Remove script that no longer exists created by the Vive Pro Eye PR. 2020-06-23 15:57:15 -04:00
kasenvr
f6ee158731
Merge pull request #475 from kasenvr/v2020.2.2-rc
Merge v2020.2.2-rc into master
2020-06-23 02:35:31 -04:00
kasenvr
227e8a1ec6
Merge pull request #473 from ctrlaltdavid/fix-login-indents
Fix code indentation
2020-06-22 05:27:15 -04:00
David Rowe
147bea6ba9 Fix indentation 2020-06-22 21:12:46 +12:00
kasenvr
840d465064
Merge pull request #471 from JulianGro/login-screen
Update login screen dismissal
2020-06-22 00:34:09 -04:00
Julian Groß
5b0855fa6e
Fix indentation 2020-06-22 06:18:05 +02:00
Julian Groß
3fe1dddee2
Replace tabs with spaces 2020-06-22 04:19:10 +02:00
Julian Groß
ef5d6bfc2f
Remove unnessesary copyright 2020-06-22 04:11:34 +02:00
Julian Groß
34887ec604
Remove unnessesary whitespaces 2020-06-22 04:10:21 +02:00
motofckr9k
56362461fc Fix "or" not dissappearing in popup window 2020-06-21 05:51:37 +02:00
motofckr9k
7b34872b81 Replace domain-server favicon 2020-06-21 03:59:33 +02:00
motofckr9k
75f6246ac9 Move them even closer 2020-06-21 03:16:19 +02:00
motofckr9k
41563b14a8 Move signUpContainer closer to loginContainer 2020-06-21 03:05:54 +02:00
motofckr9k
3da755fb95 Change button text, and move it to answer "Don't have an account?" 2020-06-21 02:53:05 +02:00
motofckr9k
e8a3009b96 Remove color from dismissButton 2020-06-21 01:51:05 +02:00
motofckr9k
bf230a415a Initial commit 2020-06-21 01:51:04 +02:00
kasenvr
4cc31fc427
Merge pull request #442 from kasenvr/fix/fix-model-scale-create-app
Fix models not scaling correctly when loading due to timeout.
2020-06-20 17:09:09 -04:00
kasenvr
32ef399302
Merge pull request #447 from ctrlaltdavid/fix/reloading-serverless
Fix reloading content in serverless domain
2020-06-18 17:29:31 -04:00
kasenvr
c7bcb03132
Merge pull request #438 from kasenvr/fix/prevent-cert-auto-remove
Disable Certified Entity Auto Deletion
2020-06-18 17:25:43 -04:00
kasenvr
63e3c001c3
Merge pull request #411 from Misterblue/fix/central-metaverse-urls
Move metaverse server URL info into central files for easier updating
2020-06-18 17:23:05 -04:00
kasenvr
2ecbf49176
Merge pull request #399 from HifiExperiments/controller
Fix various crashes/issues in controller scripting API
2020-06-18 17:21:43 -04:00
kasenvr
13451bd275
Merge pull request #384 from JulianGro/rebrand
Rebranding stuff
2020-06-18 17:12:47 -04:00
kasenvr
d79e5d4a35
Merge pull request #377 from daleglass/fix_linux_audio_warning
Fix Linux default audio device debug messages
2020-06-18 17:11:21 -04:00
kasenvr
a4c4e76274
Merge pull request #350 from ctrlaltdavid/feature/vive-pro-eye-tracking
Vive PRO Eye support
2020-06-18 17:10:37 -04:00
kasenvr
953ade0e98
Merge pull request #280 from daleglass/prometheus_exporter
Add Prometheus exporter
2020-06-18 17:08:39 -04:00
Julian Groß
18318fdf71
Merge branch 'v2020.2.2-rc' into rebrand 2020-06-18 09:16:47 +02:00
motofckr9k
256b466e84 Add vircadia-banner.svg for login dialogs 2020-06-18 09:12:01 +02:00
Kasen IO
3e585267e4 Fix gizmo size issue post auto-resize of a new model. 2020-06-18 01:11:07 -04:00
David Rowe
189f6f5440 Code review 2020-06-15 08:04:51 +12:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12:00
kasenvr
f68810f766
Merge pull request #448 from kasenvr/v2020.2.1-rc
Merge 2020.2.1 into master
2020-06-13 16:28:25 -04:00
kasenvr
dbd06b1cfb
Merge pull request #444 from kasenvr/fix/ual-checkbox-default
Fix/ual checkbox default
2020-06-13 16:27:57 -04:00
Robert Adams
ef056ecfbd Add another missing #include <stdexcept> for building under Windows. 2020-06-13 13:07:06 -07:00
Robert Adams
ad1825c2fb Add "include <stdexcept>" so Storage.h builds under Windows.
This was accidentially removed because of interaction of several PRs.
2020-06-13 11:47:21 -07:00
Robert Adams
e8c245ca27 Merge branch 'fix/central-metaverse-urls' of github.com:Misterblue/project-athena into fix/central-metaverse-urls 2020-06-13 07:06:59 -07:00
Robert Adams
5ad1b5cf5a Move metaverse server URL update: revert nearly all changes to
Javascript scripts because the 'require' of the central
    definition file was not included.
2020-06-13 07:04:58 -07:00
Robert Adams
245b9b8036 Move metaverse server URL update: remove unnecessary spaces.
Remove added "include <stdexcept>" (for VS compiling) to separate PR.
2020-06-13 07:04:58 -07:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
2020-06-13 07:04:58 -07:00
kasenvr
8b45d6b529
Merge pull request #445 from kasenvr/fix/readme-updates
Update README.md
2020-06-12 20:15:39 -04:00
David Rowe
2bc3047db1 Fix reloading content in serverless domain 2020-06-13 11:03:19 +12:00
kasenvr
099646cd66
Update README.md 2020-06-12 17:03:51 -04:00
kasenvr
54c0223808
Update README.md 2020-06-11 21:16:16 -04:00
Kasen IO
1575611082 Set UAL to disabled by default in the setting checkbox. 2020-06-11 20:14:14 -04:00
kasenvr
e19267e191
Merge pull request #440 from daleglass/disable-crash-logger-by-default
Disable crash logger by default
2020-06-11 17:29:26 -04:00
kasenvr
2ae304864e
Merge pull request #439 from kasenvr/fix/remove-goto
Remove old goto, update Explore app.
2020-06-11 17:24:48 -04:00
kasenvr
d52a21c515
Merge pull request #437 from kasenvr/fix/overlay-login-branding
Update login overlay to Vircadia.
2020-06-11 17:17:49 -04:00
kasenvr
a5bbd08f8e
Merge pull request #432 from ctrlaltdavid/feature/reduce-inspect-distance
Reduce minimum inspect distance
2020-06-11 17:17:04 -04:00