7223 commits

Author	SHA1	Message	Date
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
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
Seth Alves	87e4c17194	Merge pull request #14429 from danteruiz/disable-highlighting ... Remove entity highlighting	2018-11-29 09:04:56 -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
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
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
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
Thijs Wenker	e89346c146	making rename functionality list refresh proof	2018-11-16 22:10:14 +01:00
Thijs Wenker	31d37e7e75	Fix entity list double click rename / highlight issue	2018-11-16 22:08:58 +01:00
Ryan Huffman	556aec9412	Fix hiding of properties in Create	2018-11-15 15:27:30 -08:00
David Back	de7f4a4a4d	fix entity list resizing	2018-11-15 15:23:18 -08:00
John Conklin II	83660ab8e1	Merge pull request #14128 from Zvork/ao ... Improved Ambient Occlusion	2018-11-15 13:57:13 -08:00
Brad Hefta-Gaub	20766da624	Merge pull request #14382 from dback2/newPropertySliders ... Entity properties - new draggable numbers	2018-11-15 10:01:07 -08:00
Olivier Prat	ed42c94772	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-11-15 17:55:29 +01:00
David Back	dfed797682	set more min/max/steps	2018-11-14 15:44:30 -08:00
David Back	76d2519205	Merge pull request #14400 from dback2/missingTypeFilters ... Add PolyLine/PolyVox to entity list/properties types	2018-11-14 14:39:26 -08:00
David Back	d8f5e0f708	add min/max/step for some properties, remove duplicate createProperty, improve switch between states	2018-11-14 14:32:17 -08:00
David Back	70493e3f29	add polyline/polyvox to entity list/properties types	2018-11-14 12:23:16 -08:00
Thijs Wenker	cd12dd8f6d	fix OSX shortcut inconsistencies	2018-11-14 19:28:57 +01:00
Olivier Prat	85a3938cbe	Switch to app for ambient occlusion debug script	2018-11-14 11:55:11 +01:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
David Back	1aa048f4d6	style and decimal fixes	2018-11-13 17:56:31 -08:00
David Back	a349bac01c	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 16:32:15 -08:00
Thijs Wenker	2c715bf592	make window shortcuts work on OSX	2018-11-14 01:05:39 +01:00
Thijs Wenker	afd69d04dd	Make ctrl+shift shortcuts work for create app	2018-11-14 01:05:37 +01:00
Thijs Wenker	e890228fc7	Make shortcuts work in edit windows	2018-11-14 01:05:36 +01:00