Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 18:55:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
75984 commits 71 branches 56 tags 1.2 GiB
Commit graph

754 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Ryan Huffman
59b7cdf318 Fix empty rgb field in Create going black 2018-11-29 14:10:22 -08:00
David Back
ec4726ad15 fix subproperty updates 2018-11-29 10:42:26 -08:00
David Back
006ba33352
Merge branch 'master' into entityListReorderColumns 2018-11-29 10:29:44 -08:00
David Back
e5f4f67c10 RC76 draggable number fixes 2018-11-28 17:30: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
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
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
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
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
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
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
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
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
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
0b0614c84a CR fixes 2018-11-13 11:13:00 -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
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
4eab623fd8 remove debugPrint function 2018-11-09 17:25:48 -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
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
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
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement 
Create APP tooltip / Adressed CR comments / Regression
 2018-11-08 10:03:17 -08: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
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591 
Don't attempt purchase of sold out items
 2018-11-05 16:20:02 -08:00
howard-stearns
8ad8398ef3 remove 'purchase' from login notice. 2018-11-04 11:17:56 -08:00
Ryan Huffman
c22df4dd94 Fix horizontal and vertical props in entity properties being swapped 2018-11-02 16:22:10 -07:00
Zach Fox
402c23e359 Use useragent instead of queryparam to determine limitedCommerce 2018-11-02 16:07:29 -07:00
Zach Fox
4a56f769e5 Re-add some code I shouldn't have removed 2018-11-01 11:04:59 -07:00
Zach Fox
34fb849536 Cleanup FIXME 2018-10-31 13:53:18 -07:00
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Zach Fox
b6344acc1d Big checkpoint. be aware - things may be broken 2018-10-30 15:08:13 -07:00
David Kelly
015b5fa681 Don't attempt purchase of sold out items 2018-10-30 08:01:22 -07:00
Zach Fox
d47fd44a47 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce 2018-10-29 14:57:23 -07:00
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
Howard Stearns
8b79795247 nix the word "purchase" where possible 2018-10-25 12:31:01 -07:00