58876 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
druiz17	ef050a09f9	made requested changes and also allow entities/overlays to be grabbed by the grip button	2017-09-07 14:42:46 -07:00
Bradley Austin Davis	37b184d982	Fix crashes in entity rendering on OSX	2017-09-07 14:32:50 -07:00
Brad Hefta-Gaub	ca00349abc	Merge pull request #11248 from birarda/feat/install-remember-custom ... remember if express or custom was selected for install	2017-09-07 12:43:01 -07:00
Brad Hefta-Gaub	6a1fe81832	Merge pull request #11210 from AndrewMeadows/mtwabp-OctreeSendThread-002 ... split packet construction from packet sending in OctreeSendThread	2017-09-07 12:36:29 -07:00
Brad Hefta-Gaub	b316f366fc	Merge pull request #11198 from druiz17/oculus-tablet-position ... fixed tablet spawn position for oculus menu button	2017-09-07 12:30:33 -07:00
Thijs Wenker	e2229b3c38	Merge pull request #11302 from cain-kilgore/21523 ... WL 21523 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-07 21:04:34 +02:00
Chris Collins	12d720805c	Merge pull request #11319 from jherico/async_qml_load_crash ... Fix potential crash on asynchronous QML loads	2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Brad Hefta-Gaub	3b16ebcc90	Merge pull request #11287 from jherico/vcpkg_ssl ... Migrate to vcpkg version of OpenSSL	2017-09-07 11:53:09 -07:00
Brad Hefta-Gaub	7cce45017b	Merge pull request #11244 from birarda/bug/ice-dns-fail ... add a timeout for ICE server DNS lookup	2017-09-07 11:09:05 -07:00
Cain Kilgore	84f37b9663	Changed string name	2017-09-07 18:53:05 +01:00
Brad Hefta-Gaub	fce8715457	Merge pull request #11306 from ElderOrb/case7385 ... 7385 - Collect Stats on "Exit VR" button	2017-09-07 10:18:58 -07:00
Olivier Prat	7fb7ebca57	Fixed warning on Mac	2017-09-07 19:03:22 +02:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Olivier Prat	6b5ca0c6ce	Optimized by removing unnecessary Z buffer copy	2017-09-07 18:33:00 +02:00
Olivier Prat	2003495166	Adjustments to half texel fix	2017-09-07 12:30:20 +02:00
Olivier Prat	b43514fb8b	Modified outline shader to do fill branch on CPU. Fixed assymetric outline ... due to depth sample not offset by a half texel in shader.	2017-09-07 12:15:38 +02:00
Olivier Prat	b9eb317d9b	Fixed non working outline in stereo with new changes	2017-09-07 10:33:55 +02:00
Olivier Prat	796c59b9c2	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-09-07 10:13:53 +02:00
druiz17	636e906191	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-09-06 17:15:18 -07:00
druiz17	cc7a222374	fixing Hifi-Hand-Drop for equipEntity	2017-09-06 17:15:05 -07:00
druiz17	0d66bfca05	added far trigger	2017-09-06 14:58:04 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
vladest	31a23acb1a	Add flickable on mouse wheel to web pages	2017-09-06 23:04:58 +02: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
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
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
Cain Kilgore	d429bd0b01	Changed the Interface text to say 'Task bar' instead of 'system tray'	2017-09-06 13:42:13 +01: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
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -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
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
Melissa Brown	fe1b614f39	Merge pull request #11213 from MidnightRift/21341 ... WL 21341 DodgeBall	2017-09-05 15:33:31 -07:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00