6817 commits

Author	SHA1	Message	Date
Seth Alves	804ab855d7	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-02-22 14:16:15 -08:00
Seth Alves	fdd2b0de15	increment _fullSceneReceivedCounter++ after loading a serverless domain. fix some indentation.	2018-02-22 14:16:11 -08:00
Seth Alves	c7081b28e6	when connected to a serverless domain, set the sessionUUID to be AVATAR_SELF_ID	2018-02-22 14:14:55 -08:00
Seth Alves	c83dcbc626	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-22 07:42:49 -08:00
Seth Alves	d27cbac3f8	loading directly into a serverless domain works. user will have edit permissions	2018-02-21 18:21:45 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Seth Alves	e36f39781b	remove some debug prints, fix serverless to servered domain transition	2018-02-21 15:06:23 -08:00
Seth Alves	37e16d2e6d	don't save up edit packets when loading a serverless domain	2018-02-21 12:54:41 -08:00
Seth Alves	c5d6f0e10f	don't queue up edit packets while connected to a serverless domain	2018-02-20 17:48:14 -08:00
Seth Alves	1f5a65f93e	only could a url as a domain if it ends with .domain.json	2018-02-20 10:58:43 -08:00
Seth Alves	563c19bb91	fix connect	2018-02-19 15:21:46 -08:00
Seth Alves	25c34403db	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-19 11:24:42 -08:00
Seth Alves	7a5415efbe	working on getting history to work with serverless domains	2018-02-18 07:55:43 -08:00
Seth Alves	a060d0ddb7	allow more than just hifi:// in various places	2018-02-17 06:32:38 -08:00
Seth Alves	dd278b4b1b	go to the default spawn point when loading a serverless domain	2018-02-16 17:45:39 -08:00
Seth Alves	ed5b28aa2a	clear octree on any sort of domain change	2018-02-16 17:15:15 -08:00
Seth Alves	d58eccd5aa	don't use edit.js to load entities for serverless domain	2018-02-16 16:38:45 -08:00
Seth Alves	de9ac7f4a5	working to integrate serverless domains into history, etc	2018-02-16 13:56:22 -08:00
Seth Alves	b2a4181bc0	working to integrate serverless domains into history, etc	2018-02-16 12:58:50 -08:00
Seth Alves	abc467b919	load json from indicated file to populate serverless domain	2018-02-15 16:09:03 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Seth Alves	17e2db96c6	make domain-manager and pals be still when interface is in serverless mode	2018-02-15 15:19:50 -08:00
Seth Alves	0f4b68c038	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-15 07:53:36 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Seth Alves	764447fa24	merge from upstream	2018-02-13 13:01:45 -08:00
Seth Alves	bf9496b46b	start on support for models.json serverless domains	2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images ... 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml ... Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
John Conklin II	3377aaceea	Merge pull request #12343 from NissimHadar/saveSnapshotWithName ... Added option to select snapshot filename in scripts.	2018-02-12 15:22:04 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
David Rowe	033b85a3a8	Merge branch 'master' into remove-deprecated-items ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 09:42:40 +13:00
SamGondelman	5337377ef5	Merge remote-tracking branch 'upstream/master' into decals	2018-02-09 14:40:20 -08:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, ... and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
Bradley Austin Davis	7102cf44b8	Fixing merge errors	2018-02-09 10:30:57 -08:00
Bradley Austin Davis	023ee35b2e	Merge remote-tracking branch 'upstream/master' into threaded_qml	2018-02-08 17:16:36 -08:00
Brad Hefta-Gaub	a6c8172990	Merge pull request #12370 from jherico/fix/deadlock_shaders ... Prevent deadlock crashes when building shaders at startup	2018-02-08 14:44:46 -08:00
Bradley Austin Davis	8748e98b5e	Prevent deadlock crashes when building shaders at startup	2018-02-08 10:23:25 -08:00
Bradley Austin Davis	77741c2851	Fix for deadlock triggering while loading QML engine	2018-02-07 16:43:15 -08:00
Brad Davis	7d5502eb92	Migrating QML rendering off the main thread	2018-02-06 11:53:09 -08:00
NissimHadar	cf87052b7f	Added option to select snapshot filename in scripts.	2018-02-05 17:29:00 -08:00
Stephen Birarda	761321875c	Merge pull request #12195 from birarda/bug/connection-refused ... clear silent connection attempt counter on DomainHandler soft reset	2018-02-05 11:35:02 -07:00
David Rowe	0c0734a255	Remove unused Overlays property, borderSize, and associated code	2018-02-04 14:54:14 +13:00
David Rowe	d842e532ee	Remove Window.customPrompt() from JavaScript API	2018-02-04 14:02:30 +13:00
John Conklin II	c8bb26ae74	Merge pull request #12294 from samcake/pastel ... Improve startup time by optimizing shader bookkeeping	2018-02-02 16:37:44 -08:00
Elisa Lupin-Jimenez	e2bf8ad231	reverted to S3 for model URL	2018-02-02 15:36:28 -08:00
Stephen Birarda	eb9d100fc8	reset count on conn refusal, soft reset DH in Interface on limit reached	2018-02-02 13:47:48 -08:00