vladest
3c11d29a7f
Something intermediate
2017-12-07 19:13:39 +01:00
Anthony J. Thibault
fbcecbfc89
Merge branch 'master' into feature/domain-limited-height
2017-12-07 10:01:33 -08:00
Zach Fox
21077da41a
Don't send requests to backend if cached public keys is empty
2017-12-07 09:48:06 -08:00
Sam Gondelman
99c52f8602
coding standards
2017-12-07 09:38:14 -08:00
Brad Hefta-Gaub
4f8a2ea4be
Merge pull request #11934 from ctrlaltdavid/21630
...
Fix cloned 3D overlays' dimensions
2017-12-07 09:24:01 -08:00
Brad Hefta-Gaub
a0457d2b5e
Merge pull request #11856 from AndrewMeadows/sort-and-throttle-avatars
...
Use PrioritySortUtil for avatar updates from avatar-mixer
2017-12-07 09:22:52 -08:00
Brad Hefta-Gaub
88ed15aaaa
Merge pull request #11942 from ctrlaltdavid/21633
...
Fix image overlay's subImage property's width and height support
2017-12-07 09:19:43 -08:00
Seth Alves
86f58c1353
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 08:50:50 -08:00
samcake
5f85e8e2cb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 08:48:12 -08:00
Sam Gateau
0245a7005d
Adding the query of a particular selection content
2017-12-06 22:44:58 -08:00
samcake
5500a6d11c
More to come
2017-12-06 18:02:30 -08:00
Elisa Lupin-Jimenez
1d5875c45b
removed key
2017-12-06 17:40:39 -08:00
Elisa Lupin-Jimenez
66b6be1302
fixed weird merge conflicts
2017-12-06 17:37:44 -08:00
John Conklin II
fffcf56904
Merge pull request #11892 from SamGondelman/snapshot
...
Expose Window.getDeviceSize()
2017-12-06 16:44:08 -08:00
Elisa Lupin-Jimenez
4ed689672e
can fetch poly asset list synchronously
2017-12-06 16:07:29 -08:00
David Rowe
efd72be96f
Fix image overlay's subImage property's width and height support
2017-12-07 12:05:46 +13:00
David Rowe
0146eca315
JSDoc review
2017-12-07 10:09:05 +13:00
samcake
1efddb8260
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-06 10:21:45 -08:00
Seth Alves
2dd223ebaa
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-06 09:18:40 -08:00
samcake
1483195285
almost complete setup working, yeah
2017-12-05 18:27:53 -08:00
luiscuenca
8abe8b9879
move save logic to audioclient
2017-12-05 18:22:14 -08:00
Zach Fox
3183a1a8b9
Add setupAttemptID to every step (thanks Dave)
2017-12-05 16:48:30 -08:00
David Rowe
cafebf6a7e
Fix Unix build warnings and tidy initializers
2017-12-06 13:38:42 +13:00
luiscuenca
20d6615417
emit only when recording
2017-12-05 16:13:44 -08:00
David Rowe
e074bd85f9
Fix shape of cloned shape overlay
2017-12-06 12:29:09 +13:00
David Rowe
2752dc7cac
Fix dimensions of cloned cube, sphere, shape, and model overlays
2017-12-06 12:28:55 +13:00
Zach Fox
902064ed37
Cleanup debug stuff
2017-12-05 15:26:55 -08:00
Zach Fox
c807fc80e3
Add marketplace cta referrer
2017-12-05 15:25:05 -08:00
Zach Fox
7521e4870e
Bugfixes
2017-12-05 14:56:47 -08:00
Zach Fox
668f6d50b5
Add data tracking for wallet setup
2017-12-05 14:13:48 -08:00
Zach Fox
4334bf8222
Add data tracking for purchase and rez
2017-12-05 13:09:09 -08:00
Clément Brisset
a5e671e0fd
Merge pull request #11931 from highfidelity/stable
...
stable -> master
2017-12-05 11:58:23 -08:00
Seth Alves
390c11e0a0
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-05 11:26:41 -08:00
Zach Fox
c80039ea87
Merge pull request #11929 from zfox23/commerce_fixGraySecurityImage1
...
Fix gray/incorrect security image after relog
2017-12-05 11:21:06 -08:00
Zach Fox
1507620fd5
Merge pull request #11921 from ElderOrb/FB10024
...
10024 Wallet: TextField Focus Problems
2017-12-05 10:52:08 -08:00
Zach Fox
d59c9bd73a
Fix gray/incorrect security image after relog
2017-12-05 10:27:40 -08:00
Elisa Lupin-Jimenez
d6e1a9defe
Created poly scripting interface template
2017-12-05 09:43:01 -08:00
Seth Alves
73b21f7cd5
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-05 06:55:10 -08:00
Sam Gateau
987246afb8
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-04 19:11:42 -08:00
samcake
de410b6833
I need a color editor
2017-12-04 17:29:01 -08:00
Elisa Lupin-Jimenez
7bb44f4139
Created poly scripting interface template
2017-12-04 16:46:58 -08:00
luiscuenca
d70a3685b8
Clean up
2017-12-04 15:29:13 -08:00
luiscuenca
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
NissimHadar
ec1c4c37fa
Merge pull request #11912 from ElderOrb/FB9461
...
9461 Keyboard for create appear then disappears immediately (HMD)
2017-12-04 16:49:25 -06:00
samcake
9fceaad38b
Merging with master
2017-12-04 14:20:10 -08:00
Alexander Ivash
f7328f05fb
remove keyboard-hiding logic as keyboard hides should be handled by focus change listener in 'onFocusObjectChanged' in the OffscreenQmlSurface
2017-12-05 00:51:42 +03:00
Zach Fox
4c96fc2d9d
Merge pull request #11905 from zfox23/commerce_resetWalletBeforeCreation
...
Call reset() on Wallet before creating new wallet
2017-12-04 13:05:36 -08:00
Alexander Ivash
8a5904373b
remove 'collapse keyboard' hack as now there is dedicated 'collapse keyboard' button
2017-12-05 00:04:46 +03:00
Alexander Ivash
c67ff3b5d8
10024 Wallet: TextField Focus Problems
...
note: removed excessive MouseArea-s
2017-12-05 00:03:48 +03:00
vladest
a0878298d5
Merge branch 'master' into tablet_home_paginate
2017-12-04 20:55:38 +01:00
Brad Hefta-Gaub
33adb0d76d
Merge pull request #11868 from ctrlaltdavid/21615
...
Add "size" as synonym for "dimensions" in model overlay property setter
2017-12-03 18:10:30 -08:00
Brad Hefta-Gaub
06cf194ec7
Merge pull request #11910 from ctrlaltdavid/21626
...
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-03 18:09:17 -08:00
Alexander Ivash
d60f082796
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-03 23:24:34 +03:00
luiscuenca
4030688e7a
added record wav files
2017-12-03 11:54:37 -07:00
vladest
e1df38784b
Merge branch 'master' into tablet_home_paginate
2017-12-02 22:40:10 +01:00
Brad Hefta-Gaub
314265fa86
Merge pull request #11891 from ctrlaltdavid/21625
...
Add missing line3d overlay property getters and setters
2017-12-02 12:52:44 -08:00
Brad Hefta-Gaub
3f705a7baf
Merge pull request #11858 from vladest/fix_tablet_scrollbars
...
Use ScrollBars from QQC2, which supports mouse and touch events
2017-12-02 12:51:14 -08:00
Brad Hefta-Gaub
ec33aa9c4b
Merge pull request #11880 from ElderOrb/FB7991
...
7991 Change Instances of Edit Mode to Create Mode
2017-12-02 12:50:48 -08:00
Seth Alves
b590cd5b89
avatar-entities which are children of an avatar will scale with the avatar
2017-12-02 09:31:43 -08:00
vladest
fd9539a9e4
Using Flickable signals to remove hover state instead of timer. No more delays
2017-12-02 13:57:12 +01:00
Anthony Thibault
fe16cc3fab
Merge pull request #11902 from luiscuenca/onloadFix
...
Fixes create list and web and QML audio sync
2017-12-01 16:05:07 -08:00
Howard Stearns
e2efe062fe
Merge pull request #11893 from zfox23/commerce_sameInfoDontRefresh
...
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-12-01 13:57:34 -08:00
Zach Fox
b8f7ba9aa6
Fix month display in commerce...
2017-12-01 10:45:36 -08:00
Alexander Ivash
48b50e33dd
9461 Keyboard for create appear then disappears immediately (HMD)
2017-12-01 20:29:35 +03:00
Zach Fox
ebb2e50d01
Fix month display in commerce...
2017-12-01 09:29:19 -08:00
vladest
570be69fcf
Fix warnings after apps closed
2017-12-01 09:52:45 +01:00
David Rowe
fd76c7a88b
Fix erroneous 2D overlay unhandled property messages for bounds property
2017-12-01 17:40:34 +13:00
Zach Fox
24e5994f20
The nuclear option is a bad option.
2017-11-30 15:55:09 -08:00
Zach Fox
009d3a18a3
Call reset() on Ledger and Wallet before creating new wallet
2017-11-30 15:40:20 -08:00
vladest
f510b4bcd8
Swipe area expanded to whole tablet. Icons doesnt stick together anymore
2017-11-30 21:10:12 +01:00
Daniela Fontes
9bc165d8b4
Changing to Smaller Avatar Resizes Tablet
2017-11-30 18:49:53 +00:00
Zach Fox
b0dda3de33
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sameInfoDontRefresh
2017-11-30 10:49:20 -08:00
vladest
69264a6ea8
Merge with master. Conflicts solved
2017-11-30 15:34:21 +01:00
vladest
74c002d1f5
Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events
2017-11-30 12:52:26 +01:00
vladest
a3d406d8d1
Merge branch 'master' into fix_tablet_scrollbars
2017-11-30 11:40:50 +01:00
vladest
dfeefe53b8
Make scroll bar handle centered on shaft. Width chaned on par with entities list html view
2017-11-30 11:40:02 +01:00
luiscuenca
b890a29b3a
Clean console log
2017-11-29 19:05:01 -07:00
luiscuenca
b817143e2e
Fixes on web and QML audio sync
2017-11-29 18:16:21 -07:00
Zach Fox
39afb4ab6a
Merge pull request #11882 from howard-stearns/the-lost-ECDSA
...
The lost ecdsa
2017-11-29 15:53:52 -08:00
howard-stearns
55589312f1
new padding/initialization that matters on linux server
2017-11-29 09:53:48 -08:00
Anthony J. Thibault
a4d70e89df
hmd turn roll tuning
...
* Tighten action motor timescale while flying. This should cause less drift as the user
changes direction and should lead to more comfort and control.
* Hmd head roll is only enabled if you are forward or backward faster then 2 meters per
second. This should prevent un-intentional turning/rolling when hovering or moving at
slow speeds.
* Documented hmdRoll tuning parameters accessible from JavaScript.
* Removed roll feathering code, because it is non-linear and can perhaps induce nausea.
* Tuned default dead spot and turning speeds to match Eagle Flight's defaults.
2017-11-28 17:20:26 -08:00
Anthony J. Thibault
dff49cafaa
Embiggen the stick deadspots for oculus touch controllers
...
This effectively splits the controller into directional zones.
This should make driving/flying navigation more predictable and less prone
to drifting in unintentional directions, which could induce nausea.
2017-11-28 17:11:44 -08:00
Zach Fox
3c892920e3
Prevent seeding text from flashing
2017-11-28 17:00:15 -08:00
howard-stearns
281b4cfd88
Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA
2017-11-28 16:59:44 -08:00
SamGondelman
c5ebb8a279
expose Window.getDeviceSize()
2017-11-28 16:16:30 -08:00
Zach Fox
5dc8715879
Bugfix
2017-11-28 16:14:17 -08:00
Zach Fox
489d11d5fd
Remove logging
2017-11-28 16:01:58 -08:00
Zach Fox
3e5a2addd2
Use same logic for Recent Activity
2017-11-28 16:00:46 -08:00
Zach Fox
e769d2fbc3
Don't refresh Inventory or Recent Activity if data hasn't changed
2017-11-28 15:44:42 -08:00
David Rowe
b9ad15b19e
Add missing line3d overlay property getters
2017-11-29 11:03:16 +13:00
David Rowe
3956b3b953
Fix missing line3d overlay property setter overrides of base class
2017-11-29 10:41:51 +13:00
David Rowe
76c934f012
Add missing line3d overlay property setters
2017-11-29 10:41:21 +13:00
vladest
7283f0127b
return back square background for scroll bars
2017-11-28 22:21:52 +01:00
vladest
94937374c5
Make selection not visible under rounded scrollbar
2017-11-28 21:33:13 +01:00
vladest
b2ec2aab15
Merge branch 'master' into fix_tablet_scrollbars
2017-11-28 20:41:07 +01:00
Anthony J. Thibault
7327b79ce3
WIP
2017-11-28 11:37:58 -08:00
Andrew Meadows
e212ac67c1
enable custom avatar sort tuning
2017-11-28 11:30:06 -08:00
Andrew Meadows
d65101c4e9
sort and throttle avatar updates in interface
2017-11-28 09:07:17 -08:00
David Rowe
cd2922a560
Merge branch '21602' into 21624
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2017-11-28 17:04:59 +13:00
David Rowe
97b4dcaa5c
Web3DOverlay's resolution property is deprecated
2017-11-28 16:31:13 +13:00
David Rowe
a6937d7c8b
Add Overlays API examples JSDoc
2017-11-28 16:30:25 +13:00
David Rowe
92493f14d7
Miscellaneous JSDoc fixes
2017-11-28 16:30:09 +13:00
MiladNazeri
83d13717fe
Merge pull request #11752 from Menithal/21539
...
21539: Add "None" option in Head Tracking section when "Use Vive in Desktop Mode" is selected
2017-11-27 16:02:01 -08:00
SamGondelman
52039e022b
merge from master, get rid of resolution in RayPick
2017-11-27 13:11:35 -08:00
Alexander Ivash
02684e3fed
remove not used files
2017-11-27 22:49:11 +03:00
Alexander Ivash
da06b2656f
7991 Change Instances of Edit Mode to Create Mode
2017-11-27 22:47:42 +03:00
howard-stearns
1575119327
PR feedback
2017-11-27 10:46:57 -08:00
howard-stearns
2e919682a0
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-27 10:02:53 -08:00
luiscuenca
ad02118588
fixed menu error
2017-11-26 23:43:13 -07:00
Menithal
693da50a68
21539: Fixed None Checkmark being on Desktop mode
2017-11-27 07:59:04 +02:00
Menithal
5d52b9936b
21539: Updated Logic to match request
2017-11-27 07:42:18 +02:00
luiscuenca
027d2d323c
Measure tool and corrections
2017-11-26 22:28:34 -07:00
Menithal
ba1cd74ffe
21539: Moved Desktop HMD to None
2017-11-26 21:58:16 +02:00
vladest
6136a4cea6
Rounded background
2017-11-25 10:03:56 +01:00
David Rowe
de49fefc61
Merge branch 'master' into 21602
...
# Conflicts:
# libraries/shared/src/RegisteredMetaTypes.h
2017-11-25 17:06:36 +13:00
David Rowe
4b5aa9bdec
Add Overlays API functionality JSDoc
2017-11-25 16:18:14 +13:00
vladest
73a557a8a4
Added Scroll Bar for Trees. Fixed some anchoring issues. Fixed headerless views
2017-11-24 15:58:27 +01:00
vladest
b69b580a68
Use ScrollBar from QQC2 which is supports both mouse and touch events
2017-11-23 23:08:43 +01:00
vladest
22d57f1103
Fix click events from mouse
2017-11-23 14:56:15 +01:00
luiscuenca
69299bdd68
try to fix errors
2017-11-22 19:25:24 -07:00
luiscuenca
5bf8367126
add resources
2017-11-22 18:17:50 -07:00
luiscuenca
b481a6060e
improve audio scope
2017-11-22 18:15:42 -07:00
howard-stearns
899999a4c6
fix up dynamic ownership challenge
2017-11-22 15:58:30 -08:00
Anthony J. Thibault
b3896f664d
Made increaseScale and decreaseScale more responsive at limits
2017-11-22 14:45:52 -08:00
vladest
094cc0e251
Merge conflict
2017-11-22 20:50:15 +01:00
Zach Fox
fada02a76c
Merge pull request #11864 from zfox23/commerce_newHelpText
...
New Help questions/answers/link
2017-11-22 12:53:16 -05:00
David Rowe
3535071178
Add "size" as synonym for "dimensions" in model overlay property setter
2017-11-22 21:04:04 +13:00
samcake
1514cdfb2f
extend the set of interface for multi highlight
2017-11-21 17:59:45 -08:00
howard-stearns
16d6d8a361
Merge branch 'master' of https://github.com/highfidelity/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:29 -08:00
howard-stearns
ca80c9b764
Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet
2017-11-21 16:28:08 -08:00
Sam Gateau
8389137caa
Merge pull request #11834 from highfidelity/pointers
...
UI Pointer Optimization
2017-11-21 16:01:52 -08:00
Zach Fox
d2ebfbf064
New Help questions/answers/link
2017-11-21 18:55:48 -05:00
samcake
a0e40efdc8
Fixing all the changes of interface name coming from upstream
2017-11-21 14:55:58 -08:00
Dante Ruiz
767b0fa4af
remove unused variable warning
2017-11-21 14:45:55 -08:00
samcake
ebd701a1ab
Merging with master
2017-11-21 14:40:37 -08:00
samcake
84ff40c717
Merging with master
2017-11-21 14:12:47 -08:00
Dante Ruiz
c9ad7b1db5
Merge branch 'master' of github.com:highfidelity/hifi into fix-modal
2017-11-21 13:56:22 -08:00
Dante Ruiz
88c3adbff1
change askToReplaceDomainContent to use async question and warning
2017-11-21 13:56:11 -08:00
Anthony J. Thibault
9f54ce55f3
Change domain setting from min/max avatar scale to min/max avatar height
...
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
2017-11-21 13:25:47 -08:00
vladest
a56e4e10c3
Remove unused variables
2017-11-21 21:44:04 +01:00
Brad Hefta-Gaub
817afcd083
Merge pull request #11741 from ZappoMan/entityItemCleanup
...
Entity item cleanup
2017-11-21 12:24:46 -08:00
Brad Hefta-Gaub
5914f27027
Merge pull request #11706 from luiscuenca/webAudioDev_fresh
...
QML & Web generated audio now follow the client audio device selection
2017-11-21 11:29:48 -08:00
ZappoMan
3a967ca895
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub
4d1e90dfca
Merge pull request #11821 from dback2/mirrorfanciness3
...
Mirror projection for Secondary Camera
2017-11-21 07:59:07 -08:00
Brad Hefta-Gaub
5dadec0b93
Merge pull request #11845 from thoys/feat/parentJointName
...
Import JSON parentJointName value
2017-11-21 07:58:13 -08:00
vladest
0ea5a7635c
Added mouse press and release events to be sent along with touch events to Tablet
2017-11-21 16:32:57 +01:00
samcake
aa163db4e6
Trying to make selection threadsafe
2017-11-20 17:21:15 -08:00
ZappoMan
b44ced4c21
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-20 17:19:18 -08:00
Thijs Wenker
627fee80ec
added support for exporting parentJointName
2017-11-21 01:49:56 +01:00
Howard Stearns
89425ca210
Merge pull request #11854 from howard-stearns/consolidated-blockchain-history-log
...
consolidated blockchain history log
2017-11-20 16:19:27 -08:00
Howard Stearns
4018b99118
Merge pull request #11848 from zfox23/commerce_flipTheSwitch
...
Turn Commerce on by default!
2017-11-20 16:18:53 -08:00
Elisa Lupin-Jimenez
3211aa7d13
Merge pull request #11849 from elisa-lj11/blocks
...
Zip file structures replicated in asset server
2017-11-20 16:13:51 -08:00
Elisa Lupin-Jimenez
fb6287503e
hopefully fixed build error resulting from escape sequence
2017-11-20 15:12:11 -08:00
Thijs Wenker
c3754d6369
smart pointer
2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez
a54f4eca93
simplified naming of zip folders
2017-11-20 14:02:46 -08:00
David Rowe
8e647fb32c
Disable unused Overlays.panelDeleted signal
...
#if'd out to match the other panel code that is disabled.
2017-11-21 11:00:36 +13:00
Elisa Lupin-Jimenez
b6e75d1222
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez
3aa7cb440d
file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url
2017-11-20 10:01:33 -08:00
Dante Ruiz
76935c1457
fixing merge conflict
2017-11-20 09:51:10 -08:00
Thijs Wenker
e94199acad
Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName
2017-11-20 18:29:54 +01:00
Thijs Wenker
84ec9890ca
reverted special property case, parentJointName is now only parsed from the JSON import
2017-11-20 18:29:33 +01:00
samcake
a74372b233
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-20 09:26:29 -08:00
Seth Alves
df07b66872
Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes
2017-11-20 07:47:19 -08:00
howard-stearns
07d52306c4
consolidated blockchain history log
2017-11-19 22:51:36 -08:00
ZappoMan
04ee1adabd
Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup
2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub
e070033ce4
Merge pull request #11793 from ElderOrb/FB9032
...
9032 - Current display mode can be deselected in the toolbar/tablet menu
2017-11-19 11:25:35 -08:00
David Rowe
27e3e0bf0b
Merge branch 'master' into 21602
2017-11-20 08:12:19 +13:00
Brad Hefta-Gaub
ff8ca6da4c
Merge pull request #11303 from vladest/webbrowser_updates
...
Webbrowser updates
2017-11-19 11:11:09 -08:00
Brad Hefta-Gaub
e4a03a7d12
Merge pull request #11840 from ctrlaltdavid/21609
...
Fix typo in overlay "filled" property
2017-11-18 14:31:11 -08:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
David Rowe
b4bc8da20a
Document deprecation of "filed" property
2017-11-19 08:44:00 +13:00
Sam Gateau
44f63ef802
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-18 08:23:59 -08:00
Alexander Ivash
c4aa937108
adjust to coding standards
2017-11-18 11:16:40 +03:00
samcake
e0740b323d
keep debuging the seelction highlight
2017-11-17 18:11:18 -08:00
Brad Hefta-Gaub
28b75abcee
Merge pull request #11816 from druiz17/fix-bringing-up-logs
...
Fix issue of User is unable to bring up the High Fidelity Interface log.
2017-11-17 17:02:50 -08:00
Brad Hefta-Gaub
0678a7c9df
Merge pull request #11718 from kencooke/audio-louder-mastergain
...
Adjustable master avatar volume
2017-11-17 16:58:27 -08:00
Brad Hefta-Gaub
592f4921bc
Merge pull request #11825 from druiz17/fix-tablet-rez
...
fix tablet rez point for commence button
2017-11-17 16:51:52 -08:00
SamGondelman
033f658fff
Merge remote-tracking branch 'upstream/master' into pointers
2017-11-17 16:10:20 -08:00
Zach Fox
d31578abae
FIXME LATER! Remove mouseareas from passphrase screens
2017-11-17 15:47:02 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
SamGondelman
393ad0079c
home button is circle instead of sphere, fixed positioning, fix lasers on tablet
2017-11-17 15:24:21 -08:00
Zach Fox
ec16f16757
Remove debug buttons from wallet
2017-11-17 15:21:18 -08:00
David Back
4be29c5a7a
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
2017-11-17 15:15:22 -08:00
Zach Fox
f47f259816
Turn Commerce on by default
2017-11-17 15:12:49 -08:00
Zach Fox
4cc8db8aff
Merge pull request #11843 from zfox23/commerce_fixMyItems
...
Fix 'My Items' display
2017-11-17 12:59:51 -08:00
Stephen Birarda
239b116874
Merge pull request #11835 from birarda/bug/octree-connection-id
...
Reset EntityTreeSendThread known state if client disconnects from Entity Server
2017-11-17 12:56:25 -08:00
SamGondelman
42d047c572
merge with master
2017-11-17 11:52:34 -08:00
SamGondelman
e38b0ab6b8
make web overlays match web entities more, remove resolution
2017-11-17 11:50:24 -08:00
Dante Ruiz
4de0fdf7d1
Merge pull request #11768 from ctrlaltdavid/21596
...
Add instructions and cursor to GOTO dialog input
2017-11-17 11:45:40 -08:00
Zach Fox
f570e3c874
Fix 'My Items' display
2017-11-17 11:27:00 -08:00
SamGondelman
61c7ccde6e
cleanup
2017-11-17 10:45:39 -08:00
samcake
45f14d0cd3
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-17 08:50:44 -08:00
H Q
11112bc2c5
syncing
...
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
2017-11-17 08:00:35 -08:00
H Q
21a28827c9
Remaining coding style changes, other small fixes
2017-11-17 07:59:52 -08:00
David Rowe
a33162d7ff
Fix typo in Base3DOverlay "filled" property
2017-11-17 21:07:43 +13:00
David Rowe
12e005f215
Initial update of Overlays JSDoc
2017-11-17 17:59:11 +13:00
samcake
08dd76c9a8
changes of the day
2017-11-16 17:52:12 -08:00
Zach Fox
57c86c3035
Merge pull request #11836 from zfox23/commerce_fixStepSkip
...
Fix skipping wallet setup step in certain cases
2017-11-16 16:01:10 -08:00
H Q
14890495a2
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
...
Syncing
2017-11-16 12:38:45 -08:00
H Q
27350ddbfc
Coding style corrections
2017-11-16 12:35:00 -08:00
Zach Fox
7f64ede940
Fix skipping wallet setup step in certain cases
2017-11-16 11:44:52 -08:00
David Back
abba965328
todo comment
2017-11-16 11:41:28 -08:00
Stephen Birarda
eedb77dae9
add clearing of known state if client resets ES connection
2017-11-16 11:40:35 -08:00
SamGondelman
ac7242102c
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-16 09:47:29 -08:00
SamGondelman
e3aa79990b
merge with master
2017-11-16 09:45:32 -08:00
Brad Davis
7bbc719d79
Fix for black screen on HMD derived display plugins
2017-11-16 08:53:12 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
Sam Gateau
3a0b2651d5
Keep spinning on the bridge between js interface and the highlighting feature
2017-11-16 00:55:51 -08:00
Seth Alves
93fd2a6a6b
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
2017-11-15 20:10:05 -08:00
David Back
4b2ff68fa3
var name and empty line
2017-11-15 19:05:44 -08:00
Sam Gateau
6889c9d6d1
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-15 18:49:30 -08:00
samcake
771c64fc97
Working on the selection highlight js interface
2017-11-15 18:21:07 -08:00
David Back
9bfbcb4434
code review updates
2017-11-15 18:06:49 -08:00
SamGondelman
3274c41aeb
Merge remote-tracking branch 'upstream/pointers' into ui
2017-11-15 17:45:45 -08:00
David Rowe
6f82049021
Merge branch 'master' into 21602
2017-11-16 13:41:29 +13:00
David Rowe
4f083a1b20
Further Menu API JSDoc improvements
2017-11-16 13:39:14 +13:00
David Rowe
bdb1bbe88d
Menu API JSDoc improvements
2017-11-16 13:34:50 +13:00
Dante Ruiz
dd8ea759d4
fix tablet rez for commence button
2017-11-15 15:48:39 -08:00
Ryan Huffman
60a222e4b4
Merge pull request #11810 from Atlante45/fix/stuck-acs
...
Fix stuck ACs
2017-11-15 14:59:51 -08:00
SamGondelman
7eb22b372f
merge with master
2017-11-15 14:35:30 -08:00
Zach Fox
9f80a5f081
Merge pull request #11817 from zfox23/commerce_rezFix
...
Fix rezzing non-JSON marketplace items
2017-11-15 14:17:05 -08:00
SamGondelman
8730a26d20
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
2017-11-15 14:12:16 -08:00
David Back
e0ce154472
remove includes, fix comment
2017-11-15 13:37:15 -08:00
samcake
932089115e
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-15 12:51:01 -08:00
David Back
0b8f888d9b
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
2017-11-15 12:50:03 -08:00
David Back
fee7701890
working mirror projection for secondary camera
2017-11-15 12:49:39 -08:00
Brad Davis
bb2e061d77
Fixing global declarations in JS
2017-11-15 12:00:52 -08:00
Brad Davis
26a745be6f
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-15 11:59:06 -08:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Zach Fox
e8c4878c8f
Fix rezzing non-JSON marketplace items
2017-11-15 11:25:18 -08:00
Atlante45
e68ce97697
Remove the number of socket change tracking
2017-11-15 11:19:54 -08:00
Dante Ruiz
d83f3152dd
Merge pull request #11809 from ElderOrb/FB8984
...
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-15 11:16:49 -08:00
Dante Ruiz
b633968865
fix-bringing-up-logs
2017-11-15 10:47:06 -08:00
John Conklin II
8592f3fd4d
Merge pull request #11764 from luiscuenca/case7587
...
7587 Lasers resize with avatar
2017-11-15 09:31:45 -08:00
Zach Fox
8f855c6c95
Update QUrls
2017-11-15 09:21:10 -08:00
samcake
78ac609752
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-15 09:12:18 -08:00
samcake
d4f93b9203
Adding style from VariantMap
2017-11-14 18:21:02 -08:00
Howard Stearns
1c293c4c48
Merge pull request #11813 from zfox23/commerce_removeEditJSDependency
...
Remove Marketplace's dependency on Edit.js for REZ/WEAR
2017-11-14 16:33:35 -08:00
H Q
0db9e876d6
Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet
2017-11-14 15:40:44 -08:00
H Q
44f2c92d30
Final ECSDA and nonce modifications for this dev cycle
2017-11-14 15:40:29 -08:00
Zach Fox
f5994375cf
Remove Marketplace's dependency on Edit.js for rez
2017-11-14 14:29:49 -08:00
Zach Fox
c42003a374
Merge pull request #11794 from ElderOrb/FB4684_3
...
4684 Add collapse button on the virtual keyboard
2017-11-14 12:22:42 -08:00
Alexander Ivash
e201e203b8
8984 Opening tablet with "Enter" key displays the audio menu
2017-11-14 22:18:48 +03:00
Zach Fox
5290ee3b4e
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-14 10:07:44 -08:00
luiscuenca
489e244342
More accurate scale from SensorToWorldScale
2017-11-14 09:56:23 -07:00
Sam Gateau
fc53c26190
drafting the interface
2017-11-14 00:40:37 -08:00
Sam Gateau
02c60c425e
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-11-13 18:40:51 -08:00
samcake
fd46aa15ff
adding occluded/visisble to highlight outline
2017-11-13 17:23:21 -08:00
Brad Davis
d71fd151c5
Fixing button model exposure
2017-11-13 16:45:27 -08:00
Zach Fox
a3332e15b7
Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist
2017-11-13 15:01:26 -08:00
