Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
...
WL#21654: Make the Asset Browser Sort Case Insensitive
2018-01-05 13:34:39 -08:00
Seth Alves
3cd0ec3336
default run speed is faster, advanced movement on by default
2018-01-05 13:20:41 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
...
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
...
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
Andrew Meadows
c33c637f07
Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs
...
Adopt path to certain Tablet dialogs to new loading subsystem and pat…
2018-01-05 09:07:54 -08:00
Ryan Downe Karpf
a3245aec57
Merge pull request #12079 from RebeccaStankus/log-filtering
...
Log filtering
2018-01-05 08:40:41 -08:00
Seth Alves
fd8b521c50
Merge pull request #12038 from ElderOrb/audio_name_conflict_fix
...
Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963 )
2018-01-05 08:15:48 -08:00
David Rowe
5463f1ae6b
Merge branch 'master' into 21646
2018-01-05 16:58:58 +13:00
David Rowe
d6a0457ee5
Delete web3d overlay "resolution" property JSDoc
2018-01-05 16:48:37 +13:00
Lexx
85b54f82d8
revert sorting change mistake
2018-01-05 01:58:23 +00:00
NissimHadar
43bc8bb948
Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor
...
defang accidental disable of MyAvatar's default motor
2018-01-04 17:44:22 -08:00
Zach Fox
0388c183ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_pagination
2018-01-04 16:42:12 -08:00
SamGondelman
eb0d09360a
Merge remote-tracking branch 'upstream/master' into overlayFix
2018-01-04 15:47:20 -08:00
Zach Fox
ea29d8bde0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixHandControllerInspection
2018-01-04 15:41:27 -08:00
Zach Fox
4232bc0200
Bump per_page to 100
2018-01-04 14:42:05 -08:00
Dante Ruiz
b526842a46
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-04 14:23:10 -08:00
Zach Fox
14447c26a0
Prevent visual data loss
2018-01-04 13:47:31 -08:00
David Back
81f3590954
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-04 13:17:07 -08:00
SamGondelman
6a19b0e0b6
update render items on texture load
2018-01-04 13:10:46 -08:00
RebeccaStankus
9ba324b85f
"Clear Filter" button instead of "Show All"
2018-01-04 12:51:11 -08:00
RebeccaStankus
3e8063f80a
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 12:48:09 -08:00
Zach Fox
10d494b51d
Pagination for Recent Activity
2018-01-04 12:32:30 -08:00
Clément Brisset
efbff56f26
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
...
Remove legacy jurisdiction code
2018-01-04 11:52:38 -08:00
RebeccaStankus
f52a6d8eae
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-04 10:49:32 -08:00
luiscuenca
ef0164c272
Fix tabs
2018-01-04 11:43:51 -07:00
luiscuenca
28d9409bf0
Fix default hand poses
2018-01-04 11:37:37 -07:00
David Rowe
7236ac17e2
Merge branch 'master' into 21661
2018-01-04 15:21:00 +13:00
David Rowe
138092ac37
Remove "Prefer Avatar Finger Over Stylus" setting
2018-01-04 15:12:34 +13:00
Zach Fox
ff4f582c7d
Thanks Howard
2018-01-03 17:23:35 -08:00
David Back
6c8987d75f
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
2018-01-03 14:44:52 -08:00
RebeccaStankus
89138c9bd8
More filter choices, search will clear
2018-01-03 11:35:46 -08:00
Dante Ruiz
674e8e1ac2
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-03 08:47:40 -08:00
David Rowe
901af8896f
Add "Prefer Stylus Over Laser" setting
2018-01-03 17:54:43 +13:00
David Rowe
6e43497e14
Merge tag 'RELEASE-7602' into 21661
...
Jenkins Git plugin tagging with RELEASE-7602
2018-01-03 16:46:10 +13:00
RebeccaStankus
dd48972e44
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
2018-01-02 14:06:41 -08:00
RebeccaStankus
0b452a23dc
forgot to add hifi.entities to filter selections
2018-01-02 14:04:30 -08:00
RebeccaStankus
bf59697aa5
better dropdown
2018-01-02 13:56:49 -08:00
Dante Ruiz
6fa3446c57
joints are being relayed to children
2018-01-02 13:54:13 -08:00
David Rowe
7013f64714
Remove erroneous "filed" Overlay property
2018-01-03 10:37:37 +13:00
RebeccaStankus
d08e97f9cc
more filter options
2018-01-02 13:28:39 -08:00
RebeccaStankus
fe69498976
initial changes...ready for feedback
2018-01-02 13:04:52 -08:00
RebeccaStankus
0117750757
PR for Feedback
2018-01-02 12:28:31 -08:00
Elisa Lupin-Jimenez
a63538c4e9
Merge pull request #12021 from elisa-lj11/poly_api
...
Google Poly API
2018-01-02 10:28:17 -08:00
RebeccaStankus
fe82d33b76
couple small changes
2018-01-01 15:29:49 -08:00
Triplelexx
78a0175413
fix assetbrowser sorting case sensitivity
2017-12-29 23:16:12 +00:00
luiscuenca
49bd62ca29
Touch feeling for near grab
2017-12-29 14:04:36 -07:00
Atlante45
aec5ab5921
CR
2017-12-29 12:46:52 -08:00
Atlante45
06e2f394f9
Update Octree server stats to handle single server
2017-12-29 12:46:52 -08:00
Atlante45
28f164d7e5
Remove legacy jurisdiction code
2017-12-29 12:46:52 -08:00
RebeccaStankus
06def41764
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2
2017-12-29 10:03:29 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3
...
avatar-entities which are children of an avatar will scale with the avatar
2017-12-29 09:12:17 -08:00
Elisa Lupin-Jimenez
84933131c4
changed api key variable name
2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez
a428eb5b75
added const to several parameters
2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez
01c1032540
fixed constant names, added another URL check
2017-12-27 10:51:58 -08:00
RebeccaStankus
296f0a323a
saving for Wednesday
2017-12-26 15:56:05 -08:00
Elisa Lupin-Jimenez
03f06aadf4
keyword filters case insensitive now
2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez
e1b344e36d
handles empty json object return
2017-12-26 10:50:10 -08:00
Elisa Lupin-Jimenez
3e10d3b436
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-26 10:18:51 -08:00
David Back
ab5b238aea
Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices
2017-12-22 17:00:17 -08:00
David Back
c620f3274c
merge
2017-12-22 16:28:29 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back
...
Merge stable back into master after RC61.1
2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
2017-12-22 15:48:04 -08:00
Seth Alves
96197e66bb
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 15:13:02 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3
...
Remove _model from ModelMeshPartPayload
2017-12-22 13:50:06 -08:00
RebeccaStankus
720f186bd7
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 13:47:42 -08:00
Howard Stearns
5767f5937e
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
...
Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-22 09:56:22 -08:00
RebeccaStankus
1d4dedc1a1
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter
2017-12-22 07:52:31 -08:00
Seth Alves
897b96d092
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-22 07:36:26 -08:00
John Conklin II
5a839ebd93
Merge pull request #12049 from zfox23/RC61.1_commerce_fixEcdsaError1
...
RC61.1: Commerce: Fix some rezzing errors; Fix ECDSA errors
2017-12-21 17:46:32 -08:00
Zach Fox
07a1cf434a
IT'S WORKING!!!
2017-12-21 16:33:47 -08:00
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
luiscuenca
38bfddf786
Added filter for QT autogenerated functions and integrated it to Developers menu
2017-12-21 16:26:06 -07:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
unknown
be736373f2
fix if else convention
2017-12-20 17:52:27 -08:00
Andrew Meadows
c1906215ba
add comments
2017-12-20 17:41:08 -08:00
Andrew Meadows
721e9d426a
restore signals on LOD change
2017-12-20 17:41:08 -08:00
Andrew Meadows
5c11ae3469
bump desktop min FPS from 20 to 30 msec
2017-12-20 17:41:08 -08:00
Andrew Meadows
4fb9680f3b
also consider GPU render time for LOD adjust
2017-12-20 17:41:08 -08:00
Andrew Meadows
9c4a0c8c70
tweak LOD adjustment logging
2017-12-20 17:41:08 -08:00
Andrew Meadows
8e0d367a2d
use full 'present' time for FPS calculation
...
also, refactor LOD adjust logic
2017-12-20 17:41:08 -08:00
Andrew Meadows
7a9d566e02
remove unnecessary whitespace
2017-12-20 17:41:08 -08:00
unknown
dbbc87d72e
merge
2017-12-20 17:40:11 -08:00
RebeccaStankus
95d94e1c8f
UI Done
2017-12-20 16:52:56 -08:00
Elisa Lupin-Jimenez
7de2918b9b
added newline to header
2017-12-20 12:44:47 -08:00
SamGondelman
bd06dc6443
cleaning up modelmeshpartpayload
2017-12-20 11:00:14 -08:00
Andrew Meadows
02e3b22621
remove hot-key for disable of scripted motor
2017-12-20 08:43:56 -08:00
Andrew Meadows
6ad3a0598c
remove crufty comment
2017-12-20 08:42:42 -08:00
Andrew Meadows
f82de05f9c
defang accidental disable of MyAvatar's default motor
2017-12-20 08:42:42 -08:00
Elisa Lupin-Jimenez
ca062f9232
changed qtglobal include
2017-12-19 15:41:42 -08:00
Elisa Lupin-Jimenez
14935e5924
added const to valid inputs
2017-12-19 15:11:24 -08:00
Elisa Lupin-Jimenez
1b6c85edb0
cleaned up code
2017-12-19 13:22:31 -08:00
David Rowe
e6c40f4aae
Window JSDoc
2017-12-20 10:16:09 +13:00
Elisa Lupin-Jimenez
34d8fe307d
fixed getAssetList()
2017-12-19 11:25:15 -08:00
howard-stearns
16a58ddf5a
Merge branch 'master' of https://github.com/highfidelity/hifi into consistent-goToUser
2017-12-19 10:48:34 -08:00
Elisa Lupin-Jimenez
8a9e5bc39d
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-19 10:41:39 -08:00
Zach Fox
18d5be147c
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-19 09:48:15 -08:00
Elisa Lupin-Jimenez
1ee8445f43
added gltf import feature, getAssetList() not working
2017-12-18 17:47:21 -08:00
Seth Alves
ddbb7a4416
when an avatar-entity's lifetime expires, remove it from avatarEntityData
2017-12-18 14:26:25 -08:00
Elisa Lupin-Jimenez
e7fad05867
enabled fbx, obj, and blocks model url retrieval
2017-12-18 14:20:51 -08:00
Brad Davis
9f7b6f543d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-12-18 11:17:07 -08:00
Andrew Meadows
cfd2097f36
Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js
...
Cleanup names of debug stats and trace contexts.
2017-12-18 10:02:42 -08:00
Elisa Lupin-Jimenez
0e57ed5c12
Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api
2017-12-18 10:00:18 -08:00
howard-stearns
d730b7b87b
consistent goToUser behavior in PAL, and be able to go to flying user.
2017-12-15 17:00:54 -08:00
Anthony Thibault
f3fcac8e58
Merge pull request #11903 from Delanir/IPD8258
...
8258 IPD Tertiary Task List: Changing to Smaller Avatar Does not Resize Tablet
2017-12-15 15:37:27 -08:00
Brad Hefta-Gaub
c68bec175a
Merge pull request #11978 from hyperlogic/bug-fix/no-hip-glitches
...
More stable hips IK
2017-12-15 15:32:24 -08:00
SamGondelman
4fbf5db697
Merge remote-tracking branch 'upstream/master' into hysteresis
2017-12-14 09:55:46 -08:00
Elisa Lupin-Jimenez
264f362994
resolved merge conflict again
2017-12-13 17:54:30 -08:00
Elisa Lupin-Jimenez
e49181c3a2
added getAssetList() and getFBX()
2017-12-13 17:45:57 -08:00
Zach Fox
ed5082e5d4
Merge pull request #11974 from birarda/feat/staging-env-or-cl
...
allow custom metaverse URL to be used with env var
2017-12-13 17:29:45 -08:00
Elisa Lupin-Jimenez
f7be67b5b2
removed key
2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
392f290dd6
can fetch poly asset list synchronously
2017-12-13 16:19:36 -08:00
Elisa Lupin-Jimenez
dc999401d5
Created poly scripting interface template
2017-12-13 16:19:36 -08:00
Zach Fox
3764445272
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-13 14:12:08 -08:00
Zach Fox
f0507e1608
Merge pull request #11972 from zfox23/commerce_fixWalletStatus1
...
Set Wallet Status to 'Ready' after correctly authenticating wallet
2017-12-13 13:19:54 -08:00
Zach Fox
efd5c0ccb7
Add comment as per CR
2017-12-13 11:53:26 -08:00
Anthony J. Thibault
c4a7f4843a
Much more stable hips IK target.
...
Target is now estimated in sensor space from the head, which is very deterministic and not prone to feedback from the IK system.
Previous the hip was estimated from accumulated IK error deltas, which was not stable, as the error would tend to accumulate if the IK targets could not be reached.
2017-12-13 11:12:32 -08:00
Sam Gateau
4e68663cfc
Merge pull request #11970 from SamGondelman/circleFix
...
Fix Circle3DOverlays uninitialized member variables, cloning, getProperty
2017-12-14 00:30:18 +07:00
Stephen Birarda
139976d8bb
allow staging METAVERSE_SERVER_URL to be toggled by env
2017-12-12 16:22:08 -08:00
David Rowe
92be33da31
Web3d overlay's "resolution" property has been removed
2017-12-13 11:40:44 +13:00
Andrew Meadows
87fa919ac8
save files to Documents by default
2017-12-12 14:11:25 -08:00
David Rowe
650e7e1922
Document that getProperty() only works for 3D overlays
2017-12-13 10:34:33 +13:00
SamGondelman
16f545a9e8
fix circle3d overlays
2017-12-12 13:25:47 -08:00
Zach Fox
623e6395be
Set Wallet Status to 'Ready' after correctly authenticating wallet
2017-12-12 13:01:14 -08:00
David Rowe
578c42b4ea
Merge branch 'master' into 21624
2017-12-13 09:41:09 +13:00
MiladNazeri
16e16501cd
Merge pull request #11791 from ctrlaltdavid/21602
...
JSDoc updates
2017-12-12 12:18:02 -08:00
SamGondelman
ce96fa7078
change hysteresis values based on testing
2017-12-11 17:32:58 -08:00
SamGondelman
fba06a74aa
fix laser and stylus deadspot
2017-12-11 15:51:22 -08:00
Andrew Meadows
74a1f5de96
remove bullet stats when physics stats disabled
2017-12-11 11:31:00 -08:00
Andrew Meadows
406bf7898d
cleanup prof stats and trace context names
2017-12-11 11:31:00 -08:00
Andrew Meadows
2538204b1e
expose physics simulation stats to Test JS API
2017-12-11 11:31:00 -08:00
Seth Alves
2cd64ccd2c
merge from upstream
2017-12-11 10:14:30 -08:00
Sam Gateau
0ff91e5926
Merge pull request #11952 from samcake/light
...
Exposing multi highlight and selection feature to js api
2017-12-12 01:09:15 +07:00
Zach Fox
b81cdf49ef
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-11 09:52:32 -08:00
Zach Fox
006ea3342c
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint
...
Remove useless Wallet.buy() scripting endpoint
2017-12-11 09:33:18 -08:00
Sam Gateau
d1cd9f5c6b
adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays
2017-12-11 02:21:09 -08:00
Sam Gateau
cc4b266647
Add names to objects of the selection, remove comments in shader and fix one more warning on linux
2017-12-11 00:31:54 -08:00
Sam Gateau
bb888f2d4c
Replace the name opacity for alpha
2017-12-10 23:07:06 -08:00
Sam Gateau
eec4e966a7
Fix the linux build and correct the name of the property Intensity to Opacity
2017-12-10 10:13:49 -08:00
Sam Gateau
429d54d65d
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-10 09:53:22 -08:00
Zach Fox
6f5028080b
Remove useless Wallet.buy() scripting endpoint
2017-12-08 18:23:23 -08:00
Clément Brisset
18b9118518
Merge pull request #11935 from birarda/bug/atp-drop-actual-files-only
...
only attempt default asset upload for local files
2017-12-08 17:18:49 -08:00
Daniela Fontes
46583a90be
Change abs to fabsf and other corrections requested.
2017-12-09 00:14:36 +00:00
Stephen Birarda
3265eb42f1
only attempt default asset upload for local files
2017-12-08 14:45:27 -08:00
Zach Fox
a81a981676
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-08 09:44:52 -08:00
samcake
9a4f667059
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-08 08:50:33 -08:00
Seth Alves
d095d4ef44
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-08 07:19:33 -08:00
Seth Alves
a7a6dee8e0
Merge pull request #11950 from hyperlogic/bug-fix/hand-scaling
...
Fix for hand controller avatar scaling.
2017-12-08 07:17:59 -08:00
Seth Alves
91b2d8df8a
Merge pull request #11874 from luiscuenca/audioscope
...
Improve Audio Scope
2017-12-08 07:15:28 -08:00
Sam Gateau
d07cde3ecb
Merge branch 'master' of https://github.com/highfidelity/hifi into light
2017-12-07 19:20:25 -08:00
samcake
7a9d77fed4
return a legit selectedItemsList js object as long as the list exist, only void if the list name is unknown
2017-12-07 17:53:30 -08:00
samcake
ace8e153c2
making sure the ID of an object in the Selection list is unique and more refined debugging
2017-12-07 17:45:40 -08:00
Anthony J. Thibault
542af47e9e
Fix for hand controller avatar scaling.
...
* Added getDomainMaxScale() and getDomainMinScale() to JS api.
* Updated scaleAvatar controller module to use this to prevent scaling past the limits.
* Made sure that getDomainMaxScale() getDomainMinScale() and getUnscaledEyeHeight are thread safe,
so that they can be invoked on the script thread.
* Added signals to Model class that can be used to let observers know when the Rig has finished initializing it's skeleton.
and also when the skeleton is no longer valid. These hooks are used to cache the unscaled eye height of the avatar.
2017-12-07 17:08:13 -08:00
Seth Alves
40412b80c6
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
2017-12-07 17:03:04 -08:00
Andrew Meadows
ed231fa4a1
Merge pull request #11894 from hyperlogic/bug-fix/flying
...
Improvements to HMD flying
2017-12-07 16:31:33 -08:00
Andrew Meadows
4691a98509
Merge pull request #11865 from hyperlogic/feature/domain-limited-height
...
domain uses min/max avatar height instead of min/max scale
2017-12-07 16:29:15 -08:00
samcake
6148458aeb
Workable state, need final clean up and testing
2017-12-07 16:04:08 -08:00
Sam Gondelman
e7d7e9abb8
Merge pull request #11947 from ctrlaltdavid/21634
...
Move mouse and hover slots out of Overlays API
2017-12-07 14:47:01 -08:00
Zach Fox
4b3c61178c
Merge pull request #11944 from zfox23/commerce_dontSendEmptyPublicKeys
...
Don't send commerce requests to backend if cached public keys is empty
2017-12-07 14:31:09 -08:00
Sam Gondelman
b05e1f8a32
Merge pull request #11847 from SamGondelman/overlayFlash
...
Cleanup Web3DOverlay and tablet home button
2017-12-07 14:06:56 -08:00
David Rowe
fd38b89f35
Move mouse and hover slots out of Overlays API
2017-12-08 10:58:52 +13:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
Anthony J. Thibault
47b52238d9
code review feedback
2017-12-07 10:49:23 -08:00
Anthony J. Thibault
68ad27a38d
Merge branch 'master' into bug-fix/flying
2017-12-07 10:28:13 -08:00
David Back
46d265e3f1
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices
2017-12-07 10:13:55 -08: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
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
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
unknown
5e1064800a
fix marketplace
2017-12-05 18:39:17 -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
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
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
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
390c59b45c
Change menu and minor fixes
2017-12-04 15:29:01 -08:00
