Commit graph

63125 commits

Author SHA1 Message Date
Elisa Lupin-Jimenez
e1b344e36d handles empty json object return 2017-12-26 10:50:10 -08:00
David Back
904015fc13 Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes 2017-12-26 10:20:11 -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
vladest
ffcccacfa5 Selection consistency #2 2017-12-25 23:46:06 +01:00
vladest
ec591c4da0 Merge branch 'master' into tablet_home_paginate 2017-12-25 20:15:26 +01:00
vladest
cb7472c270 Selection consistency #1 2017-12-25 20:14:31 +01:00
Brad Hefta-Gaub
3d02955c5d
Merge pull request #12029 from SamGondelman/webOverlay
Fix >20 web entities crash
2017-12-24 17:10:39 -08:00
vladest
9fa78bae0d Merge branch 'master' into tablet_home_paginate 2017-12-23 17:46:51 +01:00
vladest
a497047666 Refactored using new GridView approach 2017-12-23 17:44:26 +01:00
Sam Gondelman
2898fa557e
typo 2017-12-23 00:53:11 -08:00
John Conklin II
e935844681
Merge pull request #12066 from highfidelity/RC61.1
Beta Release 61.2  - includes up to Reveloper Release 7599
2017-12-22 17:34:37 -08:00
David Back
ab5b238aea Merge branch 'mergeAccountGlobalServices' of https://github.com/dback2/hifi into mergeAccountGlobalServices 2017-12-22 17:00:17 -08:00
John Conklin II
ed28b67fab
Merge pull request #12062 from druiz17/rc-grab-fix
Fix deleted action not being sent over the network correctly - RC61.1
2017-12-22 16:43:52 -08:00
David Back
74fc703749 merge 2017-12-22 16:41:35 -08:00
David Back
01fcd453b8 Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes 2017-12-22 16:41: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
SamGondelman
c38ef77b26 fix model overlays visibility change 2017-12-22 15:04:06 -08:00
Dante Ruiz
86be684d7a delete code 2017-12-22 14:58:32 -08:00
Dante Ruiz
e316f71b31 fix grabbing 2017-12-22 14:53:48 -08:00
Zach Fox
808b9cbc31
Merge pull request #12047 from zfox23/commerce_dataTracking3
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-22 14:31:03 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor
Removed glColor reset hack in MeshPartPayload
2017-12-22 14:25:51 -08:00
Dante Ruiz
fe61d7efc7 fix spacing 2017-12-22 14:13:04 -08:00
Dante Ruiz
fb9505b880 Merge branch 'master' of github.com:highfidelity/hifi into fix-actions-not-being-deleted 2017-12-22 13:59:03 -08:00
Dante Ruiz
d74f7f846c delete dot file 2017-12-22 13:58:42 -08:00
Dante Ruiz
a1a752743a fix issue 2017-12-22 13:57:28 -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
Stephen Birarda
d299b9a56c
Merge pull request #12024 from birarda/bug/entity-sequence-skip
handle sequence number from reliably sent adds in OctreeEditPacketSender
2017-12-22 12:30:27 -08:00
Howard Stearns
fd545c3928
Merge pull request #12048 from zfox23/commerce_CheckoutLayoutRevisions
Commerce: Checkout Layout Revisions
2017-12-22 09:59:49 -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
Seth Alves
50600f87a6 Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3 2017-12-22 09:07:35 -08:00
Seth Alves
533aa3d918 code review 2017-12-22 09:07:16 -08:00
vladest
dc22b814c2 Merge branch 'master' into tablet_home_paginate 2017-12-22 17:37:33 +01: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
Olivier Prat
1d5f65b082 Updated Mesh to support map and forEach operations on colors in RGBA8 format and normals in XYZ10W2 format 2017-12-22 15:16:39 +01:00
Olivier Prat
29485b65e5 Fixed potential crash when getting mesh from voxel item 2017-12-22 14:35:19 +01:00
Olivier Prat
752952507d Fixed memory leak in ModelScriptingInterface::appendMeshes and wrong normal transformation in ModelScriptingInterface 2017-12-22 14:18:02 +01:00
Olivier Prat
40f83a6768 Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb 2017-12-22 11:28:34 +01:00
John Conklin II
79ccdaca42
Merge pull request #12050 from highfidelity/RC61.1
Beta Release 61.1 - Includes up to Developer Release 7593
2017-12-21 21:44:34 -08:00
Stephen Birarda
072e818c99
Merge pull request #12053 from birarda/bug/61-1-protocol-version
RC61.1: Manually push OwnershipChallengeFix to 3 (to avoid StaticCertJsonVersionOne conflict)
2017-12-21 19:45:55 -08:00
Stephen Birarda
95c7f876bf manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne 2017-12-21 18:52:01 -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
John Conklin II
2791217e8d
Merge pull request #12045 from birarda/bug/jimjamz-issues
Fix for invisible or stuttering avatars, PendingReceivedMessage use after free
2017-12-21 17:03:14 -08:00
Zach Fox
ef71470d85 Small change 2017-12-21 17:03:04 -08:00
David Back
f800a6d6fc scale change 2017-12-21 17:00:27 -08:00
Zach Fox
07a1cf434a IT'S WORKING!!! 2017-12-21 16:33:47 -08:00