23870 commits

Author	SHA1	Message	Date
Seth Alves	dee6afebea	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-21 12:54:46 -08:00
Seth Alves	37e16d2e6d	don't save up edit packets when loading a serverless domain	2018-02-21 12:54:41 -08:00
SamGondelman	4dde178b93	fix new material UI	2018-02-21 10:33:15 -08:00
Seth Alves	220d9abbfc	Merge pull request #12435 from vladest/fix_flickable_tablethome ... Make sure Flickable for GridView for TabletHome will not flick	2018-02-21 09:21:45 -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
Zach Fox	fd6f4b569f	Fix active focus issue	2018-02-20 13:19:31 -08:00
Zach Fox	eb29bdf5d2	Don't allow tabs or newlines	2018-02-20 13:06:10 -08:00
Zach Fox	9bde9f5a4f	Fix height of Optional Message in Send Money	2018-02-20 12:36:11 -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	f80ee1286d	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-20 10:35:31 -08:00
John Conklin II	aa67a98d02	Merge pull request #12426 from ElderOrb/FB11508 ... fix for toolbar slowly drifting on switching between HMD/Desktop modes	2018-02-20 09:30:01 -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
Sam Gateau	fd49c0d100	Merge pull request #12401 from SamGondelman/decals ... Material Entities	2018-02-19 10:58:02 -08:00
Brad Hefta-Gaub	0ef2794c35	Merge pull request #12395 from druiz17/fix-qml-tablet-apps ... Prevent adding the same tablet url to the tabletApps list	2018-02-18 19:10:24 -08:00
Seth Alves	7a5415efbe	working on getting history to work with serverless domains	2018-02-18 07:55:43 -08:00
Cain Kilgore	47ed45b5e9	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00:00
vladest	e5f953c103	Make sure Flickable for GridView for TabletHome will not flick	2018-02-17 16:52:32 +01: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	afa059d331	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-16 12:58:56 -08:00
Seth Alves	b2a4181bc0	working to integrate serverless domains into history, etc	2018-02-16 12:58:50 -08:00
Alexander Ivash	2eb8ebcdbc	FB11508 - toolbar slowly sides downward	2018-02-16 20:22:16 +03:00
MiladNazeri	331b253ba0	Merge pull request #12386 from cain-kilgore/21668 ... WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null	2018-02-16 06:57:03 -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
Dante Ruiz	a194c8bc03	Merge branch 'master' of github.com:highfidelity/hifi into fix-qml-tablet-apps	2018-02-15 15:46:16 -08:00
Seth Alves	aa91000bb7	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-15 15:19:56 -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
Zach Fox	3c620282b1	Merge pull request #12393 from zfox23/fixAvailabilityMouseArea ... PAL: Prevent opening of Availability from WebView	2018-02-15 11:10:05 -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
MiladNazeri	258133f1db	Merge pull request #12335 from ctrlaltdavid/21736 ... Update Overlays circle3d JSDoc per recent code changes	2018-02-14 17:17:04 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
Seth Alves	93d8a6f00d	Merge pull request #12402 from druiz17/fix-tablet-create-rotation ... Fix tablet rotation when going into and out of create mode	2018-02-14 16:10:10 -08:00
Bradley Austin Davis	33690e09b7	Merge pull request #12399 from samcake/blue ... Introducing group culling to avoid the avatar model to be partially culled	2018-02-14 15:38:52 -08:00
Seth Alves	d1c0f0a40f	Merge pull request #12390 from druiz17/add-control-mapping ... add control button mapping for controller API	2018-02-14 15:02:28 -08:00
John Conklin II	9ba29028e3	Merge pull request #12398 from jherico/fix/spectator_cam ... Fix spectator camera crash	2018-02-14 13:15:42 -08:00
John Conklin II	6187731fdc	Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 ... [Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click	2018-02-14 11:14:26 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
Dante Ruiz	2a8101a944	Merge branch 'master' of github.com:highfidelity/hifi	2018-02-14 09:35:53 -08:00
Zach Fox	2f0c9e1acb	Merge pull request #12394 from zfox23/commerce_fixRecentActivityWrap ... Commerce: Fix wrap mode for very long P2P memos	2018-02-14 09:14:21 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
John Conklin II	309c2ecba1	Merge pull request #12239 from druiz17/fix-camera-update ... Do not override sensorToWorldMatrix if animGraph is loading or failed to load	2018-02-13 15:10:13 -08:00
Dante Ruiz	119a7554ee	Prevent add the same tablet url app to the tabletApps list	2018-02-13 14:33:15 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00