27788 commits

Author	SHA1	Message	Date
samcake	32e83c256a	Adjusting the task::Engine run signature to appease gcc gods and other warnings	2018-04-25 12:23:30 -07:00
samcake	5b5cad38e8	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-25 10:03:42 -07:00
John Conklin II	6062f21da1	Merge pull request #12961 from Atlante45/fix/es-deadlock ... Enforce correct lock order between EntityTree and EntitySimulation	2018-04-24 15:40:32 -07:00
John Conklin II	ce14dfb9a4	Merge pull request #12974 from AndrewMeadows/dont-feed-bullet-garbage ... don't try to build convex hulls with nan data	2018-04-24 14:11:25 -07:00
Atlante45	d82333534c	Ensure the tree lock is always taken before the simulation lock	2018-04-24 13:46:05 -07:00
John Conklin II	236e75b6c6	Merge pull request #12903 from druiz17/add-more-hmd-data ... Get the correct device name connect to OpenVr	2018-04-24 13:29:41 -07:00
samcake	adfc935fdb	Merge with master	2018-04-24 13:04:16 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
Sam Gateau	2cae294ab4	Merge pull request #12904 from AndrewMeadows/lhf-needsToCallUpdate ... LHF optimiaztion: only call ModelEntityItem::update() on instances that actually need it	2018-04-24 11:22:48 -07:00
Sam Gateau	da154d3e00	Merge pull request #12969 from jherico/fix/web_crash ... Attempt to shutdown web surfaces more consistently	2018-04-24 10:15:25 -07:00
Brad Davis	ecaf162afb	Fixing PR build	2018-04-23 20:41:36 -07:00
samcake	f686ef1f25	Exposing more uniforms to ui for refining the controller	2018-04-23 18:02:09 -07:00
Andrew Meadows	ae186d46c6	don't try to build convex hulls with nan data	2018-04-23 14:46:23 -07:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
John Conklin II	91197cadcf	Merge pull request #12967 from SimonWalton-HiFi/hmac-shortid-merge-fix ... Fix for null sourceNode use	2018-04-23 14:11:06 -07:00
John Conklin II	70689dd297	Merge pull request #12968 from birarda/bug/wrong-domain-local-id ... fix setting of domain local ID from domain list	2018-04-23 13:50:21 -07:00
John Conklin II	5a3f44fa15	Merge pull request #12965 from NissimHadar/bug12979 ... Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color	2018-04-23 13:49:41 -07:00
Sam Gateau	d3fccc4104	Merge pull request #12881 from SamGondelman/scaleAssert ... Minimum entity dimension (1mm)	2018-04-23 13:40:53 -07:00
John Conklin II	b3dbf7a025	Merge pull request #12943 from vladest/fix_spinbox ... Fix SpinBox.	2018-04-23 13:02:01 -07:00
Stephen Birarda	779386fbc4	fix setting of domain local ID from domain list	2018-04-23 12:29:02 -07:00
Simon Walton	f849d6f937	Change packetSourceAndHashMatchAndTrackBandwidth logging in same manner	2018-04-23 12:26:02 -07:00
Andrew Meadows	577f9a03e6	fix bug: animation reset on 'hold'	2018-04-23 12:08:40 -07:00
Andrew Meadows	748af5a65f	worry about multi-threads when updating animation props	2018-04-23 12:08:40 -07:00
Andrew Meadows	8e51d66092	fix bug: animation should reset on start running	2018-04-23 12:08:40 -07:00
Andrew Meadows	b48e9495a5	rollback change to MaterialEntityItem, we'll fix later	2018-04-23 12:08:40 -07:00
Andrew Meadows	75508385cf	more correct needsToCallUpdate() implementations	2018-04-23 12:08:40 -07:00
Andrew Meadows	e36dbab838	remove unused data member	2018-04-23 12:08:40 -07:00
NissimHadar	ea6585a0b9	Corrected tosRGBFloat() computation.	2018-04-23 11:53:35 -07:00
samcake	35bbc6e61f	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-23 10:20:22 -07:00
Sam Gateau	d1e2e9ce71	Merge pull request #12921 from SamGondelman/precisionq ... Fix AMD shader compilation	2018-04-23 10:17:35 -07:00
samcake	990ee83f04	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-23 10:07:58 -07:00
Sam Gateau	7842ee8eac	Merge pull request #12962 from SamGondelman/menu ... Android: Hide menu and fix shader compilation	2018-04-23 09:51:20 -07:00
Sam Gateau	97934fe563	Adjusting the regulators and moving task to use chrono nad interesting tests	2018-04-23 00:07:00 -07:00
Sam Gateau	99a0e42b5d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-22 20:26:49 -07:00
Seth Alves	9e1bd69af3	Merge pull request #12918 from kitely/fix-addentity-failure ... Fixed null pointer exception if importing an entity from JSON fails	2018-04-21 18:12:48 -07:00
MiladNazeri	3710ce593d	Merge pull request #12922 from ctrlaltdavid/21815 ... Controller API JSDoc	2018-04-21 10:44:05 -07:00
vladest	2e44220b80	Merge branch 'master' into fix_spinbox	2018-04-21 19:38:28 +02:00
Sam Gateau	f16d0c712e	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-21 08:16:59 -07:00
David Rowe	3792b28a3e	Add input recorder examples	2018-04-21 14:53:40 +12:00
SamGondelman	ac7e8623bf	quiet shader warnings	2018-04-20 18:25:30 -07:00
MiladNazeri	080e26f408	Merge pull request #12952 from ctrlaltdavid/21851 ... Vec3 API JSDoc	2018-04-20 18:10:18 -07:00
samcake	b66ab6deaa	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 17:55:45 -07:00
samcake	b554aec317	Trying more drastic changes and learnign to use std::chrono the right way	2018-04-20 17:53:24 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07:00
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
John Conklin II	39ad8be1b8	Merge pull request #12743 from SimonWalton-HiFi/short-id ... Use 16-bit local IDs for Nodes in NL packets	2018-04-20 15:28:18 -07:00
samcake	3d651de797	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 13:20:19 -07:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
Simon Walton	9f9a68188d	Merge remote-tracking branch 'upstream/master' into short-id	2018-04-20 11:10:21 -07:00