7528 commits

Author	SHA1	Message	Date
sam gateau	d8e7305f4a	Removing hili for now	2018-12-18 09:16:40 -08:00
Sam Gateau	76f204b5aa	Exploring the hologram	2018-12-18 00:45:12 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Sam Gateau	30277213c6	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-13 20:40:50 -08:00
sam gateau	94ae345daf	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-13 08:45:29 -08:00
Wayne Chen	4116f6ca9a	Merge branch 'master' into loginInitiative2	2018-12-12 18:00:07 -08:00
Jeff Clinton	5a81d8c093	Merge pull request #14453 from danteruiz/keyboard-menus ... Keyboard interaction menus	2018-12-12 17:53:59 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
Wayne Chen	0a0b7bf1ad	removing onUsernameChanged signal to alter login settings	2018-12-12 16:26:35 -08:00
Dante Ruiz	089a223c2d	more CR changes	2018-12-12 15:29:01 -08:00
Dante Ruiz	f3fad52e1d	make CR changes	2018-12-12 13:29:32 -08:00
Dante Ruiz	51bdf1bf78	adding keyboards settings	2018-12-12 11:55:13 -08:00
Wayne Chen	2f07a0eb5d	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-11 20:01:19 -08:00
Sam Gateau	8599a340ed	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-11 19:02:48 -08:00
Shannon Romano	efedc1f0b5	Merge pull request #14563 from danteruiz/teleport-settings ... Adding menu settings to disable teleporting	2018-12-11 21:08:23 +00:00
Zach Fox	826644ef08	Merge pull request #14559 from zfox23/MS20161_updatesDot ... Fix MS20161: Fix INVENTORY notification dot state	2018-12-11 13:03:26 -08:00
Jeff Clinton	e88e15fd94	Merge pull request #14560 from zfox23/MS4382_handshakeSparkles ... Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-11 11:51:54 -08:00
Dante Ruiz	deaf3e8e44	adding option to disable teleportring	2018-12-11 11:06:13 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Zach Fox	75ba1cb3c7	I forgot to clear dot immediately	2018-12-11 10:30:12 -08:00
sam gateau	9ffe38f40c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 15:13:58 -08:00
Zach Fox	3b9777d5d5	Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence	2018-12-10 14:08:38 -08:00
Zach Fox	ab6aeae91a	Fix MS20161: Fix INVENTORY notification dot state	2018-12-10 13:01:28 -08:00
Zach Fox	ed99da2165	Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page	2018-12-10 11:15:27 -08:00
sam gateau	4ab003091a	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-10 08:30:53 -08:00
Wayne Chen	4c9c785c24	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub	26ccfb2533	Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning ... Mini tablet tuning	2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub	1e9faa7754	Merge pull request #14276 from ctrlaltdavid/M19345 ... Make create apps not grab tablet if editing an entity with hand	2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub	0425ae1231	Merge pull request #14239 from ElderOrb/FB19219 ... FB19219 - Make avatarapp to handle wearables update via drag&drop	2018-12-09 17:20:13 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gondelman	ccdf1c8614	Merge branch 'master' into NOverlays4	2018-12-07 14:27:34 -08:00
Sam Gondelman	4c5ff0dc3e	Merge branch 'master' into NOverlays3	2018-12-07 14:26:59 -08:00
John Conklin II	2d52fffa4b	Merge pull request #14460 from huffman/fix/lifetime-slider-alt ... Change lifetime back to a regular input field	2018-12-07 13:43:08 -08:00
Ryan Huffman	a42a771df5	Merge pull request #14540 from huffman/feat/hide-certified-urls ... Add hiding of certified properties in Create	2018-12-07 13:42:23 -08:00
Thijs Wenker	3a259d8525	Merge branch 'master' of github.com:highfidelity/hifi into fix/create/missingStartMiddleFinishTooltips2 ... # Conflicts: # scripts/system/html/js/entityProperties.js	2018-12-07 20:24:21 +01:00
Ryan Huffman	bf844e0472	Add hiding of certified properties in Create	2018-12-07 11:05:52 -08:00
Ryan Huffman	f42c31ca36	Update number property to reuse numberdraggable emit function	2018-12-07 11:02:31 -08:00
Ryan Huffman	c9ab5c23ea	Add support for min/max/step/defaultValue on number field	2018-12-07 11:02:31 -08:00
Ryan Huffman	818339823c	Add new number type in Create	2018-12-07 11:02:31 -08:00
John Conklin II	55f59a720f	Merge pull request #14501 from thoys/fix/create/userDataErrorMessagePopupInfiniteLoopFix ... MS19567 [CreateApp]: userData error message continues popup fix	2018-12-07 10:59:34 -08:00
John Conklin II	d7e3935d57	Merge pull request #14421 from dback2/entityListReorderColumns ... Entity list - reorder columns	2018-12-07 10:59:02 -08:00
John Conklin II	3a22299503	Merge pull request #14441 from dback2/preventDragDrop ... Prevent dragging and dropping files onto Create windows	2018-12-07 10:58:42 -08:00
Wayne Chen	4e6f162e01	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-07 10:12:46 -08:00
Alexander Ivash	72a91668a5	FB19219 Make avatarapp to handle wearables update via drag&drop	2018-12-07 11:23:17 +03:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
John Conklin II	88efaaa4c7	Merge pull request #14544 from huffman/fix/particle-property-layout ... Improve Create properties for particles + materials	2018-12-06 16:45:44 -08:00
David Back	1a3708c49d	better drag drop fix	2018-12-06 16:14:28 -08:00
Thijs Wenker	4f2289b347	CR fixes	2018-12-06 23:42:37 +01:00
Thijs Wenker	2771e2862e	add missing material data json error clear on delete	2018-12-06 23:42:36 +01:00
Thijs Wenker	6d40bc9c2f	userData error message continues popup fix	2018-12-06 23:42:36 +01:00
David Back	6a11766dbf	Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop	2018-12-06 14:02:42 -08:00
David Back	8620a5a4c3	CR changes	2018-12-06 13:07:59 -08:00
David Back	a247e14f3d	Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns	2018-12-06 13:06:49 -08:00
David Back	9fab86d972	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-12-06 13:05:11 -08:00
David Back	e4efc90605	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-12-06 13:04:53 -08:00
Sam Gondelman	d21d764131	Merge branch 'master' into NOverlays4	2018-12-06 12:48:05 -08:00
Sam Gondelman	2291c7e5fb	Merge branch 'master' into NOverlays3	2018-12-06 12:37:18 -08:00
Thijs Wenker	d25b5f054b	Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips	2018-12-06 20:48:42 +01:00
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Sam Gondelman	c38a6966a9	Merge branch 'master' into NOverlays4	2018-12-06 11:25:43 -08:00
Sam Gondelman	d30dd4c26c	Merge branch 'master' into NOverlays3	2018-12-06 11:23:50 -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
Wayne Chen	30f1016f1c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-06 09:55:00 -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
Ryan Huffman	3160339551	Improve Create properties for particles + materials ... Sizing of input fields is now flexible. Material scale field labels are no longer obscured. Material tooltips are corrected.	2018-12-06 09:41:10 -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
David Rowe	aa952e9142	Fix mini tablet visibility angle calculations	2018-12-06 15:24:03 +13:00
David Rowe	363e3ca32d	Merge branch 'master' into mini-tablet-tuning	2018-12-06 13:55:24 +13:00
Sam Gateau	a295c6ffc8	scripts\developer\utilities\lib\jet\qml\TaskListView.qml	2018-12-04 22:41:36 -08:00
Wayne Chen	2d8b638370	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 14:19:28 -08:00
Wayne Chen	1375e85f2c	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-12-04 10:21:12 -08:00
Sam Gateau	d2ff4d4674	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-12-03 20:52:43 -08:00
sam gateau	0343983f31	Applying changes done in deferred to forward	2018-12-03 16:58:54 -08:00
SamGondelman	3ce6f7f3d6	real image entities	2018-12-03 11:50:59 -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
sam gateau	5af24aa7d9	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-03 08:49:44 -08:00
Wayne Chen	ef12b1128b	Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2	2018-11-30 20:18:04 -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
Sam Gateau	80ec393f2e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-11-30 19:16:42 -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
Wayne Chen	09bc886c20	Merge branch 'master' into loginInitiative2	2018-11-30 13:05:17 -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
David Back	006ba33352	Merge branch 'master' into entityListReorderColumns	2018-11-29 10:29:44 -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
Sam Gateau	fb47900e2f	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-11-28 19:12:29 -08:00
Wayne Chen	9deb15b9f6	Merge branch 'master' into loginInitiative2	2018-11-28 19:10:20 -08:00
David Back	e5f4f67c10	RC76 draggable number fixes	2018-11-28 17:30:18 -08:00
Sam Gateau	ba4aec2aff	Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf	2018-11-28 01:01:18 -08:00
Ryan Huffman	ec19d2f119	Fix Create tooltips getting pushed down for tall rows	2018-11-27 19:07:04 +01:00
Thijs Wenker	e193dcbc60	- add missing start/middle/finish tooltips ... - style updates	2018-11-27 19:07:04 +01:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -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
Wayne Chen	68834cb29f	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-11-26 10:11:41 -08:00
Wayne Chen	0d52566315	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-26 09:13:35 -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
David Rowe	5e51ba051a	Improve code responsibilities	2018-11-22 11:12:22 +13:00
Wayne Chen	51f5942a7f	adding sound to login screen	2018-11-21 13:36:36 -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
David Rowe	c3a0805db1	Make far grab ignore tablet while grabbing an entity	2018-11-21 10:28:46 +13:00
sam gateau	a28b5a8902	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-11-20 12:15:42 -08:00
David Rowe	44efd18882	Make Create and Shapes lasers ignore tablet while editing	2018-11-21 08:38:30 +13: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
David Back	a94fec75b4	prevent drag drop onto edit	2018-11-19 17:59:42 -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
Wayne Chen	b8d8710604	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-19 09:02:16 -08:00
David Rowe	eb8c6c8974	Merge branch 'master' into M19345	2018-11-19 09:47:05 +13: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
unknown	20cb64ead2	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-11-16 17:14:42 -08:00
unknown	a0f79f9881	entity list reordering columns	2018-11-16 17:14:30 -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
unknown	e9fb9b1f4d	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns	2018-11-16 14:51:48 -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
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
David Rowe	b24c482743	Terminate Create far grab etc. upon laser intersecting tablet	2018-11-16 16:29:57 +13:00
David Back	17404863e7	entity list reordering WIP	2018-11-15 17:42:51 -08: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
David Rowe	f2868fec3f	Merge branch 'master' into M19345	2018-11-16 09:11:11 +13: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
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -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
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -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
David Back	8db81d9ce6	restructure draggable numbers to be more like blender	2018-11-13 16:04:08 -08:00
John Conklin II	d7dd593a97	Merge pull request #14369 from dback2/entityListColumns ... Entity list - dynamic columns	2018-11-13 16:01:06 -08:00
David Back	91db81cd94	merge fix	2018-11-13 15:10:53 -08:00
David Back	c73e737552	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 15:04:12 -08:00
David Back	e88e131dca	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-13 15:04:02 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Jamil Akram	d65a79e815	Merge pull request #14377 from huffman/feat/ui-updates ... Update the styling for the Entity Properties window	2018-11-13 14:39:57 -08:00
Jeff Clinton	18bf6bf975	Merge pull request #14143 from ElderOrb/FB18673 ... FB18673 - Last line of GOTO desktop notification text cropped off on …	2018-11-13 14:05:21 -08:00
Ryan Huffman	aecbccc058	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-13 13:45:27 -08:00
Ryan Huffman	8c9015b224	Remove redundant dimensions in default entity properties	2018-11-13 13:45:27 -08:00
Ryan Huffman	536ba645b1	Update the styling for the Entity Properties window	2018-11-13 13:45:27 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub	07f94030ce	Merge pull request #14357 from ctrlaltdavid/M19761 ... Fix mini tablet JavaScript crash	2018-11-13 12:15:56 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
David Back	0b0614c84a	CR fixes	2018-11-13 11:13:00 -08:00
Dante Ruiz	812373cdab	fixing loading bar visual	2018-11-13 11:11:18 -08:00
Dante Ruiz	1a95ee2b31	making requested changes	2018-11-13 11:11:18 -08:00
Dante Ruiz	10d045b11b	fix infinate loading if entity server is not running	2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub	63e52ba8bd	Merge pull request #14284 from ctrlaltdavid/M19404 ... Fix interstitial page not displaying at Interface start-up	2018-11-13 10:38:38 -08:00
David Back	b5ec04a534	Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns	2018-11-13 10:35:57 -08:00
David Back	047708bedb	Merge branch 'master' of github.com:dback2/hifi into entityListColumns	2018-11-13 10:24:02 -08:00
Howard Stearns	545b85bc9d	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-13 09:55:54 -08:00
Seth Alves	7ffba9d987	Merge pull request #14204 from ctrlaltdavid/M12661 ... Fixes for collisionless entities	2018-11-13 09:42:07 -08:00
David Back	b3ccce9a3f	merge follow-up	2018-11-12 17:30:21 -08:00
David Back	c5023b1086	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-12 17:03:07 -08:00
Ryan Huffman	a787f55506	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-12 16:50:45 -08:00
Ryan Huffman	a020a09e8c	Remove redundant dimensions in default entity properties	2018-11-12 16:50:45 -08:00
Ryan Huffman	25df605459	Update the styling for the Entity Properties window	2018-11-12 16:50:45 -08:00
John Conklin II	0370c60398	Merge pull request #14358 from AndrewMeadows/fix-capsuleY ... Case 18436: consistent handling of CapsuleShape dimensions	2018-11-12 15:25:42 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
David Back	0781171912	Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders	2018-11-12 12:20:05 -08:00