Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 18:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85079 commits 25 branches 0 tags 1.1 GiB
Commit graph

31259 commits

Author SHA1 Message Date
HifiExperiments
7bfbf3c99c Merge remote-tracking branch 'upstream/master' into update 2020-11-09 19:33:38 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
David Rowe
2cfd2c8d32 Merge branch 'master' into fix/hud-recentering 2020-11-10 09:27:05 +13:00
kasenvr
a123a2171b
Merge pull request #833 from AleziaKurdis/CreataAppOCT2020 
Create Application: Improvements October 2020
 2020-11-04 17:08:18 -05:00
David Rowe
e28b2025a9 Prompt for username or e-mail for domain login 2020-11-03 20:47:48 +13:00
kasenvr
4cb3287764
Merge pull request #842 from ctrlaltdavid/fix/hide-wallet-mention 
Hide "Secure Transactions" section in Settings > Security
 2020-10-29 20:10:32 -04:00
kasenvr
2b511d8c45
Merge pull request #613 from odysseus654/pr/registerListener 
[enhancement] transition listener registration from member string name to member string pointer
 2020-10-29 17:13:05 -04:00
humbletim
f54b1c5fed revamped modkit plugin example 2020-10-28 21:26:01 -04:00
David Rowe
d31d7f0a18 Hide "secure transactions" section in Settings > Security 2020-10-26 14:36:36 +13:00
David Rowe
cbef9d2926 Fix HUD content displaying only every second HUD recentering 2020-10-24 21:28:49 +13:00
David Rowe
9f95b101fe Enable "center UI" to be triggered on rotation 2020-10-24 16:37:38 +13:00
David Rowe
d2b15d7cba Reduce "center UI" trigger distance from 0.99m to 0.33m 2020-10-24 16:27:03 +13:00
David Rowe
436bed3a69 Increase HUD overlay radius 2020-10-24 16:00:39 +13:00
Alezia Kurdis
affad6741c
Better icons for Hierarchy 
Better icons for Hierarchy
 2020-10-21 22:44:55 -04:00
Alezia Kurdis
35210fdb32
Add Hierarchy display in List and Selection 
Add Hierarchy display in List and Selection
 2020-10-21 01:12:48 -04:00
kasenvr
d2d10d2975
Merge pull request #821 from JulianGro/apidoc 
Update decimatedTextureCount apidoc
 2020-10-17 14:31:01 -04:00
Julian Groß
41d15b6fc3 Update decimatedTextureCount apidoc 2020-10-17 12:06:31 +02:00
kasenvr
bfd45a0d53
Merge pull request #760 from AleziaKurdis/754_CreateApp_HMD_Improvments 
Create App: HMD missing functionalities
 2020-10-16 02:06:00 -04:00
kasenvr
2b3b3fb88f
Merge pull request #788 from kasenvr/fix/hifi-production-migration 
Update hifi-production links
 2020-10-15 17:17:36 -04:00
kasenvr
97c823ab4d
Merge pull request #808 from JulianGro/valve_calibration_workaround 
Workaround: Add Valve Index to calibratable devices
 2020-10-15 17:11:45 -04:00
kasenvr
908774ae53
Merge pull request #806 from daleglass/use_legacy_opengl 
Set OpenGL_GL_PREFERENCE to LEGACY
 2020-10-13 19:17:23 -04:00
Dale Glass
7b6fbe1f69 Set OpenGL_GL_PREFERENCE to LEGACY 
GLVND appears to break the entire UI on ATI video cards.

It was set to GLVND due to an understanding that this was a no-op setting, but it turns
out the documentation in OpenGL_GL_PREFERENCE is confusing, and it looks like LEGACY
is the setting that was being used after all.

An additional point of interest is that debian/rules contained OpenGL_GL_PREFERENCE=GLVND,
and this was done back in the High Fidelity days. It's uncertain whether this was correct
or not, though.
 2020-10-13 20:13:45 +02:00
