Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 18:17:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
74641 commits 72 branches 56 tags 1.2 GiB
Commit graph

180 commits

Author SHA1 Message Date
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
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
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
Thijs Wenker
6d40bc9c2f userData error message continues popup fix 2018-12-06 23:42:36 +01:00
David Back
e4efc90605 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns 2018-12-06 13:04:53 -08:00
Thijs Wenker
d25b5f054b
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips 2018-12-06 20:48:42 +01: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
e193dcbc60 - add missing start/middle/finish tooltips 
- style updates
 2018-11-27 19:07:04 +01:00
Ryan Huffman
a6e203e3e5 Fix draggable inputs not being tabbable 2018-11-26 11:12:14 -08:00
Ryan Huffman
193b9752b8 Fix styling of properties window when narrow 2018-11-19 13:50:56 -08: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
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
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
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
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
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
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
Ryan Huffman
44d0a7254c Update the styling for the Entity Properties window 2018-11-08 16:36:55 -08:00
Thijs Wenker
9005efb639 style fixes 2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190 createApp - world/local switch 2018-11-09 01:28:37 +01:00
David Back
0597d15771 tabs 2018-11-07 16:06:18 -08:00
David Back
f0c2ec1fa4 entity list data-driven resizable addable/removable columns 2018-11-07 16:02:15 -08:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Thijs Wenker
13cad17793 better style js attributes 2018-10-25 02:46:16 +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
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
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
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
ddbe02dd4e CR changes and fix extra info toggle 2018-10-22 11:56:47 -07:00
David Back
e59f1516ef CR changes 2018-10-19 16:01:53 -07:00
David Back
45a92fd537 style tweaks 2018-10-18 15:12:38 -07:00
David Back
11add70ef2 style tweaks 2018-10-18 14:58:51 -07:00