Brad Hefta-Gaub
|
9bbe696a87
|
Merge pull request #11971 from sethalves/possible-fix-for-tablet-freezing
possible fix for tablet freezing
|
2017-12-13 08:59:17 -08:00 |
|
MiladNazeri
|
8a28d04322
|
Merge pull request #11885 from ctrlaltdavid/21624
Overlays JSDoc
|
2017-12-12 17:04:46 -08:00 |
|
Seth Alves
|
4956978c76
|
Merge pull request #11973 from luiscuenca/webPrivacyFix
Fix web entities accessing the webcam
|
2017-12-12 17:01:38 -08:00 |
|
Ken Cooke
|
55ad42c40b
|
Merge pull request #11967 from ctrlaltdavid/21638
Reduce communications load of making user connection
|
2017-12-12 16:03:28 -08:00 |
|
luiscuenca
|
2d21f4d364
|
Fix web entities accessing the webcam
|
2017-12-12 16:00:17 -07:00 |
|
Sam Gondelman
|
e5a4f077c9
|
Merge pull request #11964 from SamGondelman/memFix
Remove unneeded getDedicatedMemory
|
2017-12-12 14:43:15 -08:00 |
|
David Rowe
|
92be33da31
|
Web3d overlay's "resolution" property has been removed
|
2017-12-13 11:40:44 +13:00 |
|
David Rowe
|
650e7e1922
|
Document that getProperty() only works for 3D overlays
|
2017-12-13 10:34:33 +13:00 |
|
Seth Alves
|
3a00d31c15
|
oops
|
2017-12-12 12:59:35 -08:00 |
|
David Rowe
|
578c42b4ea
|
Merge branch 'master' into 21624
|
2017-12-13 09:41:09 +13:00 |
|
Seth Alves
|
dba05ae8e2
|
try harder to keep setTimeout loop going in controller-dispatcher
|
2017-12-12 12:38:01 -08:00 |
|
MiladNazeri
|
cf3e9f78c9
|
Merge pull request #11884 from ctrlaltdavid/21603
Quat JSDoc
|
2017-12-12 12:20:23 -08:00 |
|
MiladNazeri
|
16e16501cd
|
Merge pull request #11791 from ctrlaltdavid/21602
JSDoc updates
|
2017-12-12 12:18:02 -08:00 |
|
David Rowe
|
25214aad23
|
Code review
|
2017-12-13 08:56:36 +13:00 |
|
David Rowe
|
380cd7aac6
|
Tune particle effects to be similar to before
|
2017-12-12 17:35:37 +13:00 |
|
David Rowe
|
4327906630
|
Reduce communications load when making a user connection
|
2017-12-12 16:39:49 +13:00 |
|
Seth Alves
|
b2c4cdc613
|
Merge pull request #11962 from AndrewMeadows/fix-avatar-mixer-crash-on-sort
fix avatar-mixer crash during sort
|
2017-12-11 15:36:33 -08:00 |
|
SamGondelman
|
ae625306ff
|
remove getDedicatedMemory
|
2017-12-11 14:54:29 -08:00 |
|
Andrew Meadows
|
db6505493f
|
fix avatar-mixer crash: don't use global callback
|
2017-12-11 14:04:39 -08:00 |
|
David Rowe
|
58fa8b9fbf
|
Miscellaneous fixes
|
2017-12-12 10:49:05 +13:00 |
|
Howard Stearns
|
8e36228c12
|
Merge pull request #11948 from MandatoryMania/noFundsSymbol
Provides a nice alert in case of insufficient funds to make a purchase
|
2017-12-11 11:45:27 -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
|
006ea3342c
|
Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint
Remove useless Wallet.buy() scripting endpoint
|
2017-12-11 09:33:18 -08:00 |
|
samcake
|
63fb9b5503
|
fix float literal syntax
|
2017-12-11 09:30:31 -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 |
|
samcake
|
1008175a92
|
Removing commented code
|
2017-12-11 09:28:33 -08:00 |
|
samcake
|
b4f7433042
|
removing .f for a float in shader
|
2017-12-11 09:26:43 -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 |
|
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 |
|