58777 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	2e84f48539	Fix QML errors	2017-09-13 09:54:55 -07:00
Atlante45	9f2b0258e9	Update baking status with the correct checkmark glyph	2017-09-13 09:54:55 -07:00
Atlante45	944a4fd49d	Update hifi glyphs + font reference	2017-09-13 09:54:55 -07:00
Atlante45	7d9daea0f6	Transmit baking errors to interface for display.	2017-09-13 09:54:54 -07:00
Atlante45	48e58febc6	Remove deprecated AutoBaker	2017-09-13 09:54:54 -07:00
Clément Brisset	c1685d827e	Merge pull request #11288 from birarda/feat/bake-with-compression ... enable compression in image library from Asset Server	2017-09-12 14:08:03 -07:00
Stephen Birarda	bd36ba19b3	fix dereference of end iterator	2017-09-07 12:07:58 -07:00
Stephen Birarda	e4de869db6	fix iterator find from merge	2017-09-07 12:07:58 -07:00
Stephen Birarda	1508edb459	use store/load to be clearer about atomics	2017-09-07 12:07:58 -07:00
Stephen Birarda	7859b3b11f	remove image compression choices from Interface settings	2017-09-07 12:07:57 -07:00
Stephen Birarda	e25b4700d9	re-set defaults in texture baking when AssetServer done	2017-09-07 12:07:57 -07:00
Stephen Birarda	26b74db864	enable compression in image library from Asset Server	2017-09-07 12:07:57 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -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
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -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
Stephen Birarda	c5f7c5d314	Merge pull request #11281 from huffman/feat/bake-meta-errors ... Add auto bake error handling to asset server	2017-09-06 13:20:16 -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
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
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
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
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
Andrew Meadows	4b8840f307	Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1 ... fix a bug that caused dynamic children to wink in and out and then vanish	2017-09-05 10:02:47 -07:00
Cain Kilgore	99a99ce71b	WL 21513 - Update text in the "How to Quit The Sandbox" Prompt	2017-09-04 21:14:26 +01:00