2844 commits

Author	SHA1	Message	Date
Zach Fox	37e72f25a3	Make the PAL's tab background color white	2017-06-13 16:04:14 -07:00
Brad Davis	db8bdbc0a6	Merge pull request #10659 from samcake/orange ... simple Render Engine refactors coming from the Spectator Cam project	2017-06-12 20:31:07 -07:00
Brad Hefta-Gaub	0a84a75bde	Merge pull request #10650 from jherico/web_event_handlers ... Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 19:23:01 -07:00
Brad Hefta-Gaub	347742be1b	Merge pull request #10601 from birarda/mannequin-avatar ... Update default avatar to baked mannequin	2017-06-12 16:42:37 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Chris Collins	4b6c13bc1f	Merge pull request #10646 from ZappoMan/debugAudioProblems ... Fix for no-audio on clean install	2017-06-10 11:32:42 -10:00
samcake	bb38938534	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-09 14:34:25 -07:00
Stephen Birarda	8bc7ce6357	put back defaultAvatar_full.fst mode to 644	2017-06-09 13:55:57 -07:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
Anthony J. Thibault	8334dff610	compute rotation from derivative of spline ... This should fix bad rotation values for the spine during bowing/touching toes.	2017-06-08 15:00:12 -07:00
samcake	3664655512	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-07 17:43:50 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Seth Alves	b1c7c251ac	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-07 10:09:46 -07:00
samcake	bac66ee4c7	Introducing the renderview task	2017-06-06 18:00:41 -07:00
Brad Davis	171d3212fe	Merge pull request #10623 from jherico/qml_engine_singleton ... Migrate to single QML engine	2017-06-06 15:00:43 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
howard-stearns	91fff7d54d	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-05 13:44:56 -07:00
Seth Alves	5eb902179f	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-05 11:36:16 -07:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
David Rowe	58c4a2f12a	Fix icon for polylines in entities editor properties page	2017-06-03 06:26:13 +12:00
Seth Alves	d91b3700a7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-02 10:07:50 -07:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
Stephen Birarda	0b05774059	change default avatar to new baked mannequin	2017-06-01 17:12:29 -07:00
Seth Alves	48ee546545	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 16:15:03 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
Seth Alves	10ddbecdb9	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 13:37:22 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Seth Alves	0b2eb43ee2	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-01 07:02:31 -07:00
Zach Fox	0441d8c703	Add placeholder image when previous snapshot can't be loaded	2017-05-31 10:27:17 -07:00
Seth Alves	7a47250aa7	oops missed a comma	2017-05-31 10:21:10 -07:00
Dante Ruiz	b3401d9762	making some final changes	2017-05-30 23:55:45 +01:00
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
Dante Ruiz	8538c700b5	saving head work	2017-05-25 21:41:41 +01:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +01:00
Dante Ruiz	0fdf136251	got the shoulders working	2017-05-24 19:31:48 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
anshuman64	2b63eb9d90	Merge pull request #10469 from druiz17/improve-rotation-jitter ... Added a LowVelocityFilter to the input system.	2017-05-24 08:35:13 -07:00
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
Brad Hefta-Gaub	eca045714b	Merge pull request #10532 from ctrlaltdavid/21344 ... Display spinner in Web controls when they're loading an HTTP page	2017-05-23 16:39:17 -07:00
Clément Brisset	499897e271	Merge pull request #10533 from thoys/fix/attachment-scale ... Attachment Scale fix (Breaks previous set attachment scales)	2017-05-23 10:59:54 -07:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00
Anthony J. Thibault	06c26f029a	Merge branch 'master' into feature/faster-ik-iterations	2017-05-23 09:10:17 -07:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
samcake	653abf0ee3	brining the new counters to 4.1	2017-05-22 17:34:06 -07:00