7487 commits

Author	SHA1	Message	Date
Wayne Chen	2e17140c07	fixing loadServerlessDomain function to be from 404 redirect	2018-09-04 18:24:01 -07:00
Wayne Chen	c47788efe4	merging with dante's PR	2018-09-04 18:00:06 -07:00
Wayne Chen	9e0fa08cf1	adding property to location, updating domain	2018-09-04 17:46:23 -07:00
Wayne Chen	c95cb97b9b	adding working version with networking signals	2018-08-31 19:29:48 -07:00
Wayne Chen	b6d23843dd	adding fix to domain redirection URL	2018-08-30 22:32:02 -07:00
Wayne Chen	e3f5f4c55a	Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect	2018-08-30 19:55:51 -07:00
Wayne Chen	82c7495615	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-30 19:41:06 -07:00
Sam Gateau	a7fd35747d	Merge pull request #13896 from AndrewMeadows/workload-feedback ... Filter timings used in feedback logic for workload region sizes	2018-08-30 19:11:49 -07:00
Wayne Chen	5f43f5b276	adding different method for handling redirect	2018-08-30 17:40:13 -07:00
David Back	cee270780b	Merge pull request #13908 from dback2/androidCrashStateVariables ... Fix Android StateController assert	2018-08-30 13:37:13 -07:00
John Conklin II	f5ebdfa233	Merge pull request #13905 from zfox23/fixPr13870 ... Fixup PR13870: Make the feature work in Master	2018-08-30 11:08:23 -07:00
David Back	8b1fcfcce9	fix double windows platform	2018-08-30 10:16:27 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
Zach Fox	b8cd5dd8b9	Fixup PR13870: Make the feature work in Master	2018-08-29 16:58:19 -07:00
Wayne Chen	eb29c9c4a2	updating with default landing location	2018-08-29 16:53:22 -07:00
Wayne Chen	3810984056	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-29 16:18:16 -07:00
David Back	96d2ba660c	Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping	2018-08-29 12:05:51 -07:00
Andrew Meadows	f9d14e1351	filter time-cost drivers for region regulation	2018-08-29 11:17:59 -07:00
Wayne Chen	6689c15564	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-28 19:22:34 -07:00
Wayne Chen	8a9ad421e7	adding serverless file + redirection if conn fail	2018-08-28 15:50:14 -07:00
David Back	b6edb2c9d6	platform states, edit controller mapping, separate mac/win delete	2018-08-27 14:53:13 -07:00
danteruiz	e4293d9ad5	fixing some entity visual problems	2018-08-26 21:50:01 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
Dante Ruiz	3796675123	script update and visuallyReady entities	2018-08-24 15:46:39 -07:00
SamGondelman	98d145dc24	fix crash on shutdown in domain with material	2018-08-24 15:19:48 -07:00
John Conklin II	477fba4b15	Merge pull request #13847 from AndrewMeadows/workload-avatars-002 ... workload tracks other avatars and adds/removes from physics simulation accordingly	2018-08-24 12:43:51 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Andrew Meadows	87223946ad	add/remove avatars according to workload region	2018-08-23 12:59:28 -07:00
Andrew Meadows	15665b25e8	give OtherAvatars a proxy in workload	2018-08-23 12:59:28 -07:00
Dante Ruiz	db8e1bdfa3	compile error fix	2018-08-22 16:47:18 -07:00
Dante Ruiz	f5441b2721	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-22 15:28:42 -07:00
Dante Ruiz	78458d62de	revert some changes and fix toolbar issue	2018-08-22 15:20:56 -07:00
John Conklin II	50684f00c8	Merge pull request #13856 from sethalves/dont-squash-delete-events ... don't squash delete events during shutdown so that QtWebEngine process gets destoryed	2018-08-22 12:44:35 -07:00
Seth Alves	579b2435c2	don't squash delete events during shutdown so that QWebEngine process gets destroyed	2018-08-22 11:04:26 -07:00
Stephen Birarda	3e2d4dc696	fixes and improvments addressing CR comments	2018-08-21 10:53:52 -07:00
Dante Ruiz	b2fb2c7f98	fix build error	2018-08-21 10:45:59 -07:00
Stephen Birarda	e33f349d53	fix flagging for avatar entity update/delete	2018-08-21 10:32:05 -07:00
Stephen Birarda	be7eb57205	handle whitelist avatar URL override via traits	2018-08-21 10:31:14 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
Wayne Chen	acc7d493ec	Merge pull request #13812 from SimonWalton-HiFi/safe-landing ... Safe landing client-side improvements	2018-08-20 20:36:17 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Simon Walton	a891b74fac	Reset SafeLanding in all cases ... Also remove unused data member, elevate load priority only for entities with collisions, handle case of no nearby entities.	2018-08-20 12:31:21 -07:00
Dante Ruiz	2261ad2bcb	clean up the interstitial page	2018-08-20 11:14:48 -07:00
John Conklin II	1edf1b4337	Merge pull request #13555 from SamGondelman/destroy ... Trying to fix dependency shutdown	2018-08-16 13:14:58 -07:00
John Conklin II	02f53c4ee5	Merge pull request #13808 from dback2/createEntitiesGrabbable ... Use Create Entities as Grabbable option when adding asset to world	2018-08-16 09:22:23 -07:00
Ryan Huffman	5d44877f56	Fix functionality sometimes getting stuck if window loses focus	2018-08-15 13:32:58 -07:00
John Conklin II	032e67fd8e	Merge pull request #13748 from ElderOrb/FB16831 ... FB16831 qml-related warnings in log	2018-08-14 16:40:07 -07:00
sabrina-shanman	e5cb078133	Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target	2018-08-13 14:51:37 -07:00