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
|
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
|
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 |
|