Commit graph

74169 commits

Author SHA1 Message Date
Clement
c29f6346d8 Clear mixing structures when we stop mixing for node 2018-11-28 16:09:04 -08:00
Jeff Clinton
f98f070c8b
Merge pull request #14445 from danteruiz/fix-stylus-dimensions
fixing keyboard mallets dimensions
2018-11-28 14:19:53 -08:00
David Rowe
1683179fe5 Remove unused constant 2018-11-29 09:14:10 +13:00
Seth Alves
0de011dd71
Merge pull request #14478 from danteruiz/ScriptEngine-Crashes
Fix script engine crashes when reloading scripts.
2018-11-28 12:04:52 -08:00
Shannon Romano
ff934a8f87
Merge pull request #14394 from sabrina-shanman/hfm_serializer
(case 20005) Create HFMSerializer interface for model loaders
2018-11-28 11:10:27 -08:00
Dante Ruiz
8be775c2b7 don't save joint information for avatar entities 2018-11-28 10:54:39 -08:00
Zach Fox
022fea107f
Merge pull request #14476 from zfox23/payIn1
Pay-In API Frontend, Part One
2018-11-28 10:32:01 -08:00
Sam Gateau
ba4aec2aff Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf 2018-11-28 01:01:18 -08:00
Sam Gateau
199fe2178d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-11-27 18:13:31 -08:00
NissimHadar
59a030a16f Correct message to user. 2018-11-27 17:41:00 -08:00
NissimHadar
4effd365ed Change "Autotester" to "nitpick". 2018-11-27 17:34:17 -08:00
NissimHadar
57ba50fa96 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-27 17:17:50 -08:00
Seth Alves
fac27553d7 suppress 'No instance available' messages during shutdown. try a different way of shutting down AudioClient. 2018-11-27 17:02:48 -08:00
Zach Fox
a4175b0428 Error handling in checkout 2018-11-27 14:17:28 -08:00
Jeff Clinton
fd87aad3c2
Merge pull request #14465 from sethalves/fix-up-disable-qml
make cmake -DDISABLE_QML=1 work again
2018-11-27 14:16:25 -08:00
Seth Alves
8f21ade0c7 make cmake -DDISABLE_QML=1 work again 2018-11-27 12:41:40 -08:00
Shannon Romano
d6c7027fea
Merge pull request #14437 from sethalves/fix-asan-shared-lib-problem
fix linux + clang build when memory debugging is enabled
2018-11-27 12:25:13 -08:00
Dante Ruiz
29028386c8 Keyboard menu option in general settings 2018-11-27 11:56:07 -08:00
Sam Gateau
87730884ab
Merge pull request #14340 from Nex-Pro/patch-5
Change to English spelling of 'declination'
2018-11-27 10:53:28 -08:00
Dante Ruiz
9cc896c4a8 fixing keyboard mallets dimensions 2018-11-27 10:34:34 -08:00
Zach Fox
67dfccafec Show item name when sending item 2018-11-27 10:19:14 -08:00
Dante Ruiz
c4a9ca3445 fix interface crashing when reloading scripts 2018-11-27 09:32:37 -08:00
NissimHadar
d6a4f89a08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 19:36:01 -08:00
NissimHadar
4700b94f28 Merge branch 'master' of https://github.com/highfidelity/hifi into 19991-MacAppData 2018-11-26 18:11:20 -08:00
NissimHadar
aed947cb0a Minor cleanup. 2018-11-26 18:10:41 -08:00
NissimHadar
5da6ecad12 Compilation error. 2018-11-26 18:10:14 -08:00
NissimHadar
f9954990dd Merge branch '19991-MacAppData' of github.com:NissimHadar/hifi into 19991-MacAppData 2018-11-26 16:43:36 -08:00
NissimHadar
e7ab7094cd Kill Hifi processes after evaluation. 2018-11-26 16:42:48 -08:00
NissimHadar
e587820de3 Should be v1.0 2018-11-26 16:18:43 -08:00
NissimHadar
c211dc363b Updated README.md 2018-11-26 16:05:49 -08:00
NissimHadar
ebc7875f5e Updated README.md 2018-11-26 16:03:40 -08:00
Zach Fox
a9fd443f28 'improve' UI slightly 2018-11-26 16:03:07 -08:00
NissimHadar
2ade0078f4 Updated README.md 2018-11-26 16:02:22 -08:00
NissimHadar
e943504f60 Updated README.md 2018-11-26 15:59:08 -08:00
Zach Fox
31f7d747c8 Bugfixes; enable purchase asset from marketplace screen raise 2018-11-26 15:48:49 -08:00
sam gateau
f348cc35c4 separting debug in its own task 2018-11-26 15:20:45 -08:00
Antonina Savinova
d547a29f94
Merge pull request #14438 from birarda/bug/update-wireshark-dissectors
update wireshark dissector with correct control packet types
2018-11-26 13:55:14 -08:00
Shannon Romano
422045861a
Merge pull request #14471 from jherico/fix/macbuild
Make vcpkg build default to home directory on mac
2018-11-26 13:30:06 -08:00
Zach Fox
8df5db4239 Allow scripts to open SendAsset screen with pre-filled info 2018-11-26 13:26:17 -08:00
Brad Davis
43b9aa29bc Make vcpkg build default to home directory on mac 2018-11-26 12:37:11 -08:00
Ryan Huffman
a6e203e3e5 Fix draggable inputs not being tabbable 2018-11-26 11:12:14 -08:00
NissimHadar
48fabf51f2 Corrected Linux compilation error. 2018-11-26 08:54:09 -08:00
NissimHadar
f4f1ac8f02 Merge branch '19991-MacAppData' of https://github.com/NissimHadar/hifi into 19991-MacAppData 2018-11-26 08:25:54 -08:00
NissimHadar
2913d4f984 Removed baaaaaad file. 2018-11-26 08:25:07 -08:00
Sam Gateau
b7b8e8e6bf Trying to group together the debug jobs in a separate task 2018-11-26 00:38:04 -08:00
Sam Gateau
f9fb4b61c1 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-11-25 22:40:06 -08:00
NissimHadar
6313ab8ed7 Working on possible crash on Mac. 2018-11-25 20:10:01 -08:00
NissimHadar
e173b29687 Added warning 2018-11-24 20:43:13 -08:00
NissimHadar
26319e6d6f Remove all disk images 2018-11-24 20:37:21 -08:00
NissimHadar
bbbc358ccb Restore AppData folder on Mac 2018-11-24 20:31:19 -08:00