7268 commits

Author	SHA1	Message	Date
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Adam Smith	08d6e35d4d	Merge pull request #14372 from SamGondelman/decals ... Case 19798: 3D projected Material Entities and materialRepeat option	2018-12-06 11:13:46 -08:00
Ryan Huffman	13c3b410d8	Merge pull request #14495 from dback2/draggableNumberFixes76-master ... Draggable numbers - RC76 fixes to master	2018-12-06 09:47:38 -08:00
Jeff Clinton	e65e8d29a1	Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake ... Ensure that hand is in grasp pose during desktop handshake animation	2018-12-06 09:41:29 -08:00
Jeff Clinton	7f242b8c0e	Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master ... [RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus	2018-12-06 09:11:49 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
Thijs Wenker	f38f39c84d	ignore shortcuts in TEXTAREA elements	2018-12-03 19:42:57 +01:00
Zach Fox	2776839dff	Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval ... Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-12-03 10:27:32 -08:00
David Back	a05e831333	Merge branch 'master' into draggableNumberFixes76-master	2018-12-03 09:42:58 -08:00
Shannon Romano	3c43f44119	Merge pull request #14462 from huffman/fix/key-light-angle ... Swap key light directions in Create	2018-11-30 19:28:53 -08:00
Shannon Romano	0d2b0903d8	Merge pull request #14469 from huffman/fix/draggable-input-tabbable ... Fix draggable inputs not being tabbable	2018-11-30 19:28:11 -08:00
Shannon Romano	5afff69b78	Merge pull request #14505 from huffman/fix/create-empty-rgb-field ... Fix empty rgb field in Create going black	2018-11-30 18:19:44 -08:00
Zach Fox	051b7cfbb8	Fix MS20117: Prevent HTML link from appearing in Wallet notification	2018-11-30 16:12:21 -08:00
Ryan Huffman	59b7cdf318	Fix empty rgb field in Create going black	2018-11-29 14:10:22 -08:00
David Rowe	dc05cdee5a	Merge branch 'master' into M17406 ... # Conflicts: # scripts/system/controllers/controllerModules/nearParentGrabEntity.js	2018-11-30 09:44:09 +13:00
David Back	ec4726ad15	fix subproperty updates	2018-11-29 10:42:26 -08:00
David Back	859c0f3389	Merge branch 'master' of https://github.com/highfidelity/hifi into draggableNumberFixes76-master	2018-11-29 10:41:56 -08:00
Seth Alves	87e4c17194	Merge pull request #14429 from danteruiz/disable-highlighting ... Remove entity highlighting	2018-11-29 09:04:56 -08:00
Sam Gateau	aa749b0980	adressing review comments	2018-11-28 21:46:13 -08:00
Sam Gateau	9353745054	MErge with master	2018-11-28 21:40:24 -08:00
David Back	e5f4f67c10	RC76 draggable number fixes	2018-11-28 17:30:18 -08:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Zach Fox	8df5db4239	Allow scripts to open SendAsset screen with pre-filled info	2018-11-26 13:26:17 -08:00
Ryan Huffman	a6e203e3e5	Fix draggable inputs not being tabbable	2018-11-26 11:12:14 -08:00
David Rowe	c96cd422e1	Fix near parent grab tear away calc for avatar scale	2018-11-24 11:58:40 +13:00
David Rowe	f2abf8e398	Debounce haptic pulses at start of near parent grab	2018-11-24 11:43:05 +13:00
David Rowe	29c268df5a	Remove extraneous grab entity haptic pulses	2018-11-24 11:38:54 +13:00
David Rowe	f1dad3c465	Add hystersis between near parent grabbing and tearing away	2018-11-24 08:35:02 +13:00
David Rowe	1362e7f361	Fix near parent grab entity tear away distance calc	2018-11-24 08:26:54 +13:00
Ryan Huffman	1e746e1b1c	Swap key light directions in Create	2018-11-21 16:43:54 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00
sam gateau	44b9b92450	Getting ready for merge	2018-11-20 17:32:04 -08:00
sam gateau	a28b5a8902	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-20 12:15:42 -08:00
John Conklin II	87cac67c75	Merge pull request #14280 from ElderOrb/FB17381 ... FB17381 - Reticle.setVisible isn't working	2018-11-20 09:53:52 -08:00
John Conklin II	04ccf9a257	Merge pull request #14435 from dback2/draggableNumberDelay2 ... Entity list - prevent draggable number updates while dragging	2018-11-20 09:16:14 -08:00
Anthony Thibault	0f7afb133a	Ensure that hand is in grasp pose during desktop handshake animation	2018-11-19 17:59:50 -08:00
sam gateau	3412a4573b	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-19 17:40:15 -08:00
David Back	dff4e34e7b	CR changes	2018-11-19 16:59:33 -08:00
David Back	249ebb2389	remove unneeded	2018-11-19 16:21:52 -08:00
Ryan Huffman	b7fe3d47be	Merge pull request #14433 from huffman/fix/entity-properties-styling ... Fix several entity tool window styling issues	2018-11-19 16:17:50 -08:00
David Back	ff6d43d0e4	block updates during dragging	2018-11-19 16:15:11 -08:00
Ryan Huffman	007396346c	Fix grid tool styling	2018-11-19 14:07:24 -08:00
Ryan Huffman	7694aa8e66	Fix draggable number going into edit too often	2018-11-19 13:51:25 -08:00
Ryan Huffman	193b9752b8	Fix styling of properties window when narrow	2018-11-19 13:50:56 -08:00
Dante Ruiz	d6fbcb1668	remove entity highlighting	2018-11-19 11:04:09 -08:00
Sam Gateau	5f062bbcf5	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-11-16 20:05:08 -08:00
Ryan Huffman	7701be0742	Merge pull request #14410 from thoys/fix/create/entityListDoubleClick ... CreateApp Fix entity list double click rename / highlight and virtual keyboard issue	2018-11-16 18:41:47 -08:00
Thijs Wenker	ba790ae470	fix behavior after merge.	2018-11-17 01:20:36 +01:00
Shannon Romano	6425a474ac	Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading ... Fixing case of interstitial not finishing loading	2018-11-16 14:53:01 -08:00
Thijs Wenker	7b3d2bed15	CR fixes	2018-11-16 22:10:15 +01:00