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
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
Zach Fox
373ef6c6ce
Progress?
2017-12-21 16:32:20 -08:00
Zach Fox
a2f2c23337
Change three lines of code. Fix one thing. Break another.
2017-12-21 16:32:15 -08:00
Zach Fox
2acea75db3
Commerce: Checkout Layout Revisions
2017-12-21 16:09:46 -08:00
Zach Fox
618e5c9032
Commerce Data Tracking: Iteration 3 (Purchases)
2017-12-21 15:46:01 -08:00
Stephen Birarda
05b45f2e7e
adjust example and add clarifying comments to PrioritySortUtil
2017-12-21 15:40:08 -08:00
Stephen Birarda
7bf0cc2f63
cleanup other ref returns of shared pointers from sortables
2017-12-21 15:39:14 -08:00
Zach Fox
73eb258e79
IT'S WORKING!!!
2017-12-21 15:17:52 -08:00
Stephen Birarda
18993a8f72
fix for AvatarData retrieval from SortableAvatar in PriorityQueue
2017-12-21 15:11:34 -08:00
MiladNazeri
91d485ff6d
Merge pull request #11866 from chamberlainjoshuam/patch-2
...
Create BUILD_LINUX_CHEATSHEET.md
2017-12-21 14:55:05 -08:00
SamGondelman
69c1c65eb8
get rid of _model completely
2017-12-21 14:08:21 -08:00
Zach Fox
e963673409
Progress?
2017-12-21 14:08:18 -08:00
vladest
7985c39f2a
Adopt path to certain Tablet dialogs to new loading subsystem and path resolver
2017-12-21 22:14:15 +01:00
Alexander Ivash
bd3a056f4e
rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict
...
note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope
2017-12-21 20:03:38 +00:00
Stephen Birarda
31e9f26772
fix use after free of pending message
2017-12-21 11:35:11 -08:00
David Back
fd297f1c03
convert negative relative indices to absolute indices
2017-12-21 10:36:41 -08:00
vladest
2bca0939b3
Preliminary proxy model
2017-12-21 19:32:13 +01:00
Brad Davis
26291e0a75
PR feedback
2017-12-21 07:29:29 -08:00
vladest
d6e1a3ea41
Merge conflicts solved
2017-12-21 09:02:04 +01:00
Brad Hefta-Gaub
15fcf66d0e
Merge pull request #12022 from AndrewMeadows/lod-auto-adjust-002
...
more responsive LOD auto-adjust
2017-12-20 19:23:39 -08:00
