2998 commits

Author	SHA1	Message	Date
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
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
howard-stearns	1575119327	PR feedback	2017-11-27 10:46:57 -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
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
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
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
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
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
H Q	21a28827c9	Remaining coding style changes, other small fixes	2017-11-17 07:59:52 -08:00
H Q	14890495a2	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet ... Syncing	2017-11-16 12:38:45 -08:00
H Q	27350ddbfc	Coding style corrections	2017-11-16 12:35:00 -08:00
Andrew Meadows	d538a9aaa8	fix typo making cylinders collide as sphere	2017-11-15 09:04:04 -08:00
H Q	0db9e876d6	Merge branch 'master' of https://github.com/highfidelity/hifi into ECWallet	2017-11-14 15:40:44 -08:00
H Q	44f2c92d30	Final ECSDA and nonce modifications for this dev cycle	2017-11-14 15:40:29 -08:00
David Rowe	2c542b73a0	Fix particles emitter rendering not updating when edit textures URL	2017-11-10 10:22:35 +13: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
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
ZappoMan	74ceab1e68	fix mac and unic build	2017-11-02 19:30:39 -07:00
ZappoMan	baff900839	cleanup some writeLocks	2017-11-02 17:46:15 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
ZappoMan	53c6eeb58b	updatePosition now setPosition	2017-11-02 15:58:50 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Zach Fox	bb1ffbc06f	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests	2017-11-01 12:38:34 -07:00
Zach Fox	b335ba9a75	Timeout timer	2017-11-01 11:34:29 -07:00
Zach Fox	8a6a744099	It's working	2017-11-01 10:46:13 -07:00
David Rowe	328fc29bc5	Fix serverScripts not being able to see entities in parent/child tree	2017-11-01 17:01:19 +13:00
Zach Fox	93308dfcd3	Why did I think this would work before?	2017-10-31 16:21:10 -07:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Zach Fox	e9c144892a	Fixes	2017-10-31 13:11:32 -07:00
Zach Fox	f5ada4fe62	Will it compile?	2017-10-31 12:33:28 -07:00
Zach Fox	6f96e0c7bd	More progress	2017-10-31 12:14:12 -07:00