Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:04:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87493 commits 70 branches 56 tags 1.2 GiB
Commit graph

7056 commits

Author SHA1 Message Date
Alezia Kurdis
d758682d50
Delete tutorialqrc.json 2022-02-23 22:50:59 -05:00
Alezia Kurdis
f6b196318f
New serverless tutorial for Overte 
New serverless tutorial for Overte
 2022-02-23 22:49:35 -05:00
ksuprynowicz
96932a6946 Update metaverse server URL 2022-02-21 23:17:33 +01:00
Alezia Kurdis
ceb5456ccd
Logo ratio adjustment 
Logo ratio adjustment
 2022-02-12 13:30:31 -05:00
ksuprynowicz
bd457ccc79 Revert "Adjustment for Logo ratio" 
This reverts commit 2400bc96ea.
 2022-02-12 19:19:27 +01:00
Alezia Kurdis
2400bc96ea
Adjustment for Logo ratio 
Adjustment for Logo ratio
 2022-02-12 13:07:22 -05:00
ksuprynowicz
c6f1e6410e Updated some URLs, rebranded documentation and changed default metaverse server address 2022-02-09 23:57:24 +01:00
Alezia Kurdis
ae3f24172b
Delete VircadiaLogo.fbx 
Replaced by:
logo_overte.fbx
logo_overte_white-color-emissive.fst
 2022-02-06 12:57:05 -05:00
Alezia Kurdis
9b1958e00a
Replaced by brand-logo.svg 
Replaced by brand-logo.svg
 2022-02-06 12:53:26 -05:00
Alezia Kurdis
990b4f28bb
Replace by brand-banner.svg 2022-02-06 12:52:50 -05:00
Alezia Kurdis
f97b1dfe87
Ressources rebranding for Overte 
Ressources rebranding for Overte
(mostly images, icon, model updated with Overte brand)
some file has been edited to replace some files (they had vircadia in the name)
Most of this has not been tested. (cause I don't build)
 2022-02-06 12:51:05 -05:00
ksuprynowicz
dc29dc4998 Clear password on metaverse server change 2022-01-28 18:55:58 +01:00
ksuprynowicz
000166beef Update Metaverse server URL on focus change 2022-01-22 19:30:03 +01:00
ksuprynowicz
30806ce346 Inform AccountManager about metaverse server change 2022-01-22 18:41:04 +01:00
Frost
d2f878000e Tell the AccountManager that the auth URL changed 2022-01-06 11:23:04 -08:00
Frost
3d0c5e26b7 Fix some anchors and add logging 2022-01-06 11:22:50 -08:00
Frost
b5258ead80 Fix height, tabbing, and other stuff 2022-01-06 11:22:50 -08:00
Frost
5a09064f50 Add metaverse server field on the login screen 2022-01-06 11:22:50 -08:00
Dale Glass
d4a832a0c1
Merge pull request #1473 from Penguin-Guru/AudioOutputTest 
Remove second argument from some playSystemSound() calls in QML.
 2021-12-11 20:58:54 +01:00
Dale Glass
93e5f48951
Merge pull request #1423 from Penguin-Guru/RenderingEffects 
Separate rendering effect settings.
 2021-12-11 20:51:34 +01:00
Penguin-Guru
78981307e6 This seems like the last one. Untested. 2021-11-24 18:13:06 -08:00
Penguin-Guru
65dcd58371 This seems fine? 2021-11-24 08:51:43 -08:00
Dale Glass
35a420d312
Merge pull request #1422 from Penguin-Guru/master 
Changed preset framerates; Add "low power" preset.
 2021-11-06 19:30:01 +01:00
Penguin-Guru
56bc962d36 Changed preset framerates. Added preset. 2021-10-30 12:57:00 -07:00
Penguin-Guru
e6a41e85b2 Added comments. Referenced all enums explicitly. 2021-10-25 13:40:36 -07:00
Penguin-Guru
66fdfa40ad Hopefully implemented antialiasing setting. 2021-10-24 15:32:51 -07:00
Penguin-Guru
ca4a817d09 Added other effect checkboxes for consistency. 2021-10-24 11:31:15 -07:00
Penguin-Guru
d9d8d951ec Fixed irony. 2021-10-23 17:29:57 -07:00
Penguin-Guru
803cfd9bdc Separated shadow rendering setting. Replaced drop-down with radio. 2021-10-23 17:16:48 -07:00
Kalila L
d26e035764 Update copyright headers. 2021-06-21 12:06:52 -04:00
Kalila L
90aaa85089 Update user docs links "docs.vircadia.dev" -> "docs.vircadia.com". 2021-06-21 12:01:37 -04:00
Kalila
3629427cff
Merge pull request #1161 from ctrlaltdavid/fix/spinbox 
Fix settings (QML) spin box stepping
 2021-04-26 03:39:56 -04:00
Kalila
0150c46836
Merge pull request #1142 from SilverfishVR/serverlessV3 
Load serverless tutorial from local disk
 2021-04-15 19:10:52 -04:00
David Rowe
8b2aa93198 Fix step size in combined slider/spinner QML control 2021-04-05 12:14:52 +12:00
SilverfishVR
8434e4ea19 url's fixed 2021-04-05 01:18:14 +02:00
David Rowe
7088fc9d6c Merge branch 'master' into fix/spinbox 2021-04-05 10:41:31 +12:00
Kalila
8c92910861
Update interface/resources/qml/hifi/Pal.qml 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-04-03 22:49:56 -04:00
Kalila L
d00711fa7a Update Pal.qml 
Fix Pal ban buttons overlapping with width (maybe...) and add descriptions for new ban button.
 2021-04-03 21:08:07 -04:00
SilverfishVR
005dac9cd6 Load serverless tutorial from local disk 
fixes https://github.com/vircadia/vircadia/issues/1015

also:
* new mirror and controls poster model.
* moved controls poster so it would not be obscured by the wizzard.
* updated landing point.
* ambient music volume raised a bit, we may want to have a in-worrld toggle for this later https://github.com/vircadia/vircadia/issues/1016.
* turned the zone light up a bit so it is not so dark when on low graphic settings.
 2021-04-01 03:04:02 +02:00
David Rowe
c45007d038 Merge branch 'master' into fix/can-rez-attachment 
# Conflicts:
#	interface/src/Application.h
 2021-03-29 15:28:08 +13:00
Kalila
58fde3c159
Merge pull request #1090 from digisomni/feature/expand-kick-functionality 
Add improved functionality for `Users.kick` API.
 2021-03-28 21:05:59 -04:00
Kalila
6f7bfbc053
Update Pal.qml 2021-03-21 03:01:28 -04:00
Kalila L
fd592dfb06 CR. 2021-03-19 04:11:26 -04:00
Kalila L
c6c3dc66ea Add IP ban button to the "People" app. 2021-03-18 01:39:13 -04:00
David Rowe
d4c2829147 Fix program log spam after using Audio dialog 2021-03-16 21:22:19 +13:00
David Rowe
13b9a2a67b Disable wearables buttons in avatar app if don't have permissions 2021-03-09 15:24:58 +13:00
Kalila
672bceee1c
Merge pull request #1007 from digisomni/feature/manual-noise-reduction-gate 
Add manual mode to noise reduction + add noise reduction threshold
 2021-03-03 21:18:59 -05:00
Kalila L
bc2b345709 Merge branch 'master' into feature/manual-noise-reduction-gate 2021-03-03 02:47:34 -05:00
Kalila
14292a042b
Merge pull request #999 from digisomni/feature/onboarding-config 
Add onboarding configuration wizard to tutorial serverless
 2021-02-25 20:49:22 -05:00
Kalila
9b2c6d8850
Update tutorial.json 
Fix indentation.
 2021-02-25 16:20:10 -05:00
Kalila
0a6e220c74
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2021-02-23 20:29:46 -05:00
Kalila L
01b65d134a Update tutorial.json. 2021-02-19 07:34:04 -05:00
Kalila L
731d3f9a2c Update get more avatars text, remove market place references. 2021-02-19 05:41:15 -05:00
Kalila L
88b9ebb11a Update Audio.qml 
"Noise Reduction: Manual/Automatic" -> "Manual Noise Reduction"
 2021-02-13 17:17:27 -05:00
Kalila L
799590a0fc Add input level + gate indicator. 2021-02-11 20:41:47 -05:00
Kalila L
97fdd372af Fix Noise Reduction visibility in Audio.qml 2021-02-11 06:09:28 -05:00
Kalila L
085bf8423c Update APIs and add Noise Reduction section to Audio app. 2021-02-11 05:55:08 -05:00
Kalila L
dfa9b55223 Add back removed lines and add FIXME's. 2021-02-10 16:19:53 -05:00
Kalila L
65bef5d3d4 Fix profile errors in QML. (also add FIXME's) 2021-02-10 06:52:29 -05:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
Kalila
69e5d1261b
Merge pull request #996 from digisomni/fix/vircadia-branding-alpha 
Update About Dialog and remove Vircadia "Alpha" references
 2021-02-04 17:18:39 -05:00
Kalila
62b70fda4e
Merge pull request #932 from AleziaKurdis/CreateApp_DEC2020_RotateAsNextClickedSurface 
Create Application: Snap To Next Clicked Surface
 2021-02-04 17:15:32 -05:00
Kalila L
01cdb49930 Adjust spacing on about tablet dialog. 2021-02-01 21:51:18 -05:00
Phil Palmer
a2e4b81ed8 * Add more rounding in SpinBox.qml, allowing FloatPreference::step to work reliably for the spinners without needing double precision (suggestion from ctrlaltdavid: https://github.com/vircadia/vircadia/pull/930#issuecomment-765838930). 
* Change FloatPreference::step from double back to float.
 2021-02-01 20:26:18 -05:00
Kalila L
ea88d29145 CR 2021-02-01 17:34:09 -05:00
Kalila L
9ea1e7e464 Update about dialog. 2021-02-01 06:00:55 -05:00
Kalila L
cdb217e9a2 Remove requirement of admin / logged in to teleport to people in nearby users. 2021-01-30 20:05:52 -05:00
Kalila L
c57b1a92f3 CR + update user agent. 2021-01-30 02:16:53 -05:00
Kalila
cd0755d1bb
Update interface/resources/qml/Web3DSurface.qml 
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
 2021-01-29 13:35:27 -05:00
Kalila
b516b29e64
Update WebView.qml 2021-01-29 13:34:52 -05:00
Kalila
4576632b69
Update FlickableWebViewCore.qml 2021-01-29 13:31:06 -05:00
Kalila L
dac9c49175 Add QML portions of userAgent handling. (FML) 2021-01-29 06:01:43 -05:00
Alezia Kurdis
22b935ee65
Add Icon for Radius Search of the Create App 
Add Icon for Radius Search of the Create App
 2021-01-28 23:55:09 -05:00
David Rowe
da2a3f67cf Fix QML spinbox not stepping for some values 2021-01-17 11:24:28 -05:00
Phil Palmer
3b5eb2d24b Partial fix for spinner boxes not using the _step property of SpinnerPreference. 
(https://github.com/vircadia/vircadia/issues/117)
- In SpinBoxPreference.qml, SpinBox was missing "realStepSize: preference.step".
- Had to change FloatPreference::step from float to double, because there is some truncation happening somewhere.  For example, a step of 0.01f was acting like 0.00 because (0.01f < 0.01).
- Changed FloatPreference::decimals (number of decimal places) from float to uint, because it seemed to make more sense.
- Changed the 'User real-world height' spinbox to use a resolution of 1cm (for display and step) rather than 1mm.
- Remaining bug: the up & down buttons of the spinbox fail to change the value, at some values, though the mouse wheel always works.  Repro:
Settings > Controls > User real-world height
Hover the mouse over the box and and scroll the mouse wheel down until the value is at 1.15.
Click the up button a few times and observe that the number can't be increased.
Scroll the mouse wheel forward and observe that the number increases correctly.
- Todo: Change all calls to FloatPreference::setStep to pass doubles, if this change to its parameter type is kept.
 2020-12-23 22:53:43 -05:00
Kalila
633c642d4a
Merge pull request #906 from vircadia/fix/update-references 
Fix/update references
 2020-12-15 01:29:47 -05:00
Kalila
0f87e4cd86
Merge pull request #838 from ctrlaltdavid/fix/hud-recentering 
HUD overlay fixes and improvements
 2020-12-14 20:46:02 -05:00
Kalila
1634138c62
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-12-13 16:24:42 -05:00
Kalila L
5d4612e400 Update 'kasenvr' -> 'vircadia' 2020-12-10 18:56:57 -05:00
Kalila L
f5485e858c Licensing headers. 2020-12-10 18:56:04 -05:00
David Rowe
b865e9bc8c Fix laser intersection with HUD overlay dialogs 
Also fixes dialog resize outline being drawn in the wrong position
(desktop and HMD).
 2020-11-23 16:02:32 +13:00
kasenvr
9dbf41647e
Merge pull request #852 from ctrlaltdavid/feature/email-domain-login 
Enable username or e-mail for domain login
 2020-11-15 22:56:25 -05:00
kasenvr
ec36621d40
Merge pull request #847 from humbletim/modkit-example-revamp 
Example "modkit" JS Plugin renovation
 2020-11-12 00:41:40 -05: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
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
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
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
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
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
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
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -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
Kalila L
a50918b723 Merge branch 'master' into fix/URL-migrations 2020-09-23 18:56:50 -04: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
Kalila L
7b7038fae1 Bunch of URL updates later... 2020-09-21 00:54:49 -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
David Rowe
2985ac2262 Twek browser bar layout 2020-09-10 13:15:56 +12: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
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
5281f89d0d FUUUUUUUCK FINALLY 2020-09-02 11:28:43 -07: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
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
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
Kasen IO
7e5e513dc1 Update Web3DSurface.qml 2020-08-17 15:13:07 -04: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
Kasen IO
1601ea9231 Just to prove it works... needs to be done better. 2020-08-07 15:08:00 -04: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
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
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
56ba137ee3 Get OAuth2 URL from server settings 2020-07-31 20:48:27 +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
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
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
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
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
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ß
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
motofckr9k
bb91c1c89b Fix blocks 2020-07-03 10:22:06 +02:00
HifiExperiments
37ce2996c8 Merge remote-tracking branch 'upstream/master' into parenting 2020-07-01 14:56:36 -07: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
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
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
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
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07: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
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
085b9e11c5 Fix tabletAboutDialog fit for logo. 2020-06-06 20:21:17 -04:00
Kasen IO
fda40d56d4 Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
Kasen IO
01b02881dc Height, width, and centering updates. 2020-06-06 18:40:19 -04:00
Kasen IO
b74ccef418 Address CR from Thoys and David. 2020-06-06 18:35:02 -04:00