Commit graph

24903 commits

Author SHA1 Message Date
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
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
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
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
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
David Rowe
f11091cab4 Add Help > Tutorial menu item that goest to serverless tutorial 2020-06-16 12:25:28 +12: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
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
fda40d56d4 Merge branch 'master' into feature/further-rebranding 2020-06-06 18:43:03 -04:00
Kasen IO
b74ccef418 Address CR from Thoys and David. 2020-06-06 18:35:02 -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
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
motofckr9k
d406b81b47 Big rebrand 2020-05-22 20:35:27 +02: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
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
kasenvr
8b410c662e
Removed unused variable. 2020-05-16 16:35:16 -04:00
David Rowe
63ba8400f7 Merge branch 'master' into feature/vive-pro-eye-tracking 2020-05-16 11:23:38 +12: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