45838 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	b800aa793d	Fix gamma correction adjusting uchar to float when unnecessary	2016-08-08 15:45:05 -07:00
Ryan Huffman	9b137570cf	Fix srgb_gen lookup table generation	2016-08-08 15:44:08 -07:00
Clément Brisset	59dec06235	Merge pull request #8390 from Atlante45/steam ... Update Steam branch with master	2016-08-08 15:42:15 -07:00
Atlante45	f08b2f9257	Remove temporary override to reload QML	2016-08-08 15:39:44 -07:00
Atlante45	61d07cf952	Restore mateverse URL	2016-08-08 15:39:25 -07:00
Atlante45	51b45f8f73	Steam invite are facing the current position	2016-08-08 15:39:25 -07:00
Atlante45	aa2ae31aab	CR UI fixes	2016-08-08 15:39:25 -07:00
Atlante45	2af32ca60e	Only leave lobby if you were invited	2016-08-08 15:39:25 -07:00
Atlante45	7ec2f98cf2	Join lobby on startup	2016-08-08 15:39:25 -07:00
Atlante45	6b861e680f	More work on lobby creation/invites	2016-08-08 15:39:25 -07:00
Atlante45	af76e47629	Fix linux build	2016-08-08 15:39:25 -07:00
Atlante45	3d6a6b9d6b	Add steam.js to default scripts	2016-08-08 15:39:25 -07:00
Atlante45	42c9a695ff	Invite friends in HMD	2016-08-08 15:39:25 -07:00
Atlante45	a13950752b	Update steam location with discoverability	2016-08-08 15:39:25 -07:00
Atlante45	e5290076be	First draft for Steam friends	2016-08-08 15:39:25 -07:00
Atlante45	0663766074	Replace metaverse server with testing URL	2016-08-08 15:39:25 -07:00
Atlante45	f0ff975248	UI wiring	2016-08-08 15:39:25 -07:00
Atlante45	205df0cf51	login UI first draft	2016-08-08 15:39:25 -07:00
Atlante45	cea0e182c0	Interface login through steam	2016-08-08 15:39:25 -07:00
Atlante45	45921a5c8d	Restore split behavior for inputs/displays on quit	2016-08-08 15:39:25 -07:00
David Kelly	c8f3a898d2	First cut of a snapshot uploader ... Will need to test end-to-end shortly, etc...	2016-08-08 15:27:27 -07:00
Anthony J. Thibault	d36e60bbaa	eslintrc: accept spaces after function keyword in anonymous functions ... Anonymous functions `function () {}` and `function() {}` will both be accepted by eslint.	2016-08-08 15:20:58 -07:00
Zander Otavka	cb153f2a29	Fix file header comments	2016-08-08 15:17:42 -07:00
Zander Otavka	aebd18db7f	Add EOF newlines	2016-08-08 15:12:17 -07:00
Zander Otavka	246a8457e1	Add some asserts	2016-08-08 15:12:17 -07:00
Zander Otavka	43bbe790d6	Add atp support to qml	2016-08-08 15:12:17 -07:00
SamGondelman	de900e85c0	remove duplicate include	2016-08-08 14:10:47 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
SamGondelman	a5f3089fda	fix ABXY mapping for touch	2016-08-08 13:14:14 -07:00
Brad Hefta-Gaub	882ad2f6fb	Merge pull request #8311 from huffman/feat/angular-loading ... Add priority loading for model entities	2016-08-08 13:06:56 -07:00
Brad Hefta-Gaub	b903c974bc	Merge pull request #8371 from imgntn/teleport_cancel ... Cancel mode for teleporting	2016-08-08 13:04:27 -07:00
Ryan Huffman	2ee511bae0	Fix syntax error	2016-08-08 12:30:11 -07:00
James B. Pollack	58ccc9581a	cleanup	2016-08-08 12:20:48 -07:00
Ryan Huffman	d40b783ce2	Add comments to srgb_gen.py	2016-08-08 12:06:09 -07:00
Ryan Huffman	28b3ff9bca	Update generation of srgb to linear lookup to include python script	2016-08-08 12:04:06 -07:00
James B. Pollack	bde46adee8	update description	2016-08-08 11:31:43 -07:00
SamGondelman	f311907982	fix merge mistake	2016-08-08 11:08:01 -07:00
James B. Pollack	f8c1d8f123	change property order and cleanup	2016-08-08 11:01:03 -07:00
SamGondelman	0ec1da4a0d	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-08 10:55:20 -07:00
Ryan Huffman	fb14628a7e	Handle case in entity loading priority function where max dim size is <= 0	2016-08-08 10:39:27 -07:00
Ryan Huffman	2a071c4329	Fix improperly formatted floats	2016-08-08 10:39:06 -07:00
Ryan Huffman	d367583426	Clean up priority loading implementation	2016-08-08 08:53:06 -07:00
Ryan Huffman	d48bc96cf9	Add ability to set number of concurrent downloads	2016-08-08 08:53:06 -07:00
Ryan Huffman	4f9be2ae72	Fix camera position not being set for angular loading	2016-08-08 08:53:06 -07:00
Ryan Huffman	77e993510e	Cleanup implementation of angular loading	2016-08-08 08:53:05 -07:00
Ryan Huffman	c594dcdf9f	Add priority loading for model entities	2016-08-08 08:52:29 -07:00
Seth Alves	38314b180b	Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk	2016-08-08 06:30:18 -07:00
Andrew Meadows	4e23ecfb2c	count the _translucent_ pixels and fix break logic	2016-08-07 10:50:25 -07:00
Andrew Meadows	f759fd1033	early exit when determining if alpha mask possible ... also don't bother scanning for alpha for cube maps	2016-08-07 08:54:20 -07:00
Chris Collins	6585be036c	Merge pull request #8381 from sethalves/unhide-advanced-button ... remove hidden attribute from advanced settings button	2016-08-06 08:08:23 -07:00