Commit graph

603 commits

Author SHA1 Message Date
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix
Fix Collides With subproperties
2018-10-26 13:46:52 -07:00
David Back
13acfb325a fix collides with properties, fix ordering for start/finish/spread properties 2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips
MS19052 [CreateApp]: Tooltips
2018-10-25 14:52:16 -07:00
SamGondelman
faff5f11e8 Merge remote-tracking branch 'upstream/master' into particleLoad 2018-10-25 10:56:11 -07:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
358b0b76d1 tooltip delay of 500ms 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
David Back
a88678fb70 fix bad css merge, add particle property debounce 2018-10-24 15:07:47 -07:00
David Back
5c1972e3f4 fix fallback properties 2018-10-24 12:40:44 -07:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
David Back
073040d1fc
Merge branch 'master' into entityListTypeFilter 2018-10-24 10:39:30 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll
MS19054: [CreateApp/EntityList] auto scroll
2018-10-24 10:36:21 -07:00
Thijs Wenker
5f35a32480 remove duplicate calls to refresh footer 2018-10-24 17:58:07 +02:00
Thijs Wenker
8e1cfb5a06 fix double click selection 2018-10-24 17:58:07 +02:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
Thijs Wenker
27e0c85b01 entity list auto scroll 2018-10-24 17:58:06 +02:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
Thijs Wenker
3fa4ee0e1d enable duplicate copy cut paste functionality of context menu 2018-10-23 22:42:55 +02:00
Thijs Wenker
4069ca2e0c CR feedback 2018-10-23 22:42:55 +02:00
Thijs Wenker
e5ef589a3c style 2018-10-23 22:42:54 +02:00
Thijs Wenker
4c3f5b3bbc Entity List Context Menu 2018-10-23 22:42:54 +02:00
David Back
9afb111fbe add link, fix group order 2018-10-22 18:42:06 -07:00
David Back
d5dc93e800 QA fixes and reset server script status 2018-10-22 18:31:21 -07:00
David Back
e5caf01681 CR change for body click event 2018-10-22 14:51:54 -07:00
David Back
ddbe02dd4e CR changes and fix extra info toggle 2018-10-22 11:56:47 -07:00
David Back
76dbee265e Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-19 16:05:04 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00
Seth Alves
7f150e6ed3 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-18 09:53:18 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
David Back
ad920ddc86 fix double min, unique collides subproperty ids 2018-10-17 19:44:38 -07:00
Thijs Wenker
b9cfa28c08 style fixes 2018-10-17 19:42:47 -07:00
Thijs Wenker
684f7d5689 move export selection button to bottom of the list 2018-10-17 19:37:56 -07:00
David Back
9cd3c35cc6 style changes and fix hidden top row 2018-10-17 18:18:51 -07:00
Brad Hefta-Gaub
0e0542ec6e
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
2018-10-17 13:29:20 -07:00
David Back
001601d28f Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter 2018-10-17 11:30:10 -07:00
David Back
a2aa63e9ed adjust no entities message 2018-10-16 14:28:52 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Thijs Wenker
f1885159d2 style fixes 2018-10-15 21:17:41 +02:00
unknown
978cd4bb77 styling tweaks, fix X clear search not refreshing 2018-10-12 18:57:26 -07:00
unknown
6320f9bab7 tweaks 2018-10-12 11:39:54 -07:00
unknown
97438a08d9 styling fixes, add icon, adjust Types text, click outside to close 2018-10-11 23:04:33 -07:00
David Back
4883a60afc entity list type filter WIP - still some style issues 2018-10-11 18:55:14 -07:00
David Back
62c5fb8e2e tweaks / dropdown fix 2018-10-11 14:25:06 -07:00
David Back
3f08400741 comment 2018-10-11 12:48:08 -07:00
David Back
5528050898 CR changes - propertyName vs propertyID, store name/elementID, return property element 2018-10-11 12:44:07 -07:00
David Back
ac0e999629 fix colors 2018-10-10 17:31:06 -07:00
David Back
31e665ab8b CR changes - runtime property data rework 2018-10-10 16:49:20 -07:00
David Back
60d102c9bf styling fixes 2018-10-09 12:42:57 -07:00
David Back
7aba0a9082 cleanup 2018-10-09 10:17:39 -07:00