25075 commits

Author	SHA1	Message	Date
David Rowe	dba16c265c	PickRay JSDoc	2017-11-12 13:50:07 +13:00
David Rowe	e4daaa8d67	ViewFrustum JSDoc	2017-11-12 12:50:39 +13:00
David Rowe	a2ece7a3ad	Initial, placeholder JSDoc for Uuid	2017-11-12 12:02:58 +13:00
David Rowe	9d9f684af5	Tidying	2017-11-12 11:44:51 +13:00
David Rowe	39ccd7d656	Update JSDoc for Camera API	2017-11-12 11:04:35 +13:00
David Rowe	f5e155bf94	Expand Menu's JSDoc	2017-11-11 17:01:55 +13:00
David Rowe	c8734ccd63	Menu JSDoc improvements	2017-11-11 16:18:05 +13:00
David Rowe	c77a12f5fa	Update Clipboard and Menu JSDoc to use JavaScript type names	2017-11-11 07:55:57 +13:00
David Rowe	036ac8de6d	Update JSDoc for Menu JavaScript API	2017-11-10 21:55:42 +13:00
Anthony Thibault	de9eeff7d2	Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer ... Fix for address sanitizer warning	2017-11-09 14:19:03 -08:00
Anthony J. Thibault	9724a5e5b8	Fix for address sanitizer warning ... This fixes a potential null pointer dereference.	2017-11-09 10:53:36 -08:00
Brad Hefta-Gaub	d608d6ebf4	Merge pull request #11763 from Atlante45/new-master ... Merge stable back into master	2017-11-08 15:10:06 -08:00
Seth Alves	34500fdf18	Merge pull request #11773 from vladest/fix_avatar_new_attachment ... Remove checking of empty model url and add sanity for checking modelU…	2017-11-08 14:15:17 -08:00
vladest	6685b74c2a	Remove checking of empty model url and add sanity for checking modelUrl field existing	2017-11-08 21:23:50 +01:00
samcake	af1180255e	fixes from code review	2017-11-08 11:45:40 -08:00
samcake	75ce61c3a6	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-08 11:30:53 -08:00
Sam Gateau	3ef9ce0af6	Merge pull request #11732 from NissimHadar/hazeMaskFix ... Haze mask fix	2017-11-07 17:37:24 -08:00
samcake	0718763ed1	Adjust syntax	2017-11-07 17:31:15 -08:00
Atlante45	8a903c8b12	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-11-07 14:26:25 -08:00
samcake	6481e0f713	Address cauterized cluster matrices issue	2017-11-07 12:52:23 -08:00
samcake	5ca3113709	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-07 10:42:28 -08:00
Clément Brisset	85efe5265d	Merge pull request #11724 from ctrlaltdavid/21580 ... Fix serverScripts not being able to see entities in parent/child tree	2017-11-07 10:36:20 -08:00
Seth Alves	7c6b5081d6	Merge pull request #11725 from luiscuenca/case8270 ... 8270 Changing avatars while sitting - restore animations	2017-11-07 09:55:06 -08:00
samcake	f665bf384b	merge with upstream, and clean code	2017-11-06 17:02:10 -08:00
samcake	eaed02b144	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-06 13:52:05 -08:00
samcake	dfa4afc7f6	and again, clean up	2017-11-06 12:47:34 -08:00
samcake	9652902911	Removing the changes that i introduced by mistake from another branch :((((	2017-11-06 12:43:22 -08:00
samcake	d878fac62c	REverse changes	2017-11-06 11:25:02 -08:00
Sam Gateau	45e5d91b9d	Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model	2017-11-04 20:49:55 -07:00
David Rowe	05275afb4f	Resending full scene is not necessary after all	2017-11-05 15:48:02 +13:00
David Rowe	2d27a6cf4c	Merge branch 'master' into 21580	2017-11-05 13:59:43 +13:00
ZappoMan	d4b4d188ed	allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU	2017-11-04 13:40:41 -07:00
Sam Gateau	7da69633f3	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-03 20:20:53 -07:00
samcake	053052a95d	removing warnings	2017-11-03 13:28:20 -07:00
Brad Hefta-Gaub	d5eb670819	Merge pull request #11746 from highfidelity/RC-58 ... Merge RC58 into master	2017-11-03 12:50:02 -07:00
Melissa Brown	a14e98053e	Merge pull request #11138 from Nex-Pro/21466 ... Fix Avatar Rotation upon Teleporting Using PAL	2017-11-03 11:58:15 -07:00
John Conklin II	c946e46506	Merge pull request #11737 from AndrewMeadows/scale-to-fit_RC-58 ... RC-58: scaleToFit() the model before updating render items	2017-11-03 09:46:20 -07:00
Sam Gateau	390f5b53ca	cleaning more code	2017-11-02 23:55:44 -07:00
Sam Gateau	c11f46a8d3	cleaning more code	2017-11-02 23:35:18 -07:00
Sam Gateau	421aacd8eb	Yes	2017-11-02 22:45:19 -07:00
Sam Gateau	70134d67eb	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 19:49:22 -07:00
Sam Gateau	f097d66721	YEp it s working	2017-11-02 19:49:01 -07:00
samcake	d33c75865e	Removing unecessary test	2017-11-02 18:11:13 -07:00
samcake	83bfa1c5f2	Progressing on the cluster updates	2017-11-02 17:57:46 -07:00
Brad Hefta-Gaub	6dbffe2367	Merge pull request #11736 from AndrewMeadows/scale-to-fit ... scaleToFit() the model before updating render items	2017-11-02 17:49:05 -07:00
John Conklin II	b990b4f3e0	Merge pull request #11726 from NissimHadar/newHazeZoneUpdate ... RC-58: Fix entity serialization bug due to Zone Haze group properties	2017-11-02 16:40:01 -07:00
John Conklin II	a4e6b2911d	Merge pull request #11734 from highfidelity/stable ... Make sure RC-58 is up to date with stable	2017-11-02 16:39:27 -07:00
Zach Fox	48979a5ce8	Merge pull request #11730 from zfox23/pop_avatarEntityTests ... Commerce: Avatar Entity Tests	2017-11-02 15:34:37 -07:00
samcake	84ad1ab266	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-02 15:04:43 -07:00
Stephen Birarda	25c10d5de2	Merge pull request #11735 from highfidelity/stable ... Merge stable back into master	2017-11-02 14:22:31 -07:00