3355 commits

Author	SHA1	Message	Date
SamGondelman	527d71c379	CR	2018-04-17 10:58:54 -07:00
SamGondelman	c8afaf27e5	Merge remote-tracking branch 'upstream/master' into scaleAssert	2018-04-13 17:30:03 -07:00
SamGondelman	b71a06a18e	min dim = 1 mm	2018-04-13 15:26:37 -07:00
John Conklin II	98f6899c3d	Merge pull request #12839 from SamGondelman/matMigrate ... Migrate materials from userData to materialData	2018-04-12 18:24:33 -07:00
John Conklin II	ec10fcb7b7	Merge pull request #12868 from SamGondelman/missingAlpha ... Fix for missing alpha on server restart	2018-04-12 16:42:34 -07:00
John Conklin II	67a8e6c82e	Merge pull request #12824 from SamGondelman/matFix ... Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch	2018-04-12 15:30:11 -07:00
John Conklin II	40ae2913eb	Merge pull request #12847 from SamGondelman/clientMat ... Fix client-only materials on non-avatars	2018-04-12 14:53:34 -07:00
SamGondelman	284364683d	Merge remote-tracking branch 'upstream/master' into scaleAssert	2018-04-12 14:46:40 -07:00
SamGondelman	9f3a431c5d	minimum entity dimension	2018-04-12 14:12:52 -07:00
John Conklin II	1834325970	Merge pull request #12788 from sethalves/fix-immediate-last-edited-by ... set lastEditedBy in local tree whenever a script adds or edits an entity	2018-04-12 13:02:05 -07:00
John Conklin II	e47dca77ec	Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership ... entity-server will expire stale simulation ownership	2018-04-12 12:04:52 -07:00
John Conklin II	5c26166bd6	Merge pull request #12841 from SamGondelman/simAssert ... Fix asserts on domain switch	2018-04-11 16:02:45 -07:00
SamGondelman	3270409b7b	possible fix for missing alpha on server restart	2018-04-11 14:06:30 -07:00
John Conklin II	88a151481d	Merge pull request #12763 from sethalves/ess-can-edit-localX ... allow ESS to make relative-to-parent edits when entity is not in ESS's octree	2018-04-11 12:08:35 -07:00
Andrew Meadows	a0f3e3a031	add simulation ownership expiry	2018-04-11 09:40:32 -07:00
SamGondelman	bba47ba2b4	materials on client only entities	2018-04-10 11:35:24 -07:00
SamGondelman	8f65813924	fix asserts on domain switch	2018-04-09 17:10:49 -07:00
SamGondelman	9b07880aab	migrate materials from userData to materialData	2018-04-09 12:49:03 -07:00
SamGondelman	5503c7909a	fix materials not disappearing on deletion in certain cases	2018-04-06 15:18:21 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
Seth Alves	2545e67b14	set lastEditedBy in local tree whenever a script adds or edits an entity	2018-04-04 12:27:41 -07:00
Seth Alves	db82c464eb	Merge pull request #12741 from ctrlaltdavid/21816 ... Remove Entities.currentAvatarEnergy and related from the API	2018-04-04 08:07:46 -07:00
Andrew Meadows	d57cb0b5d7	use list.empty() instead of comparing list.size()	2018-04-03 22:15:57 -07:00
Andrew Meadows	6d7574cab9	use std::numeric_limtis<uint64_t>::max() instead of -1	2018-04-03 22:13:25 -07:00
Andrew Meadows	70d6aa99e8	more 'const uint64_t&' purges	2018-04-03 21:55:31 -07:00
Seth Alves	71d6dbf9bf	allow ESS to edit local version of properties even if the entity isn't in the ESS's local octree	2018-04-02 15:52:28 -07:00
Andrew Meadows	5a5376c3d5	untangle 'bidding' from 'owned'	2018-03-30 13:18:32 -07:00
Andrew Meadows	dcf5110caa	clarify hardcoded constant	2018-03-30 13:18:32 -07:00
Andrew Meadows	4e0f307dc0	quint8 --> uint8_t	2018-03-30 13:18:32 -07:00
Andrew Meadows	d6ac294f39	use uint8_t instead of quint8	2018-03-30 13:18:32 -07:00
Andrew Meadows	4501033861	add description of simulation ownership rules	2018-03-30 13:18:32 -07:00
Andrew Meadows	6746e08206	faster EntitySimulation::takeDeadEntities()	2018-03-30 13:18:32 -07:00
Andrew Meadows	e1d2a5e5f3	more cleanup for deleting entities	2018-03-30 13:18:32 -07:00
Andrew Meadows	5854a36ff7	more correct handling of simulated entity	2018-03-30 13:18:32 -07:00
Andrew Meadows	a05c753e03	only process changed entities when simulated	2018-03-30 13:18:32 -07:00
Andrew Meadows	738e1267ab	small optimization in EntitySimulation::changeEntity()	2018-03-30 13:18:32 -07:00
Andrew Meadows	f20c9d3c5b	EntitySimulation::removeEntityInternal isn't pure virtual	2018-03-30 13:18:32 -07:00
Andrew Meadows	5649748b17	make EntitySimulation::changeEntityInternal() pure virtual	2018-03-30 13:18:32 -07:00
Andrew Meadows	bd434e3f18	make EntitySimulation::addEntityInternal() pure virtual	2018-03-30 13:18:32 -07:00
Andrew Meadows	6837d042ad	move entityCollisionWithEntity to PhysicalEntitySimulation	2018-03-30 13:18:32 -07:00
David Rowe	7027ccb6d8	Remove unused code	2018-03-30 09:35:25 +13:00
David Rowe	3b90078097	Remove Entities.currentAvatarEnergy and related from the API	2018-03-30 08:36:18 +13:00
SamGondelman	afe39aba46	fix octal code char issue	2018-03-29 10:05:08 -07:00
John Conklin II	0bc23456c3	Merge pull request #12682 from ctrlaltdavid/21807 ... JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-22 17:55:45 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
David Rowe	541d798a6b	Update code comment	2018-03-20 09:53:57 +13:00
David Rowe	4b52c21d1c	JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-20 09:51:10 +13:00
SamGondelman	8ddf360c79	support relative paths for material images	2018-03-19 09:59:11 -07:00
Seth Alves	98e9f1168a	allow href to be set to a serverless domain	2018-03-16 10:50:03 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00