3527 commits

Author	SHA1	Message	Date
SamGondelman	d37a8bcd72	more jsdoc updates	2018-06-22 10:13:18 -07:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	de5fcccc7b	proper reporting of nan values in get	2018-06-19 14:22:24 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
Andrew Meadows	44c3620b6e	remove cruft	2018-06-18 17:45:58 -07:00
SamGondelman	0d34689320	spread variables jsdoc	2018-06-18 12:33:36 -07:00
SamGondelman	93fe0c60fa	correctly update bounding box based on radius and other properties	2018-06-18 11:26:09 -07:00
Andrew Meadows	6d422e4678	Merge 'master' into 'workload'	2018-06-18 10:30:13 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
SamGondelman	9ea65950d5	particles: threadsafe, cleanup, rework initialized logic	2018-06-15 15:45:06 -07:00
Andrew Meadows	be0899c41d	remove unnecessary writes to appease Xcode's static analyzer	2018-06-15 11:44:22 -07:00
Andrew Meadows	d0baa2d2a1	fix typos in simulation ownership documentation	2018-06-15 10:28:00 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
David Rowe	b5028a9626	Merge branch 'master' into 21880 ... # Conflicts: # interface./src/scripting/WindowScriptingInterface.h	2018-06-05 09:13:54 +12:00
John Conklin II	08fcad1932	Merge pull request #13227 from SamGondelman/entityMirror ... Add local-only isVisibleInSecondaryCamera flag to entities	2018-06-04 11:06:00 -07:00
Seth Alves	97b3fdfe68	make legacy collisionless property work right	2018-06-01 09:34:34 -07:00
SamGondelman	86ee5c12d8	merge and update based on sam's changes	2018-05-31 17:53:36 -07:00
John Conklin II	ec3f9549f1	Merge pull request #13172 from wayne-chen/getChildrenIDs-issue-1934 ... Fix EntityScriptingInterface::getChildrenIDs function	2018-05-31 14:27:25 -07:00
Andrew Meadows	addbb597fc	move setSpaceIndex() to cpp file for easier debugging in future	2018-05-31 10:22:39 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
David Rowe	ac0607b5ae	Review Entites.cloneEntity() JSDoc and add JSDoc for new properties	2018-05-30 10:02:10 +12:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c ... JSDoc fixes	2018-05-24 16:44:55 -07:00
Andrew Meadows	d42375e4fe	finish uint8_t to uint16_t conversion	2018-05-24 11:28:52 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
SamGondelman	e6741a363e	add local-only isVisibleInSecondaryCamera flag to entities	2018-05-23 16:35:21 -07:00
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -07:00
Liv Erickson	56493346c1	fix permissions check	2018-05-22 15:41:48 -07:00
Liv Erickson	0ebd13b3e6	cannot edit origin from client / fix ICE issue	2018-05-22 13:17:23 -07:00
David Rowe	6a75e7acb6	Fix canCastShadow property JSDoc	2018-05-23 07:11:23 +12:00
Liv Erickson	7efcc135e4	reorder flags	2018-05-22 11:03:41 -07:00
Liv Erickson	e273a0c1a6	fix define properties	2018-05-22 09:10:50 -07:00
Liv Erickson	27c2bb9046	add properties group where missing	2018-05-21 17:39:08 -07:00
Liv Erickson	a1e7f648bc	add debug properties	2018-05-21 17:14:36 -07:00
Liv Erickson	e76829bb1d	change to DEFINE_PROPERTY_REF	2018-05-21 16:51:23 -07:00
Liv Erickson	604b3cac1c	check for null entities in grab, add conversion for old userdata cloneable	2018-05-21 16:19:43 -07:00
Thijs Wenker	7f4e9a0089	style	2018-05-21 06:17:08 +02:00
Thijs Wenker	f4df75d016	CR feedback	2018-05-21 06:04:05 +02:00
Livi Erickson	70bbac5c83	update with lastEditedCheck	2018-05-20 18:49:41 -07:00
Livi Erickson	9f7b383757	address CR feedback	2018-05-20 18:22:17 -07:00
Livi Erickson	9c0084209b	fix style error, start lifetime properly for cloned entities	2018-05-20 16:41:14 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Liv Erickson	6c8d68afc6	add extra cleanup in delete messages and simulation, as a fall back	2018-05-18 18:18:42 -07:00
Liv Erickson	29b11b9101	some fixes to server cloneables	2018-05-18 17:12:41 -07:00
Andrew Meadows	c8b8d0f1c4	remove commented out cruft	2018-05-18 10:31:08 -07:00
Andrew Meadows	063c2564d1	only clear bid state when ownership actually changed	2018-05-18 10:28:45 -07:00
Andrew Meadows	a9c193b672	merge 'workload-014' into 'workload'	2018-05-18 10:12:04 -07:00
Andrew Meadows	00e360aff0	reduce sim ownership priority when releasing grab	2018-05-17 17:25:07 -07:00
Andrew Meadows	926014b43f	entity-server always promotes VOLUNTEER to RECRUIT	2018-05-17 17:24:24 -07:00