Julian Groß
1a3f97bdc8 Change to Davids suggestion 2020-10-13 18:33:15 +02:00
Julian Groß
2b38c07aab Add Valve Index to calibratable devices 2020-10-13 02:50:53 +02:00
kasenvr
d12cd36eb3
Merge pull request #677 from HifiExperiments/mouse 
Add option to capture mouse
 2020-10-12 13:19:36 -04:00
Kalila L
05ad300894 CR. 2020-10-11 00:50:41 -04:00
Kalila L
36f5fd9636 Merge branch 'master' into feature/require-redownload 2020-10-11 00:15:52 -04:00
HifiExperiments
e028943645 CR 2020-10-09 13:33:48 -07:00
kasenvr
76093185b7
Merge pull request #763 from daleglass/fix-opengl-cmake-warning 
Set GL preference to GLVND
 2020-10-08 19:03:34 -04:00
Kalila L
dc554bb8c6 Update some descriptions. 2020-10-07 19:37:10 -04:00
kasenvr
b182a7b371
Merge pull request #669 from odysseus654/pr/script-logging 
add more details to messages logged in entity scripts
 2020-10-06 04:35:11 -04:00
kasenvr
ea4ae45d9e
Merge pull request #778 from ctrlaltdavid/feature/chat-open-browser 
Open chat hyperlinks in Interface browser window
 2020-10-06 04:34:48 -04:00
David Rowe
081c0672bf Fix JSDoc 2020-10-03 17:05:28 +13:00
David Rowe
cd7e1d0865 Miscellaneous tidying 2020-10-03 17:01:46 +13:00
David Rowe
64eb4d11e1 Add URL parameter to Window.openUrl() API function 2020-10-03 17:00:43 +13:00
David Rowe
7ea6452de0 Fix Interface crash when using About.openUrl() in script 2020-10-03 16:06:38 +13:00
kasenvr
ca80d79991
Merge branch 'master' into fix/update-api-docs 2020-10-02 15:33:28 -04:00
Kalila L
853c8052f4 Merge branch 'master' into pr/669 2020-10-02 15:29:51 -04:00
Alezia Kurdis
4f3f2a079e
Added Parent and Unparent icon 
Added Parent and Unparent icons:
Link (K) / Unlink (L)
 2020-09-30 00:37:59 -04:00
Alezia Kurdis
e1e09546cf
Add HMD MultiSelect icon 
Add HMD MultiSelect icon
 2020-09-28 23:07:16 -04:00
Kalila L
71f8d37754 Update tutorial JSON. 2020-09-28 04:28:36 -04:00
Dale Glass
1c44bc96d9 Set GL preference to GLVND 
This should be a no-op, besides generating less build warnings,
since:

"CMake 3.11 and above prefer to choose GLVND libraries."

And 3.11 is a few years old at this point
 2020-09-27 20:37:12 +02:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
kasenvr
faadb9e340
Merge pull request #668 from kasenvr/fix/URL-migrations 
New Metaverse PR
 2020-09-26 01:21:17 -04:00
Alezia Kurdis
4f353ec668
New fonts for pictograms 
New fonts for pictograms
since "hifi-glyphs.ttf" has no more room for new icons.

This contains icons for copy, cut, paste, duplicate, undo, redo... and a V logo.
 2020-09-26 00:38:53 -04:00
Kalila L
46875a6cf1 Update tutorial to Vircadia EU CDN. 2020-09-25 20:55:57 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings 
Fix warnings emitted by GCC
 2020-09-24 17:06:16 -04:00
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04:00
David Rowe
32b7823a73 Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource 
# Conflicts:
#	libraries/networking/src/ExternalResource.h
 2020-09-23 23:25:42 +12:00
David Rowe
1cb1c63228 Tidying 2020-09-23 23:08:02 +12:00
David Rowe
32efb2443e Don't store current CDN paths in Interface.json at present 2020-09-23 22:15:40 +12:00
David Rowe
c6ba42b7d6 Fix calculating external resource paths 2020-09-23 22:15:13 +12:00
Kalila L
24d4076079 Fix another URL. 2020-09-23 03:56:50 -04:00
Kalila L
ec15b51110 Fix typo. 2020-09-23 02:52:20 -04:00
Kalila L
0cb6261d11 Catch stragglers. 2020-09-22 20:25:19 -04:00
Kalila L
ff46a40741 Update avatarbookmarks.json and allow parsing of new 'avatarIcon' property. 2020-09-22 20:16:15 -04:00
Kalila L
154a95ac86 Update all scripts, script-archive scripts still broken. 2020-09-22 19:24:58 -04:00
David Rowe
4959ca4975 Move ExternalResource call into method 
Fixes Interface crash on Windows.
 2020-09-22 20:52:52 +12:00
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -04:00
Kalila L
0d08254a07 Some updates to URLs in C++ 2020-09-20 23:37:29 -04:00
David Rowe
8227705ed7 Fix GLB files not being able to be added from Asset Server 2020-09-21 11:59:02 +12:00
Kalila L
b1f32dd9ac Merge branch 'pr/691' into fix/URL-migrations 2020-09-20 17:58:26 -04:00
Kalila L
bc1ffa8a8d Merge branch 'master' into fix/update-api-docs 2020-09-19 23:46:13 -04:00
Dale Glass
89aa89e9d3 Review fixes (non-working) 
Trouble with:

> Script.getExternalPath(Script.ExternalPaths.Assets, "hi")

[UncaughtException evaluate] Error: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType()) in about:console:1 [Backtrace] <global>() at about:console:1
TypeError: cannot call getExternalPath(): argument 1 has unknown type `ExternalResource::Bucket' (register the type with qScriptRegisterMetaType())
 2020-09-20 01:29:32 +02:00
Dale Glass
84e01630ee Make base URLs for external resources modifiable 2020-09-20 01:29:32 +02:00
Dale Glass
e0e4ffb214 Review fixes 2020-09-20 01:29:32 +02:00
Dale Glass
cd901f9e32 Move enum into ExternalResources namespace 2020-09-20 01:29:32 +02:00
Dale Glass
26bcaa420d Better enum registration 2020-09-20 01:29:32 +02:00
Dale Glass
c65cc9570d Prototype for moving content away from hifi infrastructure 2020-09-20 01:29:32 +02:00
HifiExperiments
e4f32f1cea add camera sensitivity slider 2020-09-19 11:23:59 -07:00
Kalila L
f6ec13704b Copyright header updates. 2020-09-18 16:31:57 -04:00
Kalila L
9f3978d3d5 Update system to use a checkbox + setting instead. 2020-09-17 18:40:01 -04:00
Kalila L
bba8aecc4c Fix typo. 2020-09-17 17:15:33 -04:00
Kalila L
ed79f03755 Include metaverse URL in window title. 2020-09-16 22:59:47 -04:00
Kalila L
c03d1ec659 Merge branch 'master' into feature/domain-server-metaverse-switching 2020-09-16 22:55:03 -04:00
Kalila L
9b0ac9d75f Update endpoints to be consistent and work with the updates. 2020-09-15 21:05:00 -04:00
Kalila L
e3a6dc18af Add support for metaverse API's with paths. 2020-09-15 20:07:00 -04:00
David Rowe
d6a49439b8 Fix "Serverless" capitalization in title bar 2020-09-15 15:57:34 +12:00
kasenvr
370c2700be
Merge pull request #640 from kasenvr/feature/package-startup-interface 
Add ability to package Interface with a custom startup location (also tacks on some build docs updates)
 2020-09-12 22:17:25 -04:00
David Rowe
2985ac2262 Twek browser bar layout 2020-09-10 13:15:56 +12:00
HifiExperiments
9546cebe3c CR 2020-09-09 08:32:54 -07:00
HifiExperiments
932f5dbfb3 CR 2020-09-06 22:41:17 -07:00
David Rowe
29b96432bc Clear favicon image when page is changed 2020-09-06 21:04:13 +12:00
David Rowe
1d27c0138c Fix browsing history 2020-09-06 21:00:45 +12:00
David Rowe
7da2fa1315 Add open-in-externa-window button 2020-09-06 20:56:44 +12:00
David Rowe
9d3b763256 Add hover state to browser window buttons 2020-09-06 20:49:29 +12:00
David Rowe
fd2535ecaf Fix browser window buttons and Web page favicon display 2020-09-06 20:40:07 +12:00
kasenvr
7a686d95e0
Merge pull request #671 from ctrlaltdavid/fix/gltf-blendshapes 
Fix and extend glTF blendshapes support
 2020-09-03 13:57:57 -04:00
kasenvr
bbc5044451
Merge pull request #639 from ctrlaltdavid/enhancement/domain-login-items 
Don't display domain log-in items unless relevant
 2020-09-02 18:51:14 -04:00
kasenvr
e2c5504be4
Merge pull request #441 from odysseus654/pr/cxx-crashing 
improve crashpad reporting of unhandled c++ exceptions
 2020-09-02 18:51:01 -04:00
kasenvr
c7fbddf024
Merge pull request #631 from vegaslon/bug/TestFixAvatarApp 
Test moving to qt image error handling in avatar app
 2020-09-02 18:50:31 -04:00
kasenvr
9004fb8060
Merge pull request #624 from ctrlaltdavid/feature/vircadia-about 
Add "About" JavaScript API and platform string
 2020-09-02 18:50:09 -04:00
HifiExperiments
1403f8908f don't capture mouse when other windows or menus are active 2020-09-02 11:58:22 -07:00
HifiExperiments
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07:00
Kalila L
b8181d92a5 Merge branch 'master' into pr/441 2020-09-01 17:42:35 -04:00
kasenvr
60e6d99aff
Merge branch 'master' into feature/package-startup-interface 2020-09-01 17:40:37 -04:00
Kalila L
4096d75bb4 Add checkbox for showing extra source logs. 2020-09-01 16:46:22 -04:00
kasenvr
f2cc30d6d9
Merge pull request #276 from HifiExperiments/parenting 
Improving performance of entity updates
 2020-09-01 04:34:51 -04:00
HifiExperiments
776b1071a0 try to do it without QCursor::setPos 2020-08-31 15:44:06 -07:00
Kalila L
58c1518d0b Updating some .cpp and .h URLs. 2020-08-31 01:00:05 -04:00
David Rowe
77dbe7a254 Rename FACESHIFT_BLENDSHAPES to BLENDSHAPE_NAMES 2020-08-29 11:21:56 +12:00
Dale Glass
a8ab9307d0 Add fall-through comments to fix GCC warnings 
Unfortunately the attribute can't be used since we're not on C++17 yet.
 2020-08-27 19:27:11 +02:00
kasenvr
2ac6cbd808
Update interface/resources/qml/+webengine/BrowserWebView.qml 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-26 13:49:34 -04:00
Kalila L
26d4eb8e67 Updates per CR. 
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
 2020-08-24 18:43:03 -04:00
Kalila L
feac9683c4 Remove unneeded if checks for INITIAL_STARTUP_LOCATION assignment. 2020-08-23 01:52:53 -04:00
Kalila L
a2bd06993f Add option to build an Interface to go to specified address by default. 2020-08-23 01:49:32 -04:00
David Rowe
67100b5a20 Display domain login menu item only on domains that have domain login 2020-08-23 15:56:27 +12:00
Vegaslon
c6fbe08a8f Test moving to qt image error handling instead of creating own in attempt to fix avatar app slow down. 2020-08-20 08:59:57 -04:00
Kasen IO
0e609b6777 Fixed web entities useBackground on reload. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-08-18 18:49:28 -04:00
Kasen IO
b05cb8b6ac useBackground property added. 2020-08-18 01:48:27 -04:00
David Rowe
bf60cf5b4c Tidying 2020-08-18 16:33:47 +12:00
David Rowe
9bb5add1ca Don't display domain login status in title bar unless relevant 2020-08-18 11:42:35 +12:00
Kasen IO
7e5e513dc1 Update Web3DSurface.qml 2020-08-17 15:13:07 -04:00
Kasen IO
ca97450464 Centralizing some more networking constants. 2020-08-17 02:44:26 -04:00
David Rowe
66cdefa4b3 Add a new "About.platform" property 2020-08-17 11:47:56 +12:00
David Rowe
70fd954ef4 Replace the "HifiAbout" API with a new "About" API 2020-08-17 11:34:58 +12:00
Kasen IO
4336291635 Fix bool. 2020-08-15 01:33:18 -04:00
Kasen IO
2590dfbaa7 Remove unused tests for backgroundColor. 2020-08-15 00:57:10 -04:00
Kasen IO
cd5bdf6160 Added transparent + colored background web entity capability dynamically. 2020-08-15 00:56:19 -04:00
Heather Anderson
2e5244663e transition listener registration from member string name to member string pointer 2020-08-09 14:57:00 -07:00
Kasen IO
1601ea9231 Just to prove it works... needs to be done better. 2020-08-07 15:08:00 -04:00
Kasen IO
95e0907b90 Merge branch 'master' into oauth2-wordpress 2020-08-06 19:11:11 -04:00
David Rowe
81c402ab9c Code review 2020-08-06 21:40:36 +12:00
kasenvr
3ba78163da
Update PerformanceManager.cpp 
I got that typo for sure this time.
 2020-08-06 01:12:37 -04:00
Kasen IO
9607491ea2 Add graphics settings menu bar button. 2020-08-05 23:37:45 -04:00
Kasen IO
5ba33a521f Merge branch 'master' into oauth2-wordpress 2020-08-05 15:41:13 -04:00
David Rowe
8f0b33b54d Miscellaneous tidying 2020-08-06 00:04:22 +12:00
Kasen IO
d89cf867d2 Center error text correctly. 2020-08-05 02:41:39 -04:00
kasenvr
b948f24a56
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:26 -04:00
kasenvr
4d3ca2fdc5
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-08-05 02:31:10 -04:00
Kasen IO
658e14be25 Remove unused aliases. 2020-08-05 02:30:30 -04:00
Kasen IO
6b0fc8fd66 Titlebar now responds correctly to domain logged in state. 2020-08-05 02:18:01 -04:00
Kasen IO
c42adc9e00 Add menu items and triggers. 2020-08-05 00:14:27 -04:00
Kasen IO
2881f1147f Metaverse login display working correctly. 2020-08-05 00:09:09 -04:00
Kasen IO
d81ec3a4b8 Domain login display working correctly. 2020-08-04 23:46:39 -04:00
Kasen IO
8f55e13aa2 Disable login screen for all first-time users. 2020-08-04 23:14:40 -04:00
Kasen IO
352a3f4ab1 Fix domain vs metaverse logins slightly. 2020-08-04 21:17:57 -04:00
Kasen IO
0e8f019b8a Further things kinda working. 2020-08-04 20:00:24 -04:00
Kasen IO
ffce0a9d27 Update QML. 2020-08-04 19:12:31 -04:00
Kasen IO
09f2153057 Update login QML to display domain URL. 2020-08-04 15:48:10 -04:00
Kasen IO
f066eccba0 Merge branch 'oauth2-wordpress' into feature/oauth2-kalila 2020-08-04 14:17:48 -04:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
David Rowe
3a43283e7b Provide domain name to domain login dialog 2020-08-04 19:42:02 +12:00
Kasen IO
482922d986 First pass at making login dialog more clear. 2020-08-04 01:28:19 -04:00
David Rowe
7da91d9557 Misc. tidying 2020-08-04 09:15:05 +12:00
David Rowe
257eadc99f "Unable connect to this domain" message box after login if can't connect 2020-08-03 16:12:13 +12:00
David Rowe
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +12:00
David Rowe
6b28f3ea0d Reinstate TODOs 2020-07-31 15:20:13 +12:00
kasenvr
856e1f1ca3
Update interface/src/ui/DialogsManager.cpp 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-30 22:25:24 -04:00
kasenvr
7a25376131
Merge pull request #574 from ctrlaltdavid/fix/url-parameter 
Fix --url command line parameter to work with both "=" and " "
 2020-07-30 17:18:54 -04:00
kasenvr
180b7f1bd3
Merge pull request #547 from HifiExperiments/scaled 
Fix lag on restart with scaled avatar
 2020-07-30 17:15:50 -04:00
Kasen IO
af34536a09 Further complete the loop. 2020-07-30 00:34:02 -04:00
Kasen IO
5706a42b56 Implement further handling of Interface OAuth2 
This is preliminary, needs to be revisited in a more dynamic and clean fashion with time.
 2020-07-29 01:53:21 -04:00
David Rowe
c6af3d23c9 Fix --url command line parameter to work with both "=" and " " 2020-07-26 19:41:30 +12:00
David Rowe
ed44438387 Fix domain login dialog disappearing when teleport to domain 2020-07-25 21:46:18 +12:00
David Rowe
361ab97d83 Fix saving metaverse login 2020-07-25 20:53:23 +12:00
David Rowe
0618427d0f Wire up domain login dialog 2020-07-25 20:40:52 +12:00
David Rowe
fec0e7a8bc Merge branch 'feature/oauth2-kalila' into feature/oauth2-login-display 2020-07-25 16:53:43 +12:00
Heather Anderson
2f00c3e0bd minor review of formatting 2020-07-24 21:32:22 -07:00
David Rowe
34eb74ac00 Update copyrights 2020-07-25 16:26:57 +12:00
David Rowe
9bb913983d Stub out basics for displaying the domain login dialog 2020-07-25 15:31:17 +12:00
kasenvr
ec09f1a9d9
Merge pull request #550 from ctrlaltdavid/feature/resolution-scale-max 
Increase graphics settings' resolution scale item maximum to 2.0
 2020-07-24 01:11:29 -04:00
Kasen IO
cd9f47004b Added loginDomain stub. 2020-07-23 22:14:35 -04:00
Kasen IO
d7c0493b7a Updated login QML to handle domain logins. 2020-07-23 22:14:21 -04:00
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent 
Fix/move user agent
 2020-07-23 17:13:18 -04:00
kasenvr
ac3147fa66
Merge pull request #544 from kasenvr/fix/goto-explore 
Update the connection failure dialog 'go to' -> 'explore'
 2020-07-23 17:05:28 -04:00
kasenvr
befdaec03b
Merge pull request #524 from JulianGro/macos-rebrand 
Change strings, comments and folders to Vircadia rebrand
 2020-07-23 17:04:49 -04:00
Kasen IO
f4016bb0d5 Add API call to retrieve user agent. 2020-07-21 02:36:55 -04:00
Kasen IO
647b45323e Update user agents. 2020-07-21 02:36:38 -04:00
kasenvr
de082ce61d
Update TabletConnectionFailureDialog.qml 2020-07-18 14:26:26 -04:00
kasenvr
a973855085
Update ConnectionFailureDialog.qml 2020-07-18 14:25:50 -04:00
David Rowe
233deae44d Increase graphics settings' resolution scale item maximum to 2.0 2020-07-18 20:50:52 +12:00
HifiExperiments
cbce911e83 fix lag on restart with scaled avatar 2020-07-17 14:40:40 -07:00
Kasen IO
ddbed5e702 Update the connection failure dialog 'go to' -> 'explore' 2020-07-17 04:24:47 -04:00
HifiExperiments
ed5c84548c Merge remote-tracking branch 'upstream/master' into parenting 2020-07-16 13:33:46 -07:00
David Rowe
8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option 
# Conflicts:
#	plugins/openvr/src/ViveControllerManager.cpp
 2020-07-11 08:14:13 +12:00
HifiExperiments
c9684b8c6d Merge remote-tracking branch 'upstream/master' into parenting 2020-07-10 11:43:03 -07:00
Kasen IO
629b3c084c Update user agent to use "Vircadia" + update getUserAgent function to use the same. 2020-07-10 00:08:46 -04:00
kasenvr
ec7ad0d805
Merge pull request #526 from kasenvr/v2020.2.2-rc 
V2020.2.2 rc -> master
 2020-07-09 17:35:59 -04:00
kasenvr
d5b5bdc382
Merge pull request #505 from daleglass/increase_max_texture_size 
Increase maximum texture size to 8192
 2020-07-09 17:33:51 -04:00
kasenvr
ab95e109ca
Merge pull request #468 from JulianGro/move-audio 
Little "Audio" settings UI improvements
 2020-07-09 17:15:35 -04:00
David Rowe
6e1af6df73 Update copyright notices 2020-07-10 07:18:29 +12:00
Julian Groß
dce34b8d90 Change strings, comments and folders to Vircadia 2020-07-09 16:03:07 +02:00
Kasen IO
3ccaa46563 Update API docs URLs. 2020-07-08 14:18:32 -04:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
Julian Groß
6737068b02 Test 2020-07-07 00:28:19 +02:00
David Rowe
52389e5804 Add correct privacy policy URL 2020-07-05 11:17:56 +12:00
Dale Glass
9f25891639 Increase maximum texture size to 8192 2020-07-03 23:43:18 +02:00
Kasen IO
afc23954c5 Import entities now works on domains that you do not have rights on. 2020-07-03 16:37:02 -04:00
motofckr9k
bb91c1c89b Fix blocks 2020-07-03 10:22:06 +02:00
kasenvr
bfe08f23c7
Merge pull request #497 from kasenvr/feature/paste-entities-host-type 
Add ability to paste entities to any host type
 2020-07-02 17:29:13 -04:00
kasenvr
b7b902b755
Merge pull request #459 from ctrlaltdavid/feature/tutorial-menu-item 
Add Help > Tutorial menu item
 2020-07-02 17:10:38 -04:00
kasenvr
e1ab52d97e
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-07-02 16:52:12 -04:00
HifiExperiments
37ce2996c8 Merge remote-tracking branch 'upstream/master' into parenting 2020-07-01 14:56:36 -07:00
Kasen IO
859c78d8aa Further updates. 2020-07-01 16:05:15 -04:00
Kasen IO
5f0caf7de8 Update pasteEntities to const per suggestion. 2020-07-01 01:29:47 -04:00
Kasen IO
d881e1e3c2 Alter references per suggestion. 2020-06-30 18:24:21 -04:00
Kasen IO
d9e0605b4d Improve code per HiFiExperiments' suggestions. 2020-06-30 15:46:26 -04:00
Kasen IO
12446bdb45 Add ability to paste entities to any host type. Default "domain" 2020-06-30 15:18:51 -04:00
David Rowe
06010dbcae Fix position of recommended puck placement dialog 2020-06-27 15:54:28 +12:00
David Rowe
258fc8a2f4 Improve some text and make checkboxes square 2020-06-27 15:54:15 +12:00
David Rowe
2e9a8e2b33 Add option to enable Vive PRO Eye eye tracking 2020-06-27 15:14:21 +12:00
David Rowe
147bea6ba9 Fix indentation 2020-06-22 21:12:46 +12: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
Heather Anderson
af6d2b2e56 added timer to detect if the unhandle exception hook has been broken 
added internal documentation on the structures and functions involved
 2020-06-20 20:54:24 -07:00
motofckr9k
56362461fc Fix "or" not dissappearing in popup window 2020-06-21 05:51:37 +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
Heather Anderson
033726fc64 realizing the current logic is catching first-chance exceptions 2020-06-19 18:28:01 -07:00
Heather Anderson
b6e1c9e3af added "c++ crash" to crash menu 2020-06-19 18:26:26 -07:00
Heather Anderson
d92bb16d0c replacing the use of std::mutex with a spinlock, which we can try to lock but exit if the attempt times out. 2020-06-19 16:35:57 -07:00
Heather Anderson
9af8b6b452 documenting the magic numbers a bit better (or just giving them names) 2020-06-19 16:35:57 -07:00
Heather Anderson
7038cfdeb3 handle C++ exceptions, unpacking the internal structures to get the variable type (and any superclasses) being thrown 2020-06-19 16:35:56 -07:00
motofckr9k
878c6c68c8 Fix inputView if statement 2020-06-19 23:46:04 +02:00
motofckr9k
3aefa6ad9c Remove if statements that are not needed anymore 2020-06-19 23:37:26 +02:00
motofckr9k
0c8cc0a806 Try to remove empty space when "Test your voice" button is not visible 2020-06-19 23:32:52 +02:00
motofckr9k
845cc4454c Add Vircadia contributors line 2020-06-19 21:47:09 +02:00
motofckr9k
4a0d011b53 Shorten PushToTalk text on vr, since it didn't fit into the window 2020-06-19 21:39:53 +02:00
motofckr9k
d4f79413eb Fix seperator and move up inputLevel 2020-06-19 21:27:41 +02:00
motofckr9k
ee6de9e868 Move "Test your voice" and "Test your sound" to top of their category 2020-06-19 21:10:48 +02:00
motofckr9k
8284dd16cf Revert last commit and add spacer item to bottom. 2020-06-19 20:19:03 +02:00
motofckr9k
b0eb08c03f Try to add bottom margin 2020-06-19 19:54:49 +02:00
motofckr9k
6b8519c7ff Fix "Test your sound" 2020-06-19 19:38:03 +02:00
motofckr9k
eaf2ce89e0 Actually move it up this time 2020-06-19 19:23:51 +02:00
motofckr9k
37bded0a9b Move volume control up from bottom 2020-06-19 18:48:43 +02: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
13451bd275
Merge pull request #384 from JulianGro/rebrand 
Rebranding stuff
 2020-06-18 17:12:47 -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
David Rowe
f11091cab4 Add Help > Tutorial menu item that goest to serverless tutorial 2020-06-16 12:25:28 +12:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
David Rowe
4e57d53dde Merge branch 'master' into feature/vive-pro-eye-tracking 2020-06-14 10:51:25 +12: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
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
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
80fc2d8332
Merge pull request #426 from ctrlaltdavid/fix/wearables-text-unreadable 
Fix visibility of values in Wearables dialog
 2020-06-11 17:15:49 -04:00
Dale Glass
b681f99d21 Rename the crash reporting settings to force new default value 
Doing this ensures the new default applies to all clients, without
having to reset the configuration.
 2020-06-11 20:00:47 +02:00
Dale Glass
02eb4ccd33 Disable crash logger by default 2020-06-11 01:26:21 +02:00
motofckr9k
3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' 
Conflicts:
	BUILD_WIN.md
	CODING_STANDARD.md
	LICENSE
	cmake/installer/installer-header.bmp
	cmake/installer/installer.ico
	cmake/installer/uninstaller-header.bmp
	interface/resources/images/about-vircadia.png
	interface/resources/images/vircadia-logo.svg
	interface/resources/qml/LoginDialog.qml
	interface/resources/qml/dialogs/TabletLoginDialog.qml
	interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
	interface/src/Application.cpp
	pkg-scripts/athena-server.spec
	scripts/system/more/app-more.js
	scripts/system/more/css/styles.css
	scripts/system/more/more.html
 2020-06-10 02:49:13 +02:00
Kasen IO
a75c43e073 Update login overlay to Vircadia. 2020-06-08 23:39:23 -04:00
Kasen IO
c55f365af4 Fix tablet login dialog logo size. 2020-06-07 20:47:53 -04:00
Kasen IO
c3337f6c32 Update interface and server-console icons. 2020-06-07 20:43:38 -04:00
Kasen IO
085b9e11c5 Fix tabletAboutDialog fit for logo. 2020-06-06 20:21:17 -04:00