5974 commits

Author	SHA1	Message	Date
NeetBhagat	58142817a1	Resolve the review comments of @ZappoMan.	2017-05-31 19:18:14 +05:30
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
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
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
samcake	575d4abdf7	bad include fixed maybe	2017-05-24 17:25:21 -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
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