59060 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
Menithal	e1acf9dbc9	Merge remote-tracking branch 'upstream/master' into 21484-Fix	2017-09-06 20:42:47 +03:00
Olivier Prat	17e992bd14	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-06 19:08:37 +02:00
Olivier Prat	a83094d7c7	Still need to test this on mac	2017-09-06 19:08:31 +02:00
Olivier Prat	fe357671e1	Removed qmlc files	2017-09-06 19:06:40 +02:00
Olivier Prat	25ff132fc7	Debugging scripts working again with correct occlusion management	2017-09-06 19:05:15 +02:00
druiz17	6ffcf73d0e	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 09:47:54 -07:00
Olivier Prat	10643feb78	Working with specific zpass rendering for outline. Debug script needs relinking to correct config	2017-09-06 18:40:38 +02:00
Dante Ruiz	a5553d5e1c	fixed text scale for notifications	2017-09-06 09:26:48 -07:00
Chris Collins	8563a05431	Merge pull request #11255 from misslivirose/feat/tablet-tutorial ... Removing tutorial paths for first run experience	2017-09-06 09:23:45 -07:00
Dante Ruiz	b4f7cb961a	Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man	2017-09-06 08:38:08 -07:00
Olivier Prat	d6ea01c4f3	Created outline task but still need to create specific render job with z-pass shaders	2017-09-06 17:34:29 +02:00
Dante Ruiz	15c853567d	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 08:34:28 -07:00
Olivier Prat	75e06b691f	Simplified version that works directly with metas	2017-09-06 15:59:04 +02:00
Olivier Prat	700d4a4b43	First working version of outline working with selection interface.	2017-09-06 15:47:10 +02:00
vladest	e17f05a337	Correct UI	2017-09-06 14:52:08 +02:00
Cain Kilgore	d429bd0b01	Changed the Interface text to say 'Task bar' instead of 'system tray'	2017-09-06 13:42:13 +01:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
Cain Kilgore	2a6b523542	Again	2017-09-06 13:09:43 +01:00
Cain Kilgore	14e5cf31f2	Apparently I didn't need 'em	2017-09-06 12:42:17 +01:00
Cain Kilgore	4d0df705a9	Forgot some {}'s	2017-09-06 11:46:57 +01:00
Dante Ruiz	e216fe51ea	Merge pull request #11221 from vladest/flickable_web_pages ... Flickable web pages	2017-09-05 18:49:57 -07:00
Cain Kilgore	e9f666d970	Made the system tray message specific to Sandbox only	2017-09-06 02:06:10 +01:00
Liv	930243539c	add back first run to false and fix formatting	2017-09-05 17:50:25 -07:00
anshuman64	3a44c6977e	Merge pull request #11300 from ElderOrb/case7196 ... 7196 Mouse pointer no longer visible in HMD mode	2017-09-05 17:42:36 -07:00
Anthony J. Thibault	af8b147321	away.js - works better with sensor scale.	2017-09-05 17:34:35 -07:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
Dante Ruiz	a34dae4aad	adding scale to notifications	2017-09-05 17:12:40 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
Anthony J. Thibault	74f974c68f	Merge branch 'master' into feature/ant-man	2017-09-05 16:27:41 -07:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
beholder	41d014ca0c	6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.	2017-09-06 02:11:40 +03:00
Thijs Wenker	08baa96dc9	Merge pull request #11296 from misslivirose/fix-content-message ... More detailed domain replacement message	2017-09-06 00:44:48 +02:00
Anthony J. Thibault	3d3bb2853a	Updated naturalDimensiosn for touch controller config ... Totally untested! I don't have an oculus. I'm sure it will work tho. ;)	2017-09-05 15:39:35 -07:00
Melissa Brown	fe1b614f39	Merge pull request #11213 from MidnightRift/21341 ... WL 21341 DodgeBall	2017-09-05 15:33:31 -07:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00
vladest	dd6d530853	Merge branch 'master' into flickable_web_pages	2017-09-05 22:14:52 +02:00
Dante Ruiz	ad5b8c438e	Merge pull request #11107 from mnafees/21412 ... CR for Job #21412 - Add "Report a Problem" feature	2017-09-05 13:05:05 -07:00
Dante Ruiz	9f2bdce190	Merge pull request #11005 from Armads/WL21424 ... WL21424 hide head attachments when head joint is hidden	2017-09-05 13:04:14 -07:00
David Kelly	ee70df502e	Merge pull request #11307 from davidkelly/dk/commerceRegression ... Regression in injection script	2017-09-05 13:02:33 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	4bdfe092cf	Regression in injection script	2017-09-05 12:28:31 -07:00
Dante Ruiz	cefa65de5e	some more small changes	2017-09-05 12:06:32 -07:00
Dante Ruiz	28694dcf8a	small change to contextOVerlays in farActionGrab	2017-09-05 11:46:06 -07:00
David Kelly	b3132e9871	Merge pull request #11304 from davidkelly/dk/commerceResetBug ... Reset passphrase fix	2017-09-05 11:27:02 -07:00
beholder	c0e7e5a8b2	7385 - Collect Stats on "Exit VR" button	2017-09-05 21:26:35 +03:00
Cain Kilgore	0e57df5483	Deleted unnecessary file	2017-09-05 18:54:54 +01:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00