3030 commits

Author	SHA1	Message	Date
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
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22: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
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
David Kelly	42b509639b	Fix certificate hash	2017-12-07 17:22:00 -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
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
Bradley Austin Davis	e4220aa44e	Fixing warnings in android build	2017-11-28 14:32:30 -08:00
amantley	101e67498a	cleaned up the code to remove _currentFrame updating in RenderModelEntityItem also removed the unnessary currently playing frame property	2017-11-28 14:11:56 -08:00
amantley	1eacf7cbda	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... This is to update the branch with the master branch	2017-11-28 11:41:29 -08:00
amantley	d607ca0914	initialize the _lastAnimated time when the modelEntityRenderer is instantiated, this fixes the sync between interface and the server	2017-11-28 11:04:48 -08:00
howard-stearns	1575119327	PR feedback	2017-11-27 10:46:57 -08:00
amantley	522dc3dfb1	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating Character entity fixes branch with the changes in the origin master	2017-11-22 17:55:39 -08:00
amantley	2e75016021	changes to modelEntity.cpp	2017-11-22 17:53:21 -08:00
amantley	fdf5139a74	everything now works with an atomic start time property. but now I will get rid of this and use current frame instead	2017-11-22 17:52:13 -08:00
howard-stearns	a6b437a79f	get rid of "error" warning because the key wasn't broken into 64 char ... lines	2017-11-22 16:55:57 -08:00
Seth Alves	9ccc416e80	avoid a crash during domain change	2017-11-22 16:34:56 -08:00
howard-stearns	abf41300dd	refactor	2017-11-22 16:29:56 -08:00
howard-stearns	899999a4c6	fix up dynamic ownership challenge	2017-11-22 15:58:30 -08:00
amantley	1e5d099b06	changed the currentlyplayingframe property so that it is updated in RenderableModelEntity.cpp now. Remains to remove everything but initializing currentlyPlayingFrame in ModelEntityRender.cpp	2017-11-21 17:36:01 -08:00
howard-stearns	ca80c9b764	Merge branch 'ECWallet' of https://github.com/MandatoryMania/hifi into MandatoryMania-ECWallet	2017-11-21 16:28:08 -08:00
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
amantley	5a1d04ee06	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating the branch with the current master	2017-11-20 10:22:46 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
amantley	befa0f8ab5	now the update frame is only happening in the assignment client code. added setCurrentlyPlayingFrame to ModelEntityItem.cpp	2017-11-20 09:11:15 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	ebac2556e4	Merge pull request #11841 from ZappoMan/makeAddEntityAtomic ... Make add entity atomic	2017-11-18 14:27:12 -08:00
amantley	013d16cee9	this is the change to add a property for the currentframeplaying	2017-11-17 18:37:54 -08:00
ZappoMan	71a46a3374	cleanup	2017-11-17 13:03:04 -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
Thijs Wenker	3c37bf8acd	parentJointName property experiment	2017-11-17 20:33:06 +01:00
Andrew Meadows	98001b64d9	Merge pull request #11788 from ctrlaltdavid/21579-a ... Particles emitter fixes	2017-11-17 11:31:12 -08:00
H Q	28eedd1a94	Small style mod	2017-11-17 11:30:21 -08:00