61152 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	70d3bd3672	Fix label/auto networking not being hidden for temp domains	2017-10-29 20:48:03 -07:00
Ryan Huffman	ed99541b5f	Fix domain info not loading for temp domains in DS settings	2017-10-29 20:47:52 -07:00
Atlante45	b0d838cb9b	Fix UNIX warning	2017-10-28 14:57:16 -07:00
Ryan Huffman	3616ef7c49	Fix ip-only in DS settings to show port instead of address	2017-10-28 14:19:14 -07:00
Ryan Huffman	88e22f7507	Remove unneeded logging in DomainServer.cpp	2017-10-28 14:19:14 -07:00
Atlante45	56e9a9aaf9	Handle old configs	2017-10-27 17:32:11 -07:00
Ryan Huffman	c42ef4f88c	Update most DS API forwarding APIs to use a single forwarding function	2017-10-27 15:53:50 -07:00
Atlante45	ae9f87873f	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard	2017-10-27 15:27:00 -07:00
Atlante45	c7b8d1114d	CR	2017-10-27 15:11:31 -07:00
Ryan Huffman	75e98dcef9	Cleanup style in DS js files	2017-10-27 14:55:50 -07:00
Brad Hefta-Gaub	d61ede2a4e	Merge pull request #11697 from ElderOrb/FB8211 ... 8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-27 13:26:41 -07:00
Brad Hefta-Gaub	25b5657d58	Merge pull request #11702 from misslivirose/fix/remove-address ... remove href property for non-owned avatar entities	2017-10-27 13:15:47 -07:00
Atlante45	203a419f2a	Setup Wizard	2017-10-27 12:52:36 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Zach Fox	3fae121335	Merge pull request #11670 from zfox23/stagingSetting ... Make it easier to switch between STABLE and STAGING Metaverses	2017-10-27 12:03:29 -07:00
Ryan Huffman	390dae3918	Fix DS settings sidebar moving incorrectly	2017-10-27 11:49:41 -07:00
Ryan Huffman	2944d76ef0	Update settings with auto domain creation and restart	2017-10-27 11:49:41 -07:00
Ryan Huffman	1bb778c21f	Fix label support in DS settings and add automatic domain generation:	2017-10-27 11:49:41 -07:00
Ryan Huffman	92aa66cdd7	Update domain settings to include domain info editing	2017-10-27 11:49:40 -07:00
Ryan Huffman	7dc475c695	Update domain server settings ... Move requests that require access token to go through DS Update various styling and ease of use on DS settings page Update domain server settings CP CP	2017-10-27 11:49:34 -07:00
Brad Hefta-Gaub	f21a284324	Merge pull request #11700 from SamGondelman/face ... Billboardables face avatar instead of facing away	2017-10-26 20:40:29 -07:00
MissLiviRose	c7857d4fc3	actually remove href not script	2017-10-26 17:47:04 -07:00
MissLiviRose	0ab06d624a	remove href property for non-owned avatar entities	2017-10-26 17:35:51 -07:00
Zach Fox	9481824d0a	Fix enabled status of wear button	2017-10-26 17:02:09 -07:00
Zach Fox	8cb60fc62c	Small edit.js changes	2017-10-26 16:44:21 -07:00
beholder	6093cef6f0	add comments to explain '-1'	2017-10-27 01:25:26 +03:00
beholder	f6fa85fed2	adjust to coding standards	2017-10-27 01:25:25 +03:00
SamGondelman	755ce183e0	fix is facing avatar	2017-10-26 14:16:31 -07:00
Zach Fox	002141724b	Return to using NetworkingConstants	2017-10-26 14:12:36 -07:00
Zach Fox	3e95484c4c	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-26 13:58:50 -07:00
Brad Hefta-Gaub	e6dca8de86	Merge pull request #11698 from kencooke/audio-sample-sound-fix ... Tighter version of sample sound	2017-10-26 13:45:19 -07:00
Zach Fox	d24f241b88	Fix silly javascript error	2017-10-26 13:31:15 -07:00
beholder	5969e0b118	8211 Add very short haptic feedback when highlighting letters on keyboard	2017-10-26 23:03:06 +03:00
Bradley Austin Davis	becd99a964	Merge pull request #11584 from SamGondelman/pointerEvents ... First step of cleaning up PointerEvents	2017-10-26 12:01:03 -07:00
Ken Cooke	2156729a75	Tighter version of sample sound	2017-10-26 11:48:40 -07:00
Sam Gateau	6051a3913f	Merge pull request #11684 from NissimHadar/bugFix8610 ... Bug fix 8610	2017-10-26 10:55:29 -07:00
Liv	c571af6bb2	Merge pull request #11689 from ctrlaltdavid/21580 ... Remove stopwatch source in favor of using source in hifi-content repo	2017-10-26 09:38:51 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 ... 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
Ken Cooke	30d6185625	Merge pull request #11687 from ctrlaltdavid/21577 ... Fix script reload icon not working in Windows developer builds	2017-10-26 08:35:59 -07:00
Seth Alves	807b4c4ed2	Merge pull request #11686 from NissimHadar/hazeZone ... Reduced haze background blend range to 27,000 metres.	2017-10-26 08:13:24 -07:00
luiscuenca	b7c375f396	Cleaning	2017-10-25 19:09:37 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Clément Brisset	61a2d80117	Merge pull request #11676 from Atlante45/new-master ... Merge stable back into master	2017-10-25 18:37:50 -07:00
David Rowe	7cb6bae1e6	Remove stopwatch source in favor of using source in hifi-content repo	2017-10-26 14:09:50 +13:00
Seth Alves	0f31631f17	Merge pull request #11677 from druiz17/fix-fargrab ... Make non-dynamic entities collisionless during far-grab	2017-10-25 17:31:02 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
David Rowe	da33c4fcf2	Fix script reload icon not working in Windows developer builds	2017-10-26 11:41:52 +13:00
Zach Fox	2f28cf1443	Remove unnecessary newline	2017-10-25 15:20:31 -07:00
Zach Fox	3f0108528d	Remove unnecessary newline	2017-10-25 15:19:56 -07:00
Nissim Hadar	2ec62ecc9b	Reduced haze background blend range to 27,000 metres.	2017-10-25 15:12:01 -07:00