25750 commits

Author	SHA1	Message	Date
Andrew Meadows	fbe2dd8a41	remove unnecessary 'virtual' keyword	2018-01-04 14:46:16 -08:00
Andrew Meadows	13538006ec	fix bug preventing sim owenrship on local domain	2018-01-04 14:46:16 -08:00
Atlante45	294a7ca3c6	Make sure the protocol signature still changes	2018-01-04 13:15:01 -08:00
Atlante45	d4a239731c	Add Unused packet type back for ICE servers	2018-01-04 13:07:02 -08:00
Clément Brisset	efbff56f26	Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener ... Remove legacy jurisdiction code	2018-01-04 11:52:38 -08:00
Ryan Downe Karpf	eada0b1ff7	Merge pull request #11546 from vladest/tablet_home_paginate ... Tablet home paginate	2018-01-03 18:12:32 -08:00
Sam Gateau	72503ce8ba	Merge pull request #12064 from SamGondelman/overlayFix ... Fix model overlays not disappearing on visibility change	2018-01-03 11:08:24 -08:00
Clément Brisset	d6bc41db60	Merge pull request #12075 from highfidelity/stable ... Stable merge back into master	2018-01-02 13:24:03 -08:00
vladest	a84e585679	Merge	2018-01-02 21:49:00 +01:00
Atlante45	aec5ab5921	CR	2017-12-29 12:46:52 -08:00
Atlante45	28f164d7e5	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 ... avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
vladest	ec591c4da0	Merge branch 'master' into tablet_home_paginate	2017-12-25 20:15:26 +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	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
Sam Gateau	a2c16ddf6a	Merge pull request #12026 from SamGondelman/burp3 ... Remove _model from ModelMeshPartPayload	2017-12-22 13:50:06 -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	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	533aa3d918	code review	2017-12-22 09:07:16 -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
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
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	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
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
Stephen Birarda	31e9f26772	fix use after free of pending message	2017-12-21 11:35:11 -08:00
vladest	2bca0939b3	Preliminary proxy model	2017-12-21 19:32:13 +01:00
vladest	d6e1a3ea41	Merge conflicts solved	2017-12-21 09:02:04 +01:00
Andrew Meadows	5c84c5f845	measure average time of 'present'	2017-12-20 17:41:08 -08:00
Melissa Brown	fddb192af8	Merge pull request #11961 from humbletim/add-midi-control-change ... forward MIDI_CONTROL_CHANGE events	2017-12-20 17:11:08 -08:00
Zach Fox	b30d3fcc12	Change three lines of code. Fix one thing. Break another.	2017-12-20 15:40:10 -08:00
SamGondelman	2ba3e337db	cleanup	2017-12-20 14:18:01 -08:00
vladest	79f9b54f6a	Store button list in the resources section of fake item instead of C++ space	2017-12-20 22:59:07 +01:00