23863 commits

Author	SHA1	Message	Date
Zach Fox	b548567f5a	Apps protection	2018-02-21 11:17:47 -08:00
Zach Fox	1fbc16aae2	Fix noPermissionGlyph margin	2018-02-21 10:52:17 -08:00
Zach Fox	f08c66e3ac	Remove debug code	2018-02-20 14:16:55 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Zach Fox	11f897beb0	Initial app support	2018-02-20 10:39:36 -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
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
Cain Kilgore	47ed45b5e9	Fixed extra " in backup_instructions.html	2018-02-17 18:14:44 +00: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
Zach Fox	c4e9c76258	Small UIT tweaks	2018-02-15 16:03:49 -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
Zach Fox	811ecf9db8	Fix	2018-02-15 14:44:33 -08:00
Zach Fox	8072372822	Lots of changes	2018-02-15 13:27:13 -08:00
Zach Fox	b8fb08dc74	Avatar support	2018-02-15 11:24:22 -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
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
Zach Fox	5a8b8d4ac8	Lots of changes	2018-02-14 16:44:02 -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
Zach Fox	0fca843667	Integrate 'alreadyOwned' endpoint	2018-02-14 10:24:34 -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
Zach Fox	a477a3da70	Done with My Purchases flow for now	2018-02-13 15:04:31 -08:00
Zach Fox	69a06bf1b7	Wrong fonts file	2018-02-13 14:42:03 -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
Zach Fox	ae8a8a48eb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-13 13:55:32 -08:00
Zach Fox	1b7253dc7f	Already Owned endpoint	2018-02-13 13:54:50 -08:00
Zach Fox	3e41229e8c	Commerce: Fix wrap mode for very long P2P memos	2018-02-13 13:30:17 -08:00
Zach Fox	8cd00c49d6	PAL: Prevent opening of Availability from WebView	2018-02-13 13:21:40 -08:00
Andrew Meadows	b111e82763	Merge pull request #12365 from AndrewMeadows/workload-001 ... moving Job/Task framework out of 'render' library and into its own 'task' library	2018-02-13 12:26:32 -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
Zach Fox	0809210dc3	No permission card	2018-02-13 11:16:48 -08:00
Dante Ruiz	cf3d8e4463	remove cached file	2018-02-13 11:07:15 -08:00
Dante Ruiz	45f09dde96	address tony's requests	2018-02-13 10:32:15 -08:00
Dante Ruiz	ddcee05b14	added control button for controller API	2018-02-13 09:41:00 -08:00
Andrew Meadows	8231a56b22	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
Andrew Meadows	be38a4bc71	creating workload lib	2018-02-13 08:54:44 -08:00