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 |
|
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 |
|
amantley
|
7e49ce26d7
|
Merge remote-tracking branch 'origin/master' into character_entity_fixes
updating branch to the master
|
2017-12-11 08:02:33 -08:00 |
|
Olivier Prat
|
b9d49318e7
|
Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection
|
2017-12-11 12:19:10 +01: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 |
|
Olivier Prat
|
a679dc6705
|
Merge branch 'master' of git://github.com/highfidelity/hifi into csm
|
2017-12-11 08:48:48 +01:00 |
|
Sam Gateau
|
bb888f2d4c
|
Replace the name opacity for alpha
|
2017-12-10 23:07:06 -08:00 |
|
humbletim
|
4374b4f9a8
|
forward MIDI_CONTROL_CHANGE events
|
2017-12-11 00:39:23 -05: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 |
|
Alexander Ivash
|
cb471582e5
|
10334 Unable to type in Go To app search bar after UI reappears from moving Avatar
|
2017-12-10 01:34:03 +03: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 |
|
Daniela Fontes
|
46583a90be
|
Change abs to fabsf and other corrections requested.
|
2017-12-09 00:14:36 +00: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 |
|
samcake
|
9a4f667059
|
Merge branch 'master' of https://github.com/highfidelity/hifi into light
|
2017-12-08 08:50: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 |
|
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 |
|