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 |
|
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 |
|
David Rowe
|
8494e6e6b5
|
Fix visibility of values in Wearables dialog
|
2020-06-06 15:15:03 +12:00 |
|
kasenvr
|
250ec64edf
|
Merge pull request #410 from kasenvr/fix/vircadia-packaging
Update packaging parameters for Vircadia
|
2020-06-04 16:50:29 -04:00 |
|
kasenvr
|
103fd8eef2
|
Merge branch 'master' into fix/revert-instancing-temporarily-1
|
2020-06-03 22:44:32 -04:00 |
|
kasenvr
|
d69c89583f
|
Merge pull request #394 from ctrlaltdavid/feature/enable-vr-flying
Enable flying in VR by default
|
2020-06-03 22:40:05 -04:00 |
|
Kasen IO
|
21fd10d154
|
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
|
2020-06-03 16:08:18 -04:00 |
|
Kasen IO
|
cefda3f7f2
|
Update packaging parameters for Vircadia.
|
2020-06-01 22:48:38 -04:00 |
|
kasenvr
|
4cca7f6f75
|
Merge pull request #281 from HifiExperiments/parenting2
Improve performance of MyAvatar::simulate when you have lots of descendants
|
2020-05-31 14:47:22 -04:00 |
|
kasenvr
|
8157be5b5a
|
Merge pull request #405 from kasenvr/v0.86.0-k2.1
Merge K2.1 into Master
|
2020-05-30 18:49:38 -04:00 |
|
Kasen IO
|
4f55bfe512
|
Update window title.
|
2020-05-27 18:09:01 -04:00 |
|
David Rowe
|
d451012d08
|
Enable flying in VR by default
|
2020-05-28 09:12:17 +12:00 |
|
Kasen IO
|
6c6a405020
|
Add periods and remove double copyright in tabletaboutdialog.qml
|
2020-05-25 16:41:16 -04:00 |
|
Kasen IO
|
a4bf1c4d82
|
Update copyright headers.
|
2020-05-25 15:59:43 -04:00 |
|
motofckr9k
|
d406b81b47
|
Big rebrand
|
2020-05-22 20:35:27 +02:00 |
|
Kasen IO
|
ce1a1faf79
|
Fix copyright headers + some docs.
|
2020-05-20 15:02:03 -04:00 |
|
kasenvr
|
22e9aec0dd
|
Merge pull request #296 from kasenvr/fix/qml-whitelist-default
Add community-apps repo to default QML whitelist.
|
2020-05-19 16:49:29 -04:00 |
|
kasenvr
|
7996698c8f
|
Merge branch 'master' into fix/other-renamings
|
2020-05-18 15:10:32 -04:00 |
|
Kasen IO
|
f908d5bb0a
|
Undo logo change.
|
2020-05-17 22:20:02 -04:00 |
|
|
|
e6505baf9d
|
Update help dialogs for Vircadia branding.
|
2020-05-17 15:37:58 -05:00 |
|
|
|
d19c474d65
|
Rebrand login screens for Vircadia.
|
2020-05-17 15:17:26 -05:00 |
|
|
|
ce4aa67506
|
Change Window Titles to Vircadia
Also strips trailing whitespaces from interface's Applicaction.cpp.
|
2020-05-17 14:30:36 -05:00 |
|
|
|
187a2749c3
|
Rebrand the About dialog to Vircadia.
Also removes trailing whitespace from Menu.cpp.
|
2020-05-17 14:26:45 -05:00 |
|
|
|
445ebbd861
|
Replace KasenVR icons with Vircadia icons.
|
2020-05-17 14:10:07 -05:00 |
|
kasenvr
|
8b410c662e
|
Removed unused variable.
|
2020-05-16 16:35:16 -04:00 |
|
Kasen IO
|
f4bcc82dd6
|
Corrections.
|
2020-05-16 02:27:45 -04:00 |
|
David Rowe
|
63ba8400f7
|
Merge branch 'master' into feature/vive-pro-eye-tracking
|
2020-05-16 11:23:38 +12:00 |
|
HifiExperiments
|
ebc9dae78d
|
Merge branch 'master' into parenting
|
2020-05-07 13:35:32 -07:00 |
|
HifiExperiments
|
3bf690571c
|
Merge branch 'master' into zoneOcclusion
|
2020-05-07 13:13:20 -07: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 |
|
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 |
|
David Rowe
|
5e997d7b60
|
Fix up Vircadia URLs
|
2020-04-27 20:38:23 +12:00 |
|
Seth Alves
|
7d956198cd
|
re-enable prefer finger over stylus
|
2020-04-26 12:20:05 -07: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 |
|
Heather Anderson
|
e29271d8ca
|
rename variables from "is crash enabled" to "is crash monitor enabled" (suggested by Thijs Wenker <me@thoys.nl>)
added a debug message giving the current state of the debug monitor switch (ignoring whether Crashpad support is compiled)
|
2020-04-25 20:32:38 -07:00 |
|
Heather Anderson
|
2d6d205bf2
|
The original patch was more appropriate. We need to figure out what this needs to do, enough dancing.
This reverts commit bc5dd45187.
|
2020-04-21 23:15:08 -07:00 |
|
Kasen IO
|
e85c50e712
|
Update URL.
|
2020-04-19 23:44:11 -04:00 |
|
Kasen IO
|
84e5a27b32
|
Add community-apps repo to default QML whitelist.
|
2020-04-15 21:14:32 -04:00 |
|
Heather Anderson
|
bc5dd45187
|
Update interface/src/ui/PreferencesDialog.cpp
Removed extraneous ! from value retrieval (as if there aren't enough of them in here)
|
2020-04-10 22:51:20 -07:00 |
|
Heather Anderson
|
9187a680cd
|
Apply suggestions from code review
Adding suggested changes from ctrlaltdavid
Co-Authored-By: David Rowe <david@ctrlaltstudio.com>
|
2020-04-10 17:10:41 -07:00 |
|
David Rowe
|
ffeb37e7aa
|
Merge remote-tracking branch 'hifi/master' into merge-hifi-master
# Conflicts:
# CMakeLists.txt
# README.md
# cmake/externals/glad32es/CMakeLists.txt
# cmake/externals/glad41/CMakeLists.txt
# cmake/externals/glad45/CMakeLists.txt
# cmake/externals/polyvox/CMakeLists.txt
# cmake/externals/quazip/CMakeLists.txt
# cmake/externals/vhacd/CMakeLists.txt
# cmake/init.cmake
# cmake/ports/hifi-deps/CONTROL
# cmake/ports/sdl2/CONTROL
# cmake/ports/sdl2/disable-hidapi-for-uwp.patch
# cmake/ports/sdl2/enable-winrt-cmake.patch
# cmake/ports/sdl2/fix-arm64-headers.patch
# cmake/ports/sdl2/fix-x86-windows.patch
# cmake/ports/sdl2/portfile.cmake
# cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
# cmake/ports/tbb/portfile.cmake
# hifi_vcpkg.py
# interface/src/avatar/MyAvatar.h
# libraries/avatars-renderer/src/avatars-renderer/Avatar.h
# libraries/avatars/src/AvatarData.h
# libraries/entities-renderer/src/RenderableEntityItem.h
# libraries/entities/src/EntityItem.cpp
# libraries/entities/src/EntityItem.h
# libraries/fbx/src/GLTFSerializer.cpp
# libraries/graphics-scripting/src/graphics-scripting/Forward.h
# libraries/networking/src/AddressManager.cpp
# libraries/networking/src/DomainHandler.h
# libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
# libraries/render-utils/src/HighlightEffect.cpp
# libraries/render-utils/src/MeshPartPayload.cpp
# libraries/render-utils/src/Model.cpp
# libraries/render-utils/src/RenderShadowTask.cpp
# libraries/script-engine/src/WebSocketClass.cpp
|
2020-04-09 16:46:27 +12:00 |
|
HifiExperiments
|
9b1635f9cc
|
improve performance of MyAvatar::simulate when you have lots of entity descendants
|
2020-04-07 15:56:32 -07:00 |
|
Kasen IO
|
9dce990e8f
|
Help dialog updated.
|
2020-04-07 18:48:24 -04:00 |
|
Kasen IO
|
e9297eb131
|
Correction.
|
2020-04-07 16:17:09 -04:00 |
|
Kasen IO
|
115c40bd54
|
Lots of renamings, more to come.
|
2020-04-07 04:56:02 -04:00 |
|
HifiExperiments
|
eb26d9b4e3
|
working on parenting fixes
|
2020-04-06 13:41:01 -07:00 |
|
HifiExperiments
|
6eacc5c8c2
|
Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion
|
2020-04-03 14:37:14 -07:00 |
|
Heather Anderson
|
7cea4fc574
|
separate user activity logging from crash logging, allowing people to say "no" to tracking while still sending crashes
|
2020-04-03 02:38:53 -07:00 |
|
Thijs Wenker
|
6d9f040bfd
|
Merge pull request #158 from daleglass/linux_dynamic_build
Force dynamic build on Linux
|
2020-02-22 20:36:19 +01:00 |
|
|
|
8ab06f5e0e
|
Change to Project Athena in Task Manager
|
2020-02-19 16:37:22 -06:00 |
|
kasenvr
|
cb0a080be1
|
Merge pull request #113 from ctrlaltdavid/fix/missing-scrollbars
Always display vertical scrollbar in Settings dialogs that scroll
|
2020-02-19 16:32:53 -05:00 |
|
kasenvr
|
86d18e3706
|
Merge pull request #160 from ctrlaltdavid/fix/http-serverless
Add support for serverless domains via HTTP/HTTPS
|
2020-02-19 16:24:56 -05:00 |
|
kasenvr
|
78e3d65031
|
Merge pull request #145 from vegaslon/feature/AvatarAppThumbnail
feature: Allow users to set avatar thumbnails that show in avatar app.
|
2020-02-12 08:59:23 -05:00 |
|
Vegaslon
|
c2b375862c
|
Style changes as requested
|
2020-02-11 21:50:40 -05:00 |
|
Vegaslon
|
6db15510db
|
Change name of variable and fix indention
|
2020-02-10 16:20:22 -05:00 |
|
kasenvr
|
48ae156db7
|
Merge pull request #104 from daleglass/implicit_copy_constructor
Make default copy constructors explicit
|
2020-02-08 14:45:44 -05:00 |
|
David Rowe
|
e6c54faaf2
|
Merge branch 'kasen/core' into fix/http-serverless
|
2020-02-07 11:32:38 +13:00 |
|
David Rowe
|
7c87f89712
|
Add FIXME for Clipboard.importEntities()
|
2020-02-07 11:12:54 +13:00 |
|
Dale Glass
|
39f23b52c3
|
Force dynamic build on Linux, fixes #151
|
2020-02-05 23:30:04 +01:00 |
|
David Rowe
|
4f0cc2ebd5
|
Remove dead code
|
2020-02-06 11:28:51 +13:00 |
|
David Rowe
|
ad427e31a7
|
Make --url take existing Interface to FILE, HTTP, and HTTPS serverless
|
2020-02-06 11:11:41 +13:00 |
|
Kasen IO
|
08ec9ef3b7
|
Various URL updates + window title update.
|
2020-02-05 15:25:51 -05:00 |
|
Vegaslon
|
e74fccb49d
|
Allow users to set avatar thumbnails that show in avatar app.
|
2020-02-01 08:54:06 -05:00 |
|
David Rowe
|
46173439ed
|
Enable serverless domains via HTTP and HTTPS
|
2020-02-01 12:46:28 +13:00 |
|
Kasen IO
|
428a5b65ff
|
Lint
|
2020-01-27 13:13:36 -05:00 |
|
kasenvr
|
fc73f76ab7
|
Update interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
Co-Authored-By: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
|
2020-01-25 19:02:01 -05:00 |
|
Kasen IO
|
aa0c225809
|
Merge branch 'kasen/core' into fix/whitelist-qml-adds
|
2020-01-24 19:55:23 -05:00 |
|
David Rowe
|
7ed117dfcb
|
Replace links to docs.highfidelity.com
|
2020-01-24 10:18:55 +13:00 |
|
Kasen IO
|
1979a4bd94
|
Further housekeeping. :)
|
2020-01-23 03:15:18 -05:00 |
|
Kasen IO
|
c121a8ef2a
|
Housekeeping.
|
2020-01-23 03:06:58 -05:00 |
|
David Rowe
|
cfde36c9f5
|
Fix up scrollbars and separators
|
2020-01-23 11:25:48 +13:00 |
|
Kasen IO
|
fbaf0ea56b
|
Remove debugging cache clearer.
|
2020-01-22 15:08:26 -05:00 |
|
Kasen IO
|
7a985b445e
|
removed extra debug, added debug for user awareness.
|
2020-01-22 14:53:55 -05:00 |
|
Kasen IO
|
98473abbb4
|
QML works, C++ works but does a manual set to true, does not see updates from QML set setting.
|
2020-01-22 11:29:37 -05:00 |
|
David Rowe
|
6c81f597af
|
Display vertical scrollbar in Settings dialogs that scroll
|
2020-01-22 20:55:50 +13:00 |
|
Kasen IO
|
bd066adbf6
|
Whitelist toggle not working c++ side.
|
2020-01-20 16:03:48 -05:00 |
|
David Rowe
|
0666c3bbb1
|
Document that MyAvatar goto methods have safe landing
|
2020-01-20 21:31:50 +13:00 |
|
David Rowe
|
b816d7053a
|
Update models used in JSDoc examples
|
2020-01-20 21:07:33 +13:00 |
|
David Rowe
|
eae3336f57
|
Fix up docs links
|
2020-01-20 15:06:32 +13:00 |
|
David Rowe
|
1a4266a64a
|
Review JSDoc updates from recent commits
|
2020-01-20 14:33:06 +13:00 |
|
Dale Glass
|
68d10a2fe1
|
Make default copy constructors explicit
Recent versions of gcc generate a warning without this
|
2020-01-19 00:20:49 +01:00 |
|
|
|
f5fcb90cac
|
Revert "Removed obsolete default scripts + more branding changes."
|
2020-01-16 18:51:49 -06:00 |
|
NexPro
|
9af7c39513
|
Updated broken urls
|
2020-01-15 23:08:27 +00:00 |
|
NexPro
|
e15c135dc5
|
Merge remote-tracking branch 'remotes/origin/kasen/core' into kasen/core
|
2020-01-15 18:34:09 +00:00 |
|
|
|
e5dd23b922
|
Merge pull request #33 from kasenvr/feature/metaverse-url-switching
Ability to change Metaverse API from setting
|
2020-01-14 18:40:04 -06:00 |
|
|
|
653b333060
|
Merge pull request #85 from kasenvr/fix/obsolete-apps
Removed obsolete default scripts + more branding changes.
|
2020-01-14 12:33:30 -06:00 |
|
David Rowe
|
ec1e6bc7d3
|
Merge branch 'DOC-55-C' into api-docs
|
2020-01-14 18:04:32 +13:00 |
|
NexPro
|
203c371a01
|
Re-branding of help dialogs and tablet login
|
2020-01-14 00:33:29 +00:00 |
|
kasenvr
|
1133f51971
|
Merge pull request #70 from Nex-Pro/kasen/core
Rebranding of login dialogs etc. QML
|
2020-01-13 09:42:09 -05:00 |
|
Kasen IO
|
336b5e275b
|
Removed obsolete default scripts + more branding changes.
|
2020-01-12 23:13:01 -05:00 |
|
|
|
96dc01fcc6
|
Made requested changes to About dialog.
Removed dash from "open source"
Fixed missing and unecessary periods.
|
2020-01-12 12:47:17 -06:00 |
|
HifiExperiments
|
bc640b0f9f
|
Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion
|
2020-01-11 22:29:38 -08:00 |
|
HifiExperiments
|
bc319cb340
|
zone occlusion
|
2020-01-11 22:29:07 -08:00 |
|
|
|
074e9f711a
|
Update Help menu links for Project Athena.
Changes links in the help menu to point to Project Athena sites. Removed menu option for Online Forums, cuz I don't think we have one yet.
|
2020-01-10 16:20:00 -06:00 |
|
|
|
00855cba3d
|
Redo the About menu dialog
Change project name, remove references to EOS blockchain, add Project Athena copyright, add attribution to Opus.
|
2020-01-10 16:09:20 -06:00 |
|
NexPro
|
80e4e47cd8
|
updated TOS link. Changed incorrect filename in comment.
|
2020-01-09 10:20:28 +00:00 |
|
NexPro
|
769d2050c7
|
Additional re-branding of QML dialogs
|
2020-01-08 17:41:58 +00:00 |
|
NexPro
|
3944d6e47c
|
added banner svg
|
2020-01-08 16:24:49 +00:00 |
|
NexPro
|
2a8b92e683
|
Updated interface login page
|
2020-01-08 16:21:25 +00:00 |
|
kasenvr
|
19bca588ca
|
Merge pull request #58 from ctrlaltdavid/fix/avatar-packager-update
Update Avatar Packager
|
2020-01-07 22:43:34 -05:00 |
|
kasenvr
|
be08a949c2
|
Merge pull request #67 from FluffyJenkins/feature/fixedClaraRubbish
Fixed clara rubbish
|
2020-01-07 21:44:23 -05:00 |
|
Fluffy Jenkins
|
e488a66840
|
changed quote types
|
2020-01-07 20:59:00 +00:00 |
|
Fluffy Jenkins
|
ead359ce67
|
Fixed clara rubbish
|
2020-01-07 05:14:38 +00:00 |
|
kasenvr
|
0bdfdfff4a
|
Merge pull request #43 from ctrlaltdavid/fix/re-enable-jsdoc
Re-enable JSDoc building
|
2020-01-06 18:37:58 -05:00 |
|
David Rowe
|
1d9aec6fec
|
Improve order of dialog contents
|
2020-01-05 18:24:56 +13:00 |
|
David Rowe
|
977d498004
|
Add an "Open Project Folder" button
|
2020-01-05 17:53:36 +13:00 |
|
David Rowe
|
30c63fc305
|
Remove "Upload" button and associated items
|
2020-01-05 17:11:23 +13:00 |
|
David Rowe
|
cd6669ec8b
|
Comment out the "Video" button
|
2020-01-05 17:00:40 +13:00 |
|
David Rowe
|
d79c87b2d4
|
Change Avatar Package docs links
|
2020-01-05 16:59:51 +13:00 |
|
David Rowe
|
934311b54a
|
Change default Avatar Packager project directory
|
2020-01-05 16:15:04 +13:00 |
|
David Rowe
|
7364ac5521
|
Fix scaled avatar walk speed
|
2020-01-04 11:43:28 +13:00 |
|
kasenvr
|
1d14bed3ce
|
Merge pull request #16 from FluffyJenkins/feature/qmlWhitelistMeow
QML Whitelisting
|
2019-12-30 19:51:51 -05:00 |
|
Kasen IO
|
0b66627eff
|
The command line no longer launches with interface.
|
2019-12-29 23:48:32 -05:00 |
|
kasenvr
|
9dc7f54bfd
|
Merge pull request #38 from kasenvr/feature/quality-of-life-k2
Feature/quality of life k2
|
2019-12-29 18:28:58 -05:00 |
|
David Rowe
|
a7d2412f11
|
Re-enable JSDoc building
|
2019-12-29 16:00:47 +13:00 |
|
Kasen IO
|
7489505f99
|
Updated whitelist info and name to include QML.
|
2019-12-26 22:27:58 -05:00 |
|
