Zach Fox
2225352b1e
Fix wallet setup
2017-12-11 17:15:15 -08:00
Zach Fox
2d786451c2
Add comment
2017-12-11 10:50:24 -08: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
Clément Brisset
833f98b98b
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage
...
Reduce Image library memory usage
2017-12-11 09:29:22 -08:00
divya
e187852df1
Merge pull request #11941 from huffman/feat/atp-baking-process
...
Move asset server baking to a separate process
2017-12-09 20:48:14 -08:00
Zach Fox
8485503063
Merge pull request #11958 from humbletim/fix-pal-connections
...
Fix for Connections UI lockup
2017-12-08 18:34:25 -08:00
Zach Fox
6f5028080b
Remove useless Wallet.buy() scripting endpoint
2017-12-08 18:23:23 -08:00
Ryan Huffman
65649fc331
Remove _outputDir from BakeAssetTask
2017-12-08 17:56:33 -08:00
Ryan Huffman
5cf2ab5cbd
Remove unnecessary logging on BakeAssetTask
2017-12-08 17:53:49 -08:00
Ryan Huffman
e3d00c4aa5
Remove unnecessary logging from PathUtils
2017-12-08 17:48:10 -08:00
Ryan Huffman
239877fc18
Remove _didFinish from BakeAssetTask
2017-12-08 17:47:57 -08:00
Ryan Huffman
50c47c785d
Fix BakeAssetTask not handling case where oven process is not found
2017-12-08 17:45:42 -08:00
Stephen Birarda
150494a595
Merge pull request #11956 from birarda/bug/npm-package-lock
...
added package-lock file for server console, remove electron-compilers
2017-12-08 17:41:09 -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
NissimHadar
12948b387f
Merge pull request #11879 from NissimHadar/QtImageCompare
...
Qt image compare
2017-12-08 17:08:51 -08:00
Zach Fox
b5899f7a00
Merge pull request #11957 from zfox23/commerce_fixEditDependencies
...
Further remove dependencies of marketplaces.js on edit.js
2017-12-08 16:48:37 -08:00
Nissim Hadar
9ff1b4bcb1
WTF....
2017-12-08 16:38:46 -08:00
Dante Ruiz
f4a9acab92
Merge pull request #11833 from druiz17/controllerDispatcher-interval
...
change controllerDispatcher to setTimeOut update
2017-12-08 16:36:46 -08:00
Nissim Hadar
1f57bb4245
Merge branch 'master' into QtImageCompare
2017-12-08 16:26:41 -08:00
Nissim Hadar
b6f5c4a6ce
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-12-08 16:26:19 -08:00
Nissim Hadar
44c76061ed
Lowered threshold to 0.999
2017-12-08 16:25:10 -08:00
Zach Fox
a99072622a
Fix Create mode :|
2017-12-08 15:41:47 -08:00
Ryan Huffman
982607eedf
Remove unused variable from PathUtils
2017-12-08 15:40:33 -08:00
humbletim
abba85ac54
add missing colonsemi
2017-12-08 18:14:30 -05:00
Stephen Birarda
3265eb42f1
only attempt default asset upload for local files
2017-12-08 14:45:27 -08:00
humbletim
34243f4239
disable connections console.log to prevent UI lag
2017-12-08 17:10:57 -05:00
Stephen Birarda
1f54b1fcc3
remove unneeded dependency on electron-compilers
2017-12-08 14:09:42 -08:00
Zach Fox
be737af79d
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies
2017-12-08 14:08:35 -08:00
Stephen Birarda
aea9821c07
update to a newer version of electron-compilers
2017-12-08 14:03:37 -08:00
Nissim Hadar
b7a170c718
Added error messages to file rename.
2017-12-08 11:45:30 -08:00
Stephen Birarda
d81e87771b
added package-lock file for server console
2017-12-08 11:28:49 -08:00
Sam Gondelman
352c11d7c4
Merge pull request #11358 from vladest/fix_google_vr_height
...
Momentum aka flickable for WebView
2017-12-08 10:46:52 -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
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
Seth Alves
86a1bc75c9
Merge pull request #11897 from Delanir/Gizmos
...
IPD Secondary Task List: edit.js arrow orientation: Yaw, Pitch, Roll tools
2017-12-08 07:09:09 -08:00
Seth Alves
dfbd6bcd8d
Merge pull request #11933 from druiz17/fix-far-to-equip
...
fix far grab to equip transition
2017-12-08 07:04:54 -08:00
Seth Alves
a6a45bc359
Merge pull request #11936 from ElderOrb/FB10108
...
10108 marketplace category cannot scroll
2017-12-08 07:02:15 -08:00
Seth Alves
eda63e5758
Merge pull request #11919 from ElderOrb/FB9706
...
9706 Editing Attachments Results In Attachments Window Scrolling To Top
2017-12-08 07:01:00 -08:00
MandatoryMania
f1808ee126
Merge pull request #11943 from MandatoryMania/returnToMarketplace
...
return to main mktplace page from rez page
2017-12-07 19:14:37 -08:00
Howard Stearns
d9ee42d379
Merge pull request #11949 from davidkelly/dk/fixForGnomesAndMore
...
Fix certificate hash
2017-12-07 18:55:59 -08:00
David Kelly
42b509639b
Fix certificate hash
2017-12-07 17:22:00 -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
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
Dante Ruiz
0286f4646a
Merge branch 'master' of github.com:highfidelity/hifi into controllerDispatcher-interval
2017-12-07 16:19:03 -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
