28607 commits

Author	SHA1	Message	Date
John Conklin II	e7d5ea561b	Merge pull request #13469 from hyperlogic/safeLandingFix4 ... Fix for landing on the roof of some domains.	2018-06-27 10:23:35 -07:00
Seth Alves	01632ddd29	Merge pull request #13345 from ctrlaltdavid/21890 ... Fix memory leak when reloading scripts	2018-06-27 09:39:53 -07:00
Sam Gondelman	7fb2e535ff	Merge pull request #13468 from SamGondelman/secondaryShadows ... Disable shadows in secondary camera	2018-06-26 15:45:44 -07:00
SamGondelman	97ee02811c	disable shadows in secondary camera	2018-06-26 12:27:59 -07:00
Dante Ruiz	d8834af749	make requested changes	2018-06-26 11:53:45 -07:00
Dante Ruiz	17f4a27ceb	Merge branch 'master' of github.com:highfidelity/hifi into fix-entity-lag-2	2018-06-26 10:55:27 -07:00
Sam Gondelman	fbe54437b8	Merge pull request #13409 from humbletim/add-raypick-shapeID ... Include shapeID in RayPick results	2018-06-26 10:25:39 -07:00
John Conklin II	0c9f0cbe03	Merge pull request #13443 from samcake/punk ... report FIx from rc69 to master: Fix for the point light test flashing in HMD	2018-06-26 08:28:03 -07:00
Andrew Meadows	ca70b865d3	Merge pull request #13452 from AndrewMeadows/avatar-entities-001 ... fix physics deactivation of avatar-entities	2018-06-25 16:18:01 -07:00
John Conklin II	0e2675e0d8	Merge pull request #13392 from roxanneskelly/roxie-bugfixes ... Remove debug logging message spam for avatar entities that have scripts	2018-06-25 10:42:43 -07:00
Anthony J. Thibault	328a485ad1	Prevent ray-picks against ModelEntity bounding boxes when loading has not yet completed.	2018-06-25 10:38:53 -07:00
Andrew Meadows	5e2a08b3c2	handle deactivation of avatar entities differently	2018-06-25 10:37:54 -07:00
Sam Gateau	7b4b6bc3b8	Same fix as the point lighting flashing for rc69 in master	2018-06-22 14:59:37 -07:00
samcake	df3d689098	Try mono threaded and profiled	2018-06-22 14:59:37 -07:00
John Conklin II	b7069fff71	Merge pull request #13382 from SamGondelman/particleFix ... Fix Particle Entities	2018-06-22 13:27:11 -07:00
Sam Gondelman	44a7d04b2a	Merge pull request #13426 from SamGondelman/avatarPriority ... Highest loading priorities for avatars and attachments	2018-06-22 11:22:10 -07:00
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
John Conklin II	4088035b3b	Merge pull request #13411 from sabrina-shanman/crash-delete-cube ... Fix crash when deleting objects in serverless mode	2018-06-21 14:39:07 -07:00
Sam Gondelman	afc64a18a1	Merge pull request #13362 from SamGondelman/modelTextures ... Fix transparent textures rendering wrong sometimes	2018-06-21 14:23:49 -07:00
Sam Gateau	dea3f91c0b	Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash ... fix crash on Mac when watching someone else turn with HMD	2018-06-21 11:55:39 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
sabrina-shanman	59833d8f28	Do not use boolean for variable definitions. Use bool instead.	2018-06-20 15:54:19 -07:00
Andrew Meadows	4424a8df11	Merge pull request #13303 from highfidelity/workload ... workload project part 1	2018-06-20 15:39:01 -07:00
sabrina-shanman	c039d20304	Fix objects snapping back when selected	2018-06-20 13:55:38 -07:00
SamGondelman	8014f61243	loading priorities for avatars and attachments	2018-06-20 12:29:28 -07:00
Dante Ruiz	f891c37ac8	fix particle entity	2018-06-20 10:59:19 -07:00
Dante Ruiz	3d4f164a9f	fixing web entity and whitespace cleanup	2018-06-19 16:53:36 -07:00
Dante Ruiz	694c272424	fixed text entity	2018-06-19 16:27:10 -07:00
Andrew Meadows	92e98438d3	remove cruft	2018-06-19 16:22:10 -07:00
Andrew Meadows	17a0dd574a	remove debug cruft	2018-06-19 14:36:57 -07:00
Andrew Meadows	b557717dab	to avoid NaN: don not rely on glm::angle(quat) UYKWYAD	2018-06-19 14:27:27 -07:00
SamGondelman	de5fcccc7b	proper reporting of nan values in get	2018-06-19 14:22:24 -07:00
Dante Ruiz	568ba6f777	fixing shape entity	2018-06-19 14:14:16 -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
sabrina-shanman	67c605c10a	Do not use ownership tracking in serverless mode in PhysicalEntitySimulation	2018-06-18 16:12:38 -07:00
humbletim	dc5c5c20df	raypick partIndex commit ... include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
John Conklin II	9ace80c709	Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars ... RC69: avatars collide again (again)	2018-06-18 15:21:47 -07:00
John Conklin II	a47038d81f	Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id ... Add main & render thread ids to crashpad annotations	2018-06-18 15:21:04 -07:00
Sam Gateau	56a1137f7b	Merge pull request #13312 from SamGondelman/overlayPipelines ... Fix layered overlay rendering and highlight	2018-06-18 14:35:03 -07:00
Andrew Meadows	a18ba36dd2	merge 'master' into 'workload'	2018-06-18 13:40:08 -07:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -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
John Conklin II	87d26a9d86	Merge pull request #13304 from sabrina-shanman/btghostraytest ... Use optimized Bullet raytest function in CharacterGhostObject::rayTest()	2018-06-18 10:22:17 -07:00
Elisa Lupin-Jimenez	b255cf0ba9	Merge pull request #13389 from AndrewMeadows/misc-001 ... crash fixes, removing unnecessary writes, and misc cleanup	2018-06-18 09:19:22 -07:00
SamGondelman	7771661948	fix particle spread properties	2018-06-15 17:35:49 -07:00
Seth Alves	3c081c4bf8	Merge pull request #13377 from danteruiz/fix-double-scripts-on-reload ... prevent having more than one instance of a script running after reloading the script	2018-06-15 17:17:35 -07:00