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 |
|
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
|
6a11766dbf
|
Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop
|
2018-12-06 14:02:42 -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 |
|
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 |
|
Thijs Wenker
|
f38f39c84d
|
ignore shortcuts in TEXTAREA elements
|
2018-12-03 19:42:57 +01: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 |
|
David Back
|
ec4726ad15
|
fix subproperty updates
|
2018-11-29 10:42:26 -08:00 |
|
David Back
|
e5f4f67c10
|
RC76 draggable number fixes
|
2018-11-28 17:30:18 -08:00 |
|
Ryan Huffman
|
a6e203e3e5
|
Fix draggable inputs not being tabbable
|
2018-11-26 11:12:14 -08:00 |
|
Ryan Huffman
|
1e746e1b1c
|
Swap key light directions in Create
|
2018-11-21 16:43:54 -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
|
a94fec75b4
|
prevent drag drop onto edit
|
2018-11-19 17:59:42 -08:00 |
|
David Back
|
249ebb2389
|
remove unneeded
|
2018-11-19 16:21:52 -08:00 |
|
David Back
|
ff6d43d0e4
|
block updates during dragging
|
2018-11-19 16:15:11 -08:00 |
|
Ryan Huffman
|
193b9752b8
|
Fix styling of properties window when narrow
|
2018-11-19 13:50:56 -08:00 |
|
Ryan Huffman
|
556aec9412
|
Fix hiding of properties in Create
|
2018-11-15 15:27:30 -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 |
|
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 |
|
David Back
|
1aa048f4d6
|
style and decimal fixes
|
2018-11-13 17:56:31 -08:00 |
|
Thijs Wenker
|
2c715bf592
|
make window shortcuts work on OSX
|
2018-11-14 01:05:39 +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 |
|
David Back
|
91db81cd94
|
merge fix
|
2018-11-13 15:10:53 -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 |
|
Ryan Huffman
|
aecbccc058
|
Remove dead code and cleanup JS styling for entity properties redesign
|
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 |
|
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
|
25df605459
|
Update the styling for the Entity Properties window
|
2018-11-12 16:50:45 -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 |
|
David Back
|
a0d5b1117a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
|
2018-11-12 11:41:00 -08:00 |
|
unknown
|
0160ab23ab
|
fix color pickers
|
2018-11-09 17:23:51 -08:00 |
|
unknown
|
08d9eda7d7
|
fix property bugs / style issues
|
2018-11-09 17:08:10 -08:00 |
|
David Back
|
615ffebb2c
|
new draggable numbers WIP
|
2018-11-09 13:14:05 -08:00 |
|
SamGondelman
|
b3abd97707
|
projected materials and repeat property
|
2018-11-09 10:47:07 -08:00 |
|
Ryan Huffman
|
44d0a7254c
|
Update the styling for the Entity Properties window
|
2018-11-08 16:36:55 -08:00 |
|
Thijs Wenker
|
08da8c4190
|
createApp - world/local switch
|
2018-11-09 01:28:37 +01:00 |
|
Jeff Clinton
|
d349c1e672
|
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles
Fix horizontal and vertical props in entity properties being swapped
|
2018-11-08 12:42:48 -08:00 |
|
Zach Fox
|
e80468e423
|
Remove URL logging from JS and QML
|
2018-11-06 15:09:24 -08:00 |
|
Ryan Huffman
|
c22df4dd94
|
Fix horizontal and vertical props in entity properties being swapped
|
2018-11-02 16:22:10 -07:00 |
|
Thijs Wenker
|
92888e9d3e
|
tooltip CR changes
|
2018-10-31 18:26:23 +01:00 |
|