29589 commits

Author	SHA1	Message	Date
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
sam gateau	09dae5aee3	Addressing merge conflict in HighlightEffect.cpp	2018-09-26 13:24:21 -07:00
John Conklin II	c1dc0ff2ec	Merge pull request #14077 from sabrina-shanman/crash_ray-pick-dtor_pointer-only ... Prevent thread issues with PickResults modified by Pointers	2018-09-26 12:12:58 -07:00
John Conklin II	6c47ba0dc7	Merge pull request #13990 from SimonWalton-HiFi/chrono-timestamps ... Use C++ chrono system_clock for timestamps	2018-09-26 11:22:49 -07:00
John Conklin II	0de433c7c7	Merge pull request #14018 from birarda/bug/avatar-hash-map-deadlock-master ... fix for deadlock in other avatar entity removal from tree	2018-09-26 09:58:26 -07:00
John Conklin II	c5ff72bd20	Merge pull request #14024 from wayne-chen/toggle404Redirect ... Toggle going to 404 redirect domain	2018-09-25 20:44:57 -07:00
sam gateau	efa1dd0274	rename the files from skin to deformed	2018-09-25 17:32:04 -07:00
John Conklin II	3d71dfc467	Merge pull request #14072 from SamGondelman/highlight ... Fix avatar highlighting	2018-09-25 16:13:14 -07:00
John Conklin II	19438d143e	Merge pull request #14073 from jherico/fix/18069_test ... Working on Vive shutdown issues	2018-09-25 15:41:32 -07:00
sam gateau	cc0019479a	fixing review comments	2018-09-25 14:07:07 -07:00
sam gateau	e41b8f06e1	Cleaning up the pipeline and checking that it is working for all cases	2018-09-25 13:57:50 -07:00
Brad Davis	15de0590e8	Cleaning up commented out code	2018-09-25 13:18:49 -07:00
Brad Davis	5adc4c2290	Protect against null pointer usage in sound scripting wrapper	2018-09-25 13:17:49 -07:00
sabrina-shanman	8dd36e465b	Merge branch 'master' into crash_ray-pick-dtor_pointer-only	2018-09-25 09:22:30 -07:00
sabrina-shanman	eca31e7a99	Fix instantiating abstract class when creating visual pick result for pointers	2018-09-25 09:20:57 -07:00
sam gateau	9f16024616	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-25 08:27:38 -07:00
Sam Gateau	69734ce21b	Getting better'	2018-09-24 22:34:43 -07:00
sabrina-shanman	5dbebd4aae	Add comment explaining why visualPickResult is a copy	2018-09-24 17:36:24 -07:00
sam gateau	7cf7eaa7c8	Exposing the drawcall user info just a uint16 right now and use it for the skinning and blendshape	2018-09-24 17:34:42 -07:00
John Conklin II	be23d07621	Merge pull request #14010 from sethalves/thread-safe-settings ... make settings thread safe	2018-09-24 17:24:50 -07:00
sabrina-shanman	7f189e4d10	Make visualPickResult used by Pointers a private copy	2018-09-24 17:15:56 -07:00
Wayne Chen	69d5299362	patching fix for previous commits	2018-09-24 15:22:46 -07:00
Brad Davis	72fc686ec1	Fix timer managmement during shutdown	2018-09-24 14:52:13 -07:00
John Conklin II	55848e6959	Merge pull request #14008 from sethalves/fix-local-angular-velocity ... fix bug that caused localAngularVelocity to get zeroed out	2018-09-24 14:32:57 -07:00
SamGondelman	ad73cb3996	fix avatar highlighting	2018-09-24 14:02:35 -07:00
Wayne Chen	ac5814a1f8	Merge branch 'master' of https://github.com/highfidelity/hifi into toggle404Redirect	2018-09-24 13:57:23 -07:00
John Conklin II	a602bff217	Merge pull request #13981 from gcalero/android_settings ... Android settings (AEC)	2018-09-24 13:55:30 -07:00
John Conklin II	45b206d748	Merge pull request #14065 from SamGondelman/blendshapeCrash ... Fix blendshape crash on avatar removal	2018-09-24 12:39:52 -07:00
John Conklin II	d520152a95	Merge pull request #14004 from hyperlogic/feature/anim-stat-improvements ... Small Improvements to Anim Stats	2018-09-24 11:56:01 -07:00
Stephen Birarda	b31837168d	fix bad lock, optimize some operations, clarify comment	2018-09-24 11:27:20 -07:00
SamGondelman	d772cdb34a	please	2018-09-24 10:16:35 -07:00
Sam Gateau	4210ce46aa	bringing the tex corrd transform in the Material struct and shaving one ubo	2018-09-23 23:10:56 -07:00
Sam Gateau	b3112f898a	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-22 18:04:24 -07:00
sam gateau	d8984dafa0	ui allows to enable/disable the deformer componenets	2018-09-21 16:45:21 -07:00
Seth Alves	86e502637e	Make Settings thread safe	2018-09-21 15:46:35 -07:00
John Conklin II	428ace17e1	Merge pull request #14001 from wayne-chen/fixLoginFailTwiceCall ... Fixing double loginFailed	2018-09-21 11:36:06 -07:00
John Conklin II	9c2a7931fb	Merge pull request #14036 from AndrewMeadows/crowd-update-tuning ... tweak avatar update priority coefficients for load tests	2018-09-21 09:44:15 -07:00
sam gateau	aa02dcb087	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-21 08:19:50 -07:00
sam gateau	d3ff4b8630	Factorizing the deformer code in a separate file, and now trying to control dynamically the blend shape on off	2018-09-20 17:26:26 -07:00
John Conklin II	0560b8678c	Merge pull request #14022 from jherico/fix/amd_highlight ... Fix AMD highlighting effect	2018-09-20 16:17:10 -07:00
sam gateau	5d80a89094	Apply fix to gl41 backend needed for proper Resource BUffer on gl41	2018-09-20 16:09:08 -07:00
Andrew Meadows	cf85c617a2	tweak avatar update priority coefs for load tests	2018-09-20 09:56:50 -07:00
sam gateau	b04cbbb0ac	Apply fix to gl41 backend needed for proper Resource BUffer on gl41	2018-09-20 09:16:43 -07:00
Sam Gateau	377464f5a2	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-09-19 19:00:30 -07:00
sam gateau	6b6551c8bd	the missing file	2018-09-19 17:29:10 -07:00
sam gateau	4fc6466250	update shaders	2018-09-19 17:27:58 -07:00
Wayne Chen	7e796f7e7f	committing requested changes	2018-09-19 14:26:30 -07:00
John Conklin II	6c63f92f39	Merge pull request #13933 from SamGondelman/accelerationSpread ... Fix particle acceleration spread	2018-09-19 11:49:42 -07:00
John Conklin II	60c07280f8	Merge pull request #13971 from SamGondelman/parabola ... Correct transparent parabola shader	2018-09-19 11:46:24 -07:00
Brad Davis	783ea21951	Fix AMD highlighting effect	2018-09-19 11:21:12 -07:00