61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
Brad Hefta-Gaub	a85a6f6795	Merge pull request #11308 from luiscuenca/patch-1 ... glTF import DEMO	2017-11-17 14:52:51 -08:00
John Conklin II	24e0d5ba67	Merge pull request #11846 from marko8904/master ... Updated the README with CLA details.	2017-11-17 14:08:43 -08:00
ZappoMan	71a46a3374	cleanup	2017-11-17 13:03:04 -08:00
Zach Fox	4cc8db8aff	Merge pull request #11843 from zfox23/commerce_fixMyItems ... Fix 'My Items' display	2017-11-17 12:59:51 -08:00
Stephen Birarda	239b116874	Merge pull request #11835 from birarda/bug/octree-connection-id ... Reset EntityTreeSendThread known state if client disconnects from Entity Server	2017-11-17 12:56:25 -08:00
luiscuenca	df51d66f60	no double scaling and comments	2017-11-17 13:40:22 -07:00
Brad Hefta-Gaub	f5bb29f767	Merge pull request #11842 from birarda/networking-api-info ... clarify the send packet list APIs	2017-11-17 12:30:09 -08:00
Dante Ruiz	8f6c781014	Merge pull request #11831 from misslivirose/feat/scale-emit-hands ... Emit avatar scale changed signal when scaled with hand controllers	2017-11-17 11:55:31 -08:00
Dante Ruiz	4de0fdf7d1	Merge pull request #11768 from ctrlaltdavid/21596 ... Add instructions and cursor to GOTO dialog input	2017-11-17 11:45:40 -08:00
luiscuenca	bbf5e3b023	simplifications and comments	2017-11-17 12:45:36 -07:00
Thijs Wenker	3c37bf8acd	parentJointName property experiment	2017-11-17 20:33:06 +01:00
Dante Ruiz	4bbf2ff482	near grab entity while stylus is showing	2017-11-17 11:32:02 -08:00
Andrew Meadows	98001b64d9	Merge pull request #11788 from ctrlaltdavid/21579-a ... Particles emitter fixes	2017-11-17 11:31:12 -08:00
Zach Fox	f570e3c874	Fix 'My Items' display	2017-11-17 11:27:00 -08:00
Andrew Meadows	6a784794c9	Merge pull request #11789 from ctrlaltdavid/21599 ... Don't remove entities from list when try to delete locked entity	2017-11-17 11:26:00 -08:00
Stephen Birarda	16d93ee168	clarify signatures in LNL to send packet lists	2017-11-17 11:17:11 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
Stephen Birarda	dd27e3db31	add diff traversal reset when resetting state	2017-11-17 09:44:35 -08:00
ZappoMan	cd0fa989e1	debugging	2017-11-17 08:55:55 -08:00
Andrew Meadows	d207803f26	Merge pull request #11837 from SamGondelman/hOverlay ... Fix tablet home button highlight overlay dimensions	2017-11-17 08:25:27 -08:00
David Rowe	a33162d7ff	Fix typo in Base3DOverlay "filled" property	2017-11-17 21:07:43 +13:00
Sam Gateau	0178c490db	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-16 18:21:00 -08:00
Zach Fox	57c86c3035	Merge pull request #11836 from zfox23/commerce_fixStepSkip ... Fix skipping wallet setup step in certain cases	2017-11-16 16:01:10 -08:00
SamGondelman	b252c81d84	fix home button hover overlay dimensions	2017-11-16 15:34:42 -08:00
Dante Ruiz	b66153b9cb	fixing setting incorrect parent	2017-11-16 15:07:00 -08:00
Ryan Downe Karpf	c255e29fa5	Merge pull request #11828 from luiscuenca/pr-for-rc-59 ... Fix not restoring animations after changing view modes RC59	2017-11-16 14:19:12 -08:00
ZappoMan	e438ac54d5	make adds go over NLPacketList as reliable	2017-11-16 13:16:23 -08:00
samcake	bafa82f6c5	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-16 12:12:04 -08:00
Zach Fox	7f64ede940	Fix skipping wallet setup step in certain cases	2017-11-16 11:44:52 -08:00
David Back	abba965328	todo comment	2017-11-16 11:41:28 -08:00
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08:00
John Conklin II	b5d4f6c65f	Merge pull request #11826 from jherico/bug/fb9107 ... Fix for black screen on HMDs on startup	2017-11-16 11:32:20 -08:00
John Conklin II	d4afd7fa0d	Merge pull request #11827 from jherico/bug/fb9107_rc59 ... Fix for black screen on HMDs on startup	2017-11-16 11:22:37 -08:00
Clément Brisset	2b39cb4500	Merge pull request #11832 from highfidelity/RC59 ... Merge RC59 into master	2017-11-16 11:19:54 -08:00
Sam Gondelman	d1747060f5	Merge pull request #11722 from druiz17/ui ... Update controllerDispatcher scripts to use the new Pointers API(WIP)	2017-11-16 10:09:58 -08:00
ZappoMan	4c4f23e312	Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic	2017-11-16 10:09:46 -08:00
Dante Ruiz	f6a74cc80e	fixing merge conflicts	2017-11-16 10:04:36 -08:00
Sam Gondelman	cb2d4a5c93	Merge pull request #11779 from SamGondelman/ui ... Pointers branch: Integrated stylus	2017-11-16 09:51:43 -08:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Liv Erickson	dda32f1987	Emit scale changed signal when scaled with hand controllers	2017-11-16 09:26:42 -08:00
Dante Ruiz	94ac8e52d5	Merge pull request #11822 from druiz17/fix-tablet-3d-person ... fixing tablet in 3d person	2017-11-16 08:55:27 -08:00
Brad Davis	0755e4aa21	Fix for black screen on HMD derived display plugins	2017-11-16 08:55:10 -08:00
Brad Davis	7bbc719d79	Fix for black screen on HMD derived display plugins	2017-11-16 08:53:12 -08:00
Alexander Ivash	c5d2f598d7	8244 Rename captionColorOverride to captionColor	2017-11-16 15:46:49 +03:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -08:00
David Back	4b2ff68fa3	var name and empty line	2017-11-15 19:05:44 -08:00
David Back	9bfbcb4434	code review updates	2017-11-15 18:06:49 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00