3059 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
Clément Brisset	d6bc41db60	Merge pull request #12075 from highfidelity/stable ... Stable merge back into master	2018-01-02 13:24:03 -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
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
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
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	73eb258e79	IT'S WORKING!!!	2017-12-21 15:17:52 -08:00
Zach Fox	e963673409	Progress?	2017-12-21 14:08:18 -08:00
Zach Fox	b30d3fcc12	Change three lines of code. Fix one thing. Break another.	2017-12-20 15:40:10 -08:00
Andrew Meadows	bad2c1df76	proper modulus of animation frame	2017-12-19 10:40:17 -08:00
Seth Alves	63ac426bf2	fix logic that resets own-avatar collisions after a parenting grab is released	2017-12-19 08:13:44 -08:00
Seth Alves	ca45c4e8da	fix logic that resets own-avatar collisions after a parenting grab is released	2017-12-18 17:30:56 -08:00
Zach Fox	a2fe2797ff	Merge pull request #11982 from zfox23/commerce_staticCertVersioning ... Commerce: staticCertificateVersion; Seal serverScripts JSON property; getStaticCertificateJSON()	2017-12-18 15:20:23 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js ... Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Brad Hefta-Gaub	5087893097	Merge pull request #11804 from amantley/character_entity_fixes ... Fixed Entity Animation Property not applying to FBXs	2017-12-15 15:31:11 -08:00
amantley	5bc113c818	deleted some debug print statements in ModelEntityItemcpp and deleted else statement that was superfluous	2017-12-13 19:07:23 -08:00
Zach Fox	4980c769c0	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_staticCertVersioning	2017-12-13 17:30:19 -08:00
Zach Fox	d388ca5ac9	Missed a spot. That was the problem the whole time.	2017-12-13 11:22:31 -08:00
Zach Fox	7113a72f2e	Bugfixes	2017-12-12 18:04:20 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Zach Fox	bced55801d	ABC ORDER!	2017-12-12 15:52:35 -08:00
Zach Fox	f5df83667f	Add getStaticCertificateJSON() to Entity Scripting Interface	2017-12-12 15:50:04 -08:00
Zach Fox	1bd12857ef	Add static certificate JSON versioning; add serverScripts to cert JSON	2017-12-12 12:07:08 -08:00
amantley	079d9639e4	Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp	2017-12-12 09:12:11 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the ... while loop.	2017-12-12 09:06:43 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Seth Alves	c4b2422f53	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 19:40:52 -08:00
David Kelly	42b509639b	Fix certificate hash	2017-12-07 17:22:00 -08:00
Seth Alves	40412b80c6	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 17:03:04 -08:00
Dante Ruiz	0f3a70553c	fix dynamic entities that are parented to your avatar	2017-12-06 11:18:15 -08:00
Dante Ruiz	8af1d8d8d0	dont run code if not nesscassry	2017-12-05 15:48:09 -08:00
Dante Ruiz	c58286d371	dont do work if not needed	2017-12-05 09:31:35 -08:00
Dante Ruiz	486cdf14d2	make sure that NO_BOOTSTRAPPING is disbaled correctly if parent is changed	2017-12-04 15:34:53 -08:00
Dante Ruiz	a1bf54ff00	fix issue of no_bootstrapping not being set correctly	2017-12-04 11:16:41 -08:00
Dante Ruiz	03934549cc	Merge branch 'master' of github.com:highfidelity/hifi into fix-collision-mask-for-children	2017-12-04 09:08:11 -08:00
Seth Alves	b590cd5b89	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
Dante Ruiz	1e6b5c0c75	make requested changes	2017-12-01 17:09:00 -08:00
Dante Ruiz	a1d90b5dd9	added extra bit	2017-12-01 15:41:13 -08:00
ZappoMan	750d505f9b	fix issues in model import sizing caused by recent refactor	2017-11-30 17:51:59 -08:00
Bradley Austin Davis	59aea9c401	Merge pull request #11862 from jherico/android_nov ... Make buildable APK from Gradle	2017-11-30 11:23:29 -08:00
howard-stearns	57ec73bb13	spacing	2017-11-29 14:37:20 -08:00
amantley	233d693d76	removed debug print statements and fixed negative FPS handling	2017-11-29 10:51:04 -08:00
amantley	778d98f56b	made some changes to fix coding standard problems in the code, also added the update for the EntityItem base class to the update function	2017-11-28 18:42:03 -08:00
howard-stearns	281b4cfd88	Merge branch 'master' of https://github.com/highfidelity/hifi into the-lost-ECDSA	2017-11-28 16:59:44 -08:00