6048 commits

Author	SHA1	Message	Date
Seth Alves	eb94c48c5b	merge from upstream	2017-06-01 10:10:11 -07:00
NeetBhagat	d27ad061cb	Merge branch 'master' into 21255	2017-06-01 12:46:14 +05:30
NeetBhagat	c7c07b28e9	Resolve the reviewed comments of @ZappoMan	2017-06-01 12:17:13 +05:30
Stephen Birarda	1d9d83b157	initial version of the ClosureEventSender using std::thread	2017-05-31 19:00:41 -07:00
Seth Alves	e37387f45c	sync	2017-05-31 14:01:09 -07:00
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
Seth Alves	ffe844a8e7	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
Chris Collins	5db0975554	Merge pull request #10556 from highfidelity/RC-41 ... Beta Release 41 - Includes up to Developer Release 6603	2017-05-30 12:52:30 -07:00
Seth Alves	250e381ea7	Merge pull request #10563 from Atlante45/fix/reset-settings ... Fix "retain avatar info"	2017-05-30 10:00:55 -07:00
volansystech	e90b1b5a67	Resolve the comments of @ZappoMan.	2017-05-29 18:21:59 +05:30
volansystech	212627bd5d	Merge branch 'master' into 21255	2017-05-29 17:51:45 +05:30
volansystech	0920dbc1a8	Resolve the comments of @ZappoMan.	2017-05-29 15:53:33 +05:30
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
Atlante45	ccc7cb638d	Fix "retain avatar info"	2017-05-26 14:18:29 -07:00
Andrew Meadows	fa003b0c14	swap order of changes and deactvations	2017-05-26 12:29:37 -07:00
Anthony Thibault	84901ba94b	Merge pull request #10542 from druiz17/arm-pucks ... Added pucks calibration for upper arm/shoulders	2017-05-26 11:17:15 -07:00
Clément Brisset	efe72e1b85	Merge pull request #10530 from Atlante45/fix/default-scripts ... Ensure user never loses its running scripts	2017-05-25 18:33:11 -07:00
Seth Alves	af5ba3a90a	ask display-plugins if they are head-controllers	2017-05-25 15:14:10 -07:00
Andrew Meadows	3bd0c111d7	verify empty ShapeManager in Application dtor	2017-05-25 13:47:40 -07:00
Seth Alves	3823ece153	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-25 10:57:46 -07:00
Seth Alves	bdbc6ddcc1	change some code to look at head-controller position rather than hmd position	2017-05-25 10:50:41 -07:00
volansystech	a2851b5bcb	Put proper comments and indentation.	2017-05-25 18:47:59 +05:30
volansystech	8d51be644d	Merge branch 'master' into 21255	2017-05-25 17:48:48 +05:30
volansystech	1f24e38585	Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.	2017-05-25 14:56:06 +05:30
Sam Cake	3eb95d2d19	cleaning the commented code	2017-05-25 01:16:45 -07:00
Stephen Birarda	f897f3f090	send machine fingerprint as uuid without curly braces	2017-05-24 19:08:25 -07:00
Stephen Birarda	50285005be	add machine fingerprint to the launch event	2017-05-24 18:35:57 -07:00
Stephen Birarda	c671817fa3	fix cache http request count in stats	2017-05-24 17:47:40 -07:00
Stephen Birarda	fefb34512d	change asset inbound key to atp	2017-05-24 17:44:09 -07:00
Stephen Birarda	c37fd335e1	track the number of local socket changes	2017-05-24 17:41:52 -07:00
Stephen Birarda	5e61f20df8	add more details about pending downloads	2017-05-24 17:37:42 -07:00
Stephen Birarda	48c4db1ca4	nest the download stats so they are cleaner	2017-05-24 17:36:21 -07:00
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -07:00
Stephen Birarda	3743cd23b4	add detailed download stats for file/http/atp	2017-05-24 17:22:38 -07:00
Stephen Birarda	ac55908e42	add additional information to stats/launch activities	2017-05-24 16:50:06 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Dante Ruiz	8cb9bfcc81	fixed merge conflict	2017-05-24 19:35:41 +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
volansystech	0c4cd96bfd	Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.	2017-05-24 12:26:07 +05:30
Dante Ruiz	ac3c9655ec	added arms	2017-05-24 01:28:08 +01:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00
Dante Ruiz	0cbdeaa1e8	Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks	2017-05-23 18:26:58 +01:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Sam Cake	7f9c98a922	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 22:54:43 -07:00
Atlante45	10eb353126	Ensure user never loses its running scripts	2017-05-22 18:55:58 -07:00
Dante Ruiz	d98e7d5bc6	adding left and right arm	2017-05-23 00:26:12 +01:00
David Rowe	9f83ca518f	Merge branch 'master' into 21359	2017-05-23 09:18:10 +12:00
Atlante45	2928507e48	Fix "Reset Settings" window poping up every time	2017-05-21 08:37:17 -07:00
samcake	c5b5aa93b1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-19 18:13:42 -07:00
David Rowe	768415695d	Tidying	2017-05-20 12:43:47 +12:00
Sam Gateau	36ac623e66	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-19 13:25:36 -07:00
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
Zach Fox	8efac1e7f1	Prevent another GIF from being captured while one is processing	2017-05-18 14:30:08 -07:00
Dante Ruiz	984f9e1ba5	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-18 21:23:06 +01:00
Sam Gateau	d9ad45bf4a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-18 09:37:04 -07:00
samcake	2c6e10fbe1	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-18 09:21:02 -07:00
Dante Ruiz	90ddc16d09	add calibration data to filters	2017-05-18 17:07:28 +01:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Zach Fox	d4752926b8	First pass - checking performance	2017-05-17 13:51:27 -07:00
Sam Gateau	0f250e693d	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-17 09:49:20 -07:00
Dante Ruiz	a18940142e	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-17 16:23:50 +01:00
Atlante45	201f81f20a	Don't wait on the sandbox	2017-05-16 14:41:57 -07:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
samcake	2df6d0df48	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-15 13:40:56 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup ... Use baked default skybox	2017-05-12 11:35:51 -07:00
samcake	3393456d91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-12 10:15:13 -07:00
samcake	737fdf9dd8	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 17:28:07 -07:00
Atlante45	79d53d92a1	Use baked default skybox	2017-05-10 16:03:02 -07:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Brad Hefta-Gaub	f91f42b0c8	Merge pull request #10411 from zzmp/feat/tester-flag ... Add launch.tester to user_actions	2017-05-10 11:58:24 -07:00
samcake	39f6e22da3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 09:48:26 -07:00
Zach Pomerantz	45feee38b2	Merge pull request #10269 from zzmp/fix/audio-bg-join ... Cleanup Audio background threads on shutdown	2017-05-09 17:23:36 -04:00
samcake	c36035d3eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-09 10:46:38 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
Zach Pomerantz	defc3c1c4f	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-08 19:55:10 -04:00
Zach Pomerantz	929079df97	add launch.tester to user_actions	2017-05-08 19:33:09 -04:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
Zach Pomerantz	ca7cd61c64	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-05 13:04:01 -04:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -07:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00
Zach Pomerantz	ad8d3e5490	continue idling while minimized	2017-05-02 20:05:55 -04:00
Vladyslav Stelmakhovskyi	e789b69a8e	Merge branch 'master' into audio-source-sync	2017-05-02 20:57:01 +02:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Seth Alves	a75544a9fb	Merge pull request #10319 from hyperlogic/feature/head-standard-action ... Head, Hips and Chest IK can now be controlled from Controller inputs	2017-05-01 13:03:23 -07:00
Brad Davis	40e4e2f307	Merge pull request #10327 from jherico/face_tracker_refactor ... Remove Faceshift	2017-05-01 12:14:55 -07:00
Vladyslav Stelmakhovskyi	dde363ef3d	Merge branch 'master' into audio-source-sync	2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi	28447cde0b	Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items	2017-05-01 18:41:38 +02:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Stephen Birarda	c518aa55be	Merge pull request #10312 from birarda/upload-new-models-to-entity ... add an entity file replacement via domain-server content page	2017-04-28 16:06:05 -07:00
Anthony J. Thibault	108cd80bb5	Merge branch 'master' into feature/head-standard-action	2017-04-28 10:41:29 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Stephen Birarda	038ac745c8	clear domain octree details if ES killed	2017-04-27 17:47:18 -07:00