Dante Ruiz
deaf3e8e44
adding option to disable teleportring
2018-12-11 11:06:13 -08:00
Zach Fox
75ba1cb3c7
I forgot to clear dot immediately
2018-12-11 10:30:12 -08:00
Zach Fox
3b9777d5d5
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
2018-12-10 14:08:38 -08:00
Zach Fox
ab6aeae91a
Fix MS20161: Fix INVENTORY notification dot state
2018-12-10 13:01:28 -08:00
Zach Fox
ed99da2165
Fix MS20215: Fix incorrect display of unavailable items on Marketplace main page
2018-12-10 11:15:27 -08:00
Wayne Chen
4c9c785c24
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-10 07:57:44 -08:00
Brad Hefta-Gaub
26ccfb2533
Merge pull request #14329 from ctrlaltdavid/mini-tablet-tuning
...
Mini tablet tuning
2018-12-09 17:23:59 -08:00
Brad Hefta-Gaub
1e9faa7754
Merge pull request #14276 from ctrlaltdavid/M19345
...
Make create apps not grab tablet if editing an entity with hand
2018-12-09 17:21:10 -08:00
Brad Hefta-Gaub
0425ae1231
Merge pull request #14239 from ElderOrb/FB19219
...
FB19219 - Make avatarapp to handle wearables update via drag&drop
2018-12-09 17:20:13 -08:00
Sam Gondelman
4c5ff0dc3e
Merge branch 'master' into NOverlays3
2018-12-07 14:26:59 -08:00
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
Ryan Huffman
a42a771df5
Merge pull request #14540 from huffman/feat/hide-certified-urls
...
Add hiding of certified properties in Create
2018-12-07 13:42:23 -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
bf844e0472
Add hiding of certified properties in Create
2018-12-07 11:05:52 -08:00
Ryan Huffman
f42c31ca36
Update number property to reuse numberdraggable emit function
2018-12-07 11:02:31 -08:00
Ryan Huffman
c9ab5c23ea
Add support for min/max/step/defaultValue on number field
2018-12-07 11:02:31 -08: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
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
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
Wayne Chen
1375e85f2c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 10:21:12 -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
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
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
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
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
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
David Rowe
c3a0805db1
Make far grab ignore tablet while grabbing an entity
2018-11-21 10:28:46 +13: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
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
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
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 Rowe
b24c482743
Terminate Create far grab etc. upon laser intersecting tablet
2018-11-16 16:29:57 +13: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
David Rowe
f2868fec3f
Merge branch 'master' into M19345
2018-11-16 09:11:11 +13: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
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -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
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -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
afd69d04dd
Make ctrl+shift shortcuts work for create app
2018-11-14 01:05:37 +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
c73e737552
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-13 15:04:12 -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
Jamil Akram
d65a79e815
Merge pull request #14377 from huffman/feat/ui-updates
...
Update the styling for the Entity Properties window
2018-11-13 14:39:57 -08:00
Jeff Clinton
18bf6bf975
Merge pull request #14143 from ElderOrb/FB18673
...
FB18673 - Last line of GOTO desktop notification text cropped off on …
2018-11-13 14:05:21 -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
8c9015b224
Remove redundant dimensions in default entity properties
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
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
07f94030ce
Merge pull request #14357 from ctrlaltdavid/M19761
...
Fix mini tablet JavaScript crash
2018-11-13 12:15:56 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
...
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
David Back
0b0614c84a
CR fixes
2018-11-13 11:13:00 -08:00
Dante Ruiz
812373cdab
fixing loading bar visual
2018-11-13 11:11:18 -08:00
Dante Ruiz
1a95ee2b31
making requested changes
2018-11-13 11:11:18 -08:00
Dante Ruiz
10d045b11b
fix infinate loading if entity server is not running
2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404
...
Fix interstitial page not displaying at Interface start-up
2018-11-13 10:38:38 -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
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Seth Alves
7ffba9d987
Merge pull request #14204 from ctrlaltdavid/M12661
...
Fixes for collisionless entities
2018-11-13 09:42:07 -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
a020a09e8c
Remove redundant dimensions in default entity properties
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
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
...
Case 18436: consistent handling of CapsuleShape dimensions
2018-11-12 15:25:42 -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
Ryan Huffman
5e6d0c0f94
Merge pull request #14376 from thoys/feat/create/localGlobalToggle
...
[CreateApp] Local/World toggle
2018-11-12 10:37:55 -08:00
Wayne Chen
ea325acef9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-12 10:28:03 -08:00
David Back
eeb8ede8ff
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-12 10:10:38 -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
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
David Back
615ffebb2c
new draggable numbers WIP
2018-11-09 13:14:05 -08:00
Jeff Clinton
ee9154a801
Merge pull request #14341 from sethalves/fix-mouse-equip
...
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
2018-11-09 12:54:36 -08:00
SamGondelman
b3abd97707
projected materials and repeat property
2018-11-09 10:47:07 -08:00
Jeff Clinton
3d01949e43
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic
...
Case 19495: zero velocities of non-dynamic entities on nearGrab release
2018-11-09 10:10:49 -08:00
Thijs Wenker
99fcef105f
spaceMode / desiredSpaceMode explanation
2018-11-09 17:59:00 +01:00
David Rowe
a34e1f69e0
Merge branch 'master' into M19345
...
# Conflicts:
# scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
2018-11-09 14:26:29 +13:00
David Rowe
c9b3fda724
Merge branch 'master' into M19768
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
Thijs Wenker
e483b1342c
CR fixes
2018-11-09 01:56:17 +01:00
David Rowe
aca7143449
Fix interstitial music not playing at Interface start-up
2018-11-09 13:41:07 +13:00
Ryan Huffman
3b57e45fdd
Remove redundant dimensions in default entity properties
2018-11-08 16:36:55 -08:00
Ryan Huffman
44d0a7254c
Update the styling for the Entity Properties window
2018-11-08 16:36:55 -08:00
David Rowe
5c97954e66
Merge branch 'master' into M19404
...
# Conflicts:
# scripts/system/interstitialPage.js
2018-11-09 13:35:11 +13: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
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
David Rowe
cdae5cd03d
Front-load interstitial scripts and resources
2018-11-09 10:53:34 +13:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
...
3D Keyboard.
2018-11-08 13:35:13 -08: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
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
...
Interstitial bug fixes
2018-11-08 11:43:38 -08:00
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2
2018-11-08 11:17:24 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic
...
Fix new models not obeying dynamic checkbox
2018-11-08 10:22:12 -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
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values
...
Update the default edit.js collidesWith to include myAvatar
2018-11-08 09:17:40 -08:00
David Rowe
371919b923
Fix mini tablet always displaying if start up in HMD mode
2018-11-08 17:47:02 +13: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
Wayne Chen
bd11825f3d
removing debug print statement
2018-11-07 09:40:01 -08:00
Wayne Chen
fc32ba9ce3
fixing create app window on desktop
2018-11-07 09:26:34 -08:00
David Rowe
28097933ed
Add setting to enable/disable the mini tablet
2018-11-07 14:39:06 +13:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Andrew Meadows
b38c263e60
use correct capsule dimensions in teleport.js
2018-11-06 12:44:14 -08:00
David Rowe
629559e78c
Add extra ()s
2018-11-07 09:20:54 +13:00
David Rowe
f47f77b181
Fix mini tablet JavaScript crash
2018-11-07 09:11:43 +13:00
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless
...
Remove tabs from oculus store inventory, and rename to match
2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6
activity notifications also change ASSETS to INVENTORY
2018-11-05 16:43:06 -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
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
howard-stearns
7115f0e688
update notification refs inventory, not assets
2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb
close wallet app during login so that it doesn't tell to login after
...
login
2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9
remove wallet reference in update notification
2018-11-04 11:25:40 -08:00
howard-stearns
8ad8398ef3
remove 'purchase' from login notice.
2018-11-04 11:17:56 -08:00
Seth Alves
a94fd2a1c9
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
2018-11-03 13:14:08 -07:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07: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
Dante Ruiz
b33934ec46
fixing Image3DOverlay scaling
2018-11-02 14:24:14 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
David Rowe
55d0822b1a
Delay showing mini tablet
2018-11-02 18:18:41 +13:00
David Rowe
8924f0832a
Use half angles relative to palm normal for mini tablet visibility
2018-11-02 18:06:00 +13:00
Ryan Huffman
4593b33435
Fix new models not obeying dynamic checkbox
2018-11-01 14:38:55 -07:00
David Rowe
1e3549d263
Increase delay in shrinking the mini tablet after start of trigger
2018-11-02 08:33:14 +13:00
Ryan Huffman
01b29185ca
Update the default edit.js collidesWith to include myAvatar
2018-11-01 12:04:20 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5
Re-add some code I shouldn't have removed
2018-11-01 11:04:59 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Alexander Ivash
dcf20d2a15
FB17381 - Reticle.setVisible isn't working
2018-11-01 22:39:02 +05:30
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
a1276ba899
Don't poll for history notifs if limitedCommerce is true
2018-10-31 13:31:29 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Dante Ruiz
b3539b101b
faster loading bar interpolation once physics is enabled
2018-10-31 11:33:53 -07:00
Thijs Wenker
92888e9d3e
tooltip CR changes
2018-10-31 18:26:23 +01:00
Andrew Meadows
225e8e0556
always zero velocity on far-grab release of non-dynamic
2018-10-31 10:20:21 -07:00
Dante Ruiz
0279eef3a4
improving interstitial loading bar
2018-10-31 10:13:32 -07:00
Andrew Meadows
90e944f130
always zero velocity on near-grab release of non-dynamic
2018-10-30 16:20:33 -07: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
David Rowe
791ee04aea
Merge branch 'master' into M12661
2018-10-30 13:33:53 +13: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
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props
...
keep userData and new grab properties in sync
2018-10-26 11:52:47 -07:00
David Rowe
2fdb114e4b
Fix interstitial page not displaying at Interface start-up
2018-10-26 19:21:37 +13: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
John Conklin II
7227547b6a
Merge pull request #14279 from dback2/removeParticleExplorer
...
Remove particle explorer
2018-10-25 13:37:22 -07:00
Howard Stearns
8b79795247
nix the word "purchase" where possible
2018-10-25 12:31:01 -07:00
David Back
eb347c5596
remove particle explorer
2018-10-25 11:30:18 -07:00
Howard Stearns
6284c902be
use the switch
2018-10-25 11:29:10 -07:00
SamGondelman
faff5f11e8
Merge remote-tracking branch 'upstream/master' into particleLoad
2018-10-25 10:56:11 -07:00
Seth Alves
b8f1c96685
rats
2018-10-25 07:47:16 -07:00
Seth Alves
b93807b1a7
remove conversion code from equipEntity.js
2018-10-25 07:47:16 -07:00
David Rowe
1460e43f6e
Make tablet highlight not display if editing an entity with hand
2018-10-25 15:04:59 +13:00
David Rowe
0eead13fb9
Make Create not grab tablet if editing an entity with hand
2018-10-25 15:03:47 +13:00
Thijs Wenker
13cad17793
better style js attributes
2018-10-25 02:46:16 +02:00
Thijs Wenker
bb7d1f8afb
fix broken and missing tooltips
2018-10-25 02:46:16 +02: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
Howard Stearns
1ff50bc05e
updates notification applies to assets, and there is no wallet activity
...
notification
2018-10-24 12:45:17 -07:00
David Back
5c1972e3f4
fix fallback properties
2018-10-24 12:40:44 -07:00
Howard Stearns
e1e9b78427
filter priced items from marketplace
2018-10-24 12:22:03 -07:00
David Back
b3e0d51260
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-24 11:48:56 -07:00
Howard Stearns
8ee6a0ceff
disable priced items
2018-10-24 11:37:02 -07:00
Howard Stearns
ce20b82408
fix view this item in my purchases
2018-10-24 10:41:14 -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
Brad Hefta-Gaub
f8e38e98e1
Merge pull request #14214 from huffman/feat/edit-defaults
...
Update default entity properties in Create
2018-10-24 10:00:46 -07:00
Brad Hefta-Gaub
5e27a5930e
Merge pull request #14186 from thoys/feat/create/entityList-contextMenu
...
MS19056: [CreateApp/Entity List] Context Menu
2018-10-24 09:58:32 -07:00
Howard Stearns
c1cb41875a
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-24 09:56:37 -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
unknown
c7ba386be1
darn prints somehow slipping past me
2018-10-23 20:56:53 -07:00
unknown
06aff231a3
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 20:19:06 -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
Kerry Ivan Kurian
3cf000a71b
Merge pull request #14232 from kkurian/log-resource-requests-2
...
Display resource-access events in marketplace item tester
2018-10-23 15:18:30 -07:00
Brad Hefta-Gaub
04d251c321
Merge pull request #14249 from wayne-chen/mergedInterstitialBugFixes
...
Merged interstitial bug fixes
2018-10-23 14:30:55 -07:00
Kerry Ivan Kurian
e7d1c2873a
Merge branch 'master' into log-resource-requests-2
2018-10-23 13:46:59 -07:00
Thijs Wenker
4e9f9b3edf
comply with copy/paste update
2018-10-23 22:42:56 +02: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
SamGondelman
8807b90474
fix emitRadiusStart
2018-10-23 13:33:14 -07:00
Howard Stearns
97bc84ed87
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-23 13:32:35 -07:00
David Back
9df8ea35bb
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-23 13:28:35 -07:00
tapalisa
7a684081f0
Merge pull request #14235 from huffman/feat/edit-copy-paste
...
Add copy/paste functionality to edit.js
2018-10-23 13:18:12 -07:00
Howard Stearns
a79fe4df79
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-23 13:09:33 -07:00
Howard Stearns
95b86bf5b7
initial limited commerce for oculus store prototype
2018-10-23 13:08:39 -07:00
Brad Hefta-Gaub
447bfae828
Merge pull request #13884 from ctrlaltdavid/M17853
...
Highlight tablet when it is near-grabbable
2018-10-23 12:31:41 -07: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
Ryan Huffman
d7dce456b2
Fix incorrect default entity properties in Create
2018-10-22 18:29:27 -07:00
David Back
e8bda1793f
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-22 15:12:45 -07:00
David Back
e5caf01681
CR change for body click event
2018-10-22 14:51:54 -07:00
Kerry Ivan Kurian
a1bb685176
Remove cruft
2018-10-22 14:00:08 -07:00
Zach Fox
f5a5c0dad3
Attempt to fix wearable bug?
2018-10-22 14:00:06 -07:00
Zach Fox
f9cc4f5a69
Count unique source and url pairs
2018-10-22 14:00:01 -07:00
Zach Fox
de93bbb08b
Only show unique resources
2018-10-22 13:59:59 -07:00
Zach Fox
d44f9e2ccc
Tons of improvements
2018-10-22 13:59:57 -07:00
Zach Fox
7be5d5674d
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-22 13:59:35 -07:00
Ryan Huffman
573df2d922
Move copy/paste/cut to SelectionManager
2018-10-22 13:56:08 -07:00
Ryan Huffman
e0851c4807
Add cut to Create, and update shortcuts
2018-10-22 13:56:08 -07:00
Ryan Huffman
65fdd16d90
Cleanup copy/paste changes
2018-10-22 13:56:07 -07:00
Ryan Huffman
9cc2add4a0
Add copy/paste functionality to edit.js
2018-10-22 13:56:07 -07:00
David Rowe
35c1241c98
Fix tablet highlighting not working if start up in HMD
2018-10-23 09:08:38 +13:00
Dante Ruiz
1ce1902fa8
remove magic numbers
2018-10-22 12:49:24 -07:00
David Back
ddbe02dd4e
CR changes and fix extra info toggle
2018-10-22 11:56:47 -07:00
John Conklin II
b3698388ea
Merge pull request #14245 from huffman/feat/default-grabbable-setting
...
Add a 'grabbable' option to the new-model dialog
2018-10-22 11:42:40 -07:00
Wayne Chen
d008bfa523
partial requested code changes
2018-10-22 11:29:36 -07:00
David Back
f5616acba9
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
2018-10-22 11:21:27 -07:00
Wayne Chen
7284c3ad53
Merge branch 'intersttiial-do-not-intersect-web' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
2018-10-22 10:28:35 -07:00
Wayne Chen
e2b90aac9d
Merge branch 'interstitialIgnoreFix' of https://github.com/wayne-chen/hifi into mergedInterstitialBugFixes
2018-10-22 10:28:12 -07:00
Wayne Chen
d12ee393d7
Merge branch 'fix-some-more-interstitial-issues' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
2018-10-22 10:27:13 -07:00
Wayne Chen
4a8348e0d1
Merge branch 'interstitial-loading-imporvements' of https://github.com/danteruiz/hifi into mergedInterstitialBugFixes
2018-10-22 10:14:40 -07:00
Wayne Chen
27813d4948
Merge branch 'fix/loadingscreen-optimization' of https://github.com/FlameSoulis/hifi into mergedInterstitialBugFixes
2018-10-22 10:05:55 -07:00
Wayne Chen
afd8baca87
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialIgnoreFix
2018-10-22 10:01:57 -07:00
Ryan Huffman
9d13902cd3
Improve paramater names in model dialog window
2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445
Add a 'grabbable' option to the new-model dialog
2018-10-19 16:42:45 -07:00
Brad Hefta-Gaub
1ff69844f2
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
...
hide progress overlays if interstitial mode
2018-10-19 16:35:42 -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 Rowe
71ec5f3612
Fix tablet highlighting when using the Create and Shapes apps
2018-10-20 11:57:46 +13:00
David Rowe
eb179363f6
Merge branch 'master' into M17853
...
# Conflicts:
# scripts/system/controllers/controllerDispatcher.js
2018-10-20 11:19:26 +13:00
Flame Soulis
5db7c7821e
Proper formatting (aka no spaces after anonymous funcs)
2018-10-19 08:51:13 -04:00
Flame Soulis
ba459eda9e
Removed duplicate backgroundAlpha
2018-10-19 08:41:04 -04:00
Flame Soulis
fcde53fc65
Include black-sphere.fbx and update linked url
2018-10-19 08:22:43 -04:00
Flame Soulis
014c1590dd
Made MP3 constistant 128kbps and fixed path resolving
2018-10-19 08:16:14 -04:00
Flame Soulis
e499309c8e
Upload interstitial page sound and update link
2018-10-19 06:49:48 -04:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix
...
More reliable "Create Entities as Grabbable" settings persistence.
2018-10-18 18:26:48 -07:00
John Conklin II
bbccd0ff73
Merge pull request #14120 from zfox23/MS18609_snapShareBugs
...
Fix MS18609: Various Snapshot sharing bugs
2018-10-18 18:21:23 -07:00
John Conklin II
5095a4e0eb
Merge pull request #14196 from sethalves/interstitial-domain-full
...
go to error-room when failing to connect to a full domain
2018-10-18 17:49:35 -07:00
John Conklin II
addae51976
Merge pull request #14215 from ctrlaltdavid/M19308
...
Hide mini tablet immediately upon near grabbing an entity
2018-10-18 17:47:17 -07:00
Ryan Huffman
a4adf2c716
Fix name of Particles to ParticleEffect for default properties in edit.js
2018-10-18 17:39:24 -07:00
David Rowe
3e49d55dbf
Merge branch 'master' into M12661
...
# Conflicts:
# scripts/system/controllers/controllerModules/farActionGrabEntity.js
2018-10-19 11:24:43 +13: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
Wayne Chen
6cf9608c97
adding fade in and fade outt in interstitial for progress
2018-10-18 13:12:04 -07:00
David Rowe
490c085eb8
Merge branch 'master' into M16440
...
# Conflicts:
# scripts/system/controllers/controllerModules/hudOverlayPointer.js
# scripts/system/controllers/controllerModules/inVREditMode.js
2018-10-19 09:06:33 +13:00
Seth Alves
7f150e6ed3
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-18 09:53:18 -07:00
Zach Fox
72b3777953
Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs
2018-10-18 09:39:34 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
David Back
f13008dbe9
tabs
2018-10-17 20:04:28 -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
9e35af0c4a
remove space
2018-10-17 18:24:09 -07:00
David Back
9cd3c35cc6
style changes and fix hidden top row
2018-10-17 18:18:51 -07:00
Wayne Chen
fd3c0d2f76
pushing with new fix
2018-10-17 15:03:09 -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
Thijs Wenker
4ef2ad041b
Merge pull request #14136 from thoys/feat/create/exportSelection
...
MS19053: [CreateApp/EntityList] Move export selection button to bottom of the list
2018-10-17 19:50:37 +02:00
David Back
a2aa63e9ed
adjust no entities message
2018-10-16 14:28:52 -07:00
David Back
5ae4425729
Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter
2018-10-16 14:20:48 -07:00
David Back
58e8d4071d
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListTypeFilter
2018-10-16 13:52:27 -07:00
David Back
50becb5c37
merge particle explorer into properties, resurrect sliders, other tidying/fixes
2018-10-16 12:39:34 -07:00
Ryan Huffman
738ac30f1d
Update default entity properties in Create
2018-10-15 13:42:10 -07:00
David Rowe
c9919ff69d
Hide mini tablet immediately upon near grabbing an entity
2018-10-16 08:22:30 +13: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
a85336044f
add X to clear button to filter search
2018-10-12 18:03:47 -07:00
David Rowe
7d3eca57bb
Fix mouse pointer not recognizing or highlighting collisionless entities
2018-10-13 10:22:41 +13:00
David Rowe
3bc4581f82
Fix far grabbing collisionless entity removing collisionless property
2018-10-13 10:22:27 +13:00
David Rowe
ca4fe0682e
Fix collisionless entities not being able to be far grabbed
2018-10-13 10:22:05 +13:00
Howard Stearns
a92aa1f9da
new treatment for hmd/tablet login
2018-10-12 14:17:23 -07:00
Dante Ruiz
fa6b3019f6
fix js memory leak
2018-10-12 12:07:39 -07:00
Dante Ruiz
d7dc69129a
improve loading bar progress
2018-10-12 11:43:03 -07:00
unknown
6320f9bab7
tweaks
2018-10-12 11:39:54 -07:00
Seth Alves
47d3c9ba27
go to error-room when failing to connect to a full domain
2018-10-12 11:28: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
Dante Ruiz
451142f9a3
fixing some more interstittial issues
2018-10-11 11:33:19 -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
Dante Ruiz
a47a1c03e6
ignore web entities
2018-10-10 14:08:47 -07:00
Dante Ruiz
296ea8a5af
fix overlay issues during interstitial mode
2018-10-10 12:00:58 -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
David Back
27d9e8bd23
initial pass refactored re-ordered data-driver entity properties
2018-10-09 10:11:30 -07:00
Wayne Chen
6f9593dabd
adding fix for far action grab
2018-10-08 16:59:39 -07:00
David Rowe
0b163ffaf8
Fix typos
2018-10-09 11:05:48 +13:00
Alexander Ivash
19c3f1516f
relax 'isWearable' conditions to treat entities like 'ghost.json' as wearables
2018-10-09 00:17:19 +03:00
Wayne Chen
ea8229fca4
adding fix for length check
2018-10-08 13:10:41 -07:00
divya
91df342ae9
Merge pull request #14094 from wayne-chen/interstitialMerged
...
Merged interstitial page/redirect domain improvements
2018-10-08 10:32:29 -07:00
Wayne Chen
f758438dcc
Merge pull request #9 from danteruiz/interstitialMerged
...
fix for failing to enter domain
2018-10-05 16:19:25 -07:00
Dante Ruiz
36c2cceb57
fix for failing to enter domain
2018-10-05 15:39:51 -07:00
Wayne Chen
8abbd51bb1
removing unused variable
2018-10-04 23:11:27 -07:00
Wayne Chen
89e2cf7153
Merge pull request #7 from danteruiz/interstitialMerged
...
Interstitial merged
2018-10-04 17:10:27 -07:00
Wayne Chen
a2237aa48a
reverting click overlay behavior
2018-10-04 16:41:14 -07:00
Wayne Chen
c423305bd1
check overlay visibility before showing back up again
2018-10-04 16:30:48 -07:00
Dante Ruiz
651f37aceb
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
2018-10-04 15:01:39 -07:00
Dante Ruiz
bda9735b5d
fix loading progress
2018-10-04 15:01:16 -07:00
Wayne Chen
2e3566bc73
hide overlays after clicking on them
2018-10-04 14:24:43 -07:00
Alexander Ivash
f8285ab3d8
FB18673 - Last line of GOTO desktop notification text cropped off on bottom
2018-10-05 00:14:13 +03:00
Wayne Chen
0a7102b4d3
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-04 08:59:26 -07:00
Wayne Chen
22a9030fb5
hiding text overlays when out of error state
2018-10-03 17:54:55 -07:00
Wayne Chen
d6af09ca62
ignoring entities in interstitial/saving address on 404 error
2018-10-03 17:40:42 -07:00
David Rowe
3bc1c2963d
Fix HUD laser while in Shapes app
2018-10-04 13:15:33 +13:00
David Rowe
209d1535c2
Fix HUD laser while in Create app
2018-10-04 10:42:17 +13:00
sabrina-shanman
2ef85dfdba
Merge branch 'master' into stt_parenting2
2018-10-03 11:39:00 -07:00
John Conklin II
4805d3564a
Merge pull request #14075 from ctrlaltdavid/M18586
...
Teleport with play area
2018-10-03 11:02:33 -07:00
Thijs Wenker
66c533b557
move export selection button to bottom of the list
2018-10-03 19:35:03 +02:00
Wayne Chen
efeb598495
fixing bug with hover overlay
2018-10-03 10:12:07 -07:00
John Conklin II
9a614d7523
Merge pull request #13977 from dback2/newEntityListView
...
New optimized entity list view
2018-10-03 09:23:11 -07:00
John Conklin II
8bd8d05409
Merge pull request #14118 from luiscuenca/handTouchLMFix
...
Disable Hand Touch when Leap Motion is running
2018-10-03 09:03:43 -07:00
David Rowe
2bdd8bfdc7
Update play area and sensor overlay models and raise a little
2018-10-03 11:09:04 +13:00
David Rowe
488599dbb0
Update teleport play area FBX model to be visible from below
2018-10-03 09:31:11 +13:00
David Rowe
c0231057f8
Revert foot calc scaling change
2018-10-03 09:28:19 +13:00
John Conklin II
2cd9e565b0
Merge pull request #14101 from dback2/editHandlePickPlaneImprovements
...
Edit handle pick plane improvements
2018-10-02 10:42:46 -07:00
Seth Alves
834699fa12
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-02 08:54:12 -07:00
David Rowe
f7fd76b316
Merge branch 'master' into M18586
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-10-02 16:49:16 +13:00
David Rowe
84a06fbe64
Don't immediately hide occlusion highlights after teleporting
2018-10-02 16:11:01 +13:00
sabrina-shanman
67dc526ee2
Merge branch 'master' of github.com:highfidelity/hifi into stt_parenting2
2018-10-01 17:17:32 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack
...
Remove UndoStack API
2018-10-01 17:13:48 -07:00
John Conklin II
9cbd819a39
Merge pull request #13965 from ctrlaltdavid/M17428-f
...
Mini tablet in palm
2018-10-01 16:56:36 -07:00
John Conklin II
3bbc01477e
Merge pull request #14055 from davidkelly/dk/18147
...
Do not have active buy button on invalidated items
2018-10-01 16:50:53 -07:00
John Conklin II
878d2a6f25
Merge pull request #14102 from howard-stearns/account-managed-wallet-punchlist2
...
Account-managed wallet flow improvements
2018-10-01 16:43:01 -07:00
David Back
b5edf42fd0
Merge branch 'master' into editHandlePickPlaneImprovements
2018-10-01 16:36:30 -07:00
Brad Hefta-Gaub
edd5db7768
Merge pull request #14042 from thoys/perf/create/getMultipleEntities
...
Speed up Entity List properties fetching by adding Entities.getMultipleEntities API
2018-10-01 16:16:48 -07:00
Brad Hefta-Gaub
ef063a4072
Merge pull request #14026 from huffman/fix/edit-rotation
...
Fix edit rotation handle fidgeting
2018-10-01 16:15:32 -07:00
Brad Hefta-Gaub
6eae178389
Merge pull request #13997 from gcalero/case_18057
...
Fix switch from Top View to My View
2018-10-01 16:13:07 -07:00
Wayne Chen
36dbcd41ba
Merge branch 'interstitialMerged' of https://github.com/wayne-chen/hifi into interstitialMerged
2018-10-01 16:11:40 -07:00
Wayne Chen
69b547a9fe
text overlays for consistency
2018-10-01 16:11:27 -07:00
Wayne Chen
8f36bc0850
Merge pull request #4 from danteruiz/interstitialMerged
...
Interstitial screen updates
2018-10-01 15:43:04 -07:00
Dante Ruiz
66bb5f68d2
updating interstitialmode
2018-10-01 15:26:56 -07:00
David Rowe
87ff6dd56d
Fix play area sizing and positioning for different base avatar sizes
2018-10-02 10:53:31 +13:00
David Rowe
6ccd73ea47
Merge branch 'master' into M18586
2018-10-02 10:17:24 +13:00
Zach Fox
0081f9aac0
Also fix MS18512
2018-10-01 12:24:47 -07:00
Zach Fox
58f098577d
Fix MS18609: Various Snapshot sharing bugs
2018-10-01 12:09:49 -07:00
luiscuenca
5ccbc5c029
Disable Hand Touch when Leap Motion is running
2018-10-01 10:47:06 -07:00
Wayne Chen
eab57633a5
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged
2018-10-01 09:21:26 -07:00
David Rowe
7560a2a923
Short circuit unnecessary repetition
2018-09-29 16:00:44 +12:00
David Rowe
2449868ea9
Fix mini tablet sizing for different sizes of avatar
2018-09-29 13:51:00 +12:00
David Rowe
8464a70c9e
Fix initial tablet scale
2018-09-29 12:42:41 +12:00
John Conklin II
130e8dfbe9
Merge pull request #14023 from dback2/selectEntityEveryFrameFix
...
Only call selectEntity once triggered when using edit handles
2018-09-28 16:38:10 -07:00
Ryan Huffman
feb230b3bd
Remove old comment in entitySelectionTool.js
2018-09-28 16:17:52 -07:00
Howard Stearns
053f22182a
fix inspection case
2018-09-28 11:57:36 -07:00
Wayne Chen
a8b86bd555
removing debug statement
2018-09-28 08:44:49 -07:00
Wayne Chen
5c9094d81f
removing debug print statement
2018-09-27 21:24:04 -07:00
Wayne Chen
d5950db2a4
fix for showing the text overlay in mac
2018-09-27 21:20:06 -07:00
David Rowe
545c2591e3
Merge branch 'master' into M18586
2018-09-28 16:19:44 +12:00
David Rowe
7f518d0aa1
Make teleport parabolas semi-transparent
2018-09-28 16:13:25 +12:00
howard-stearns
b45677cd02
additionally handle item urls (marketplace links from cert inspections)
2018-09-27 19:42:01 -07:00
David Rowe
7b7447739a
Remove unused code noticed in passing
2018-09-28 14:23:20 +12:00
David Rowe
45993ba475
Provide mini tablet details via API instead of messages
2018-09-28 14:23:08 +12:00
howard-stearns
a6ef25f662
just whitespace and varname changes
2018-09-27 18:14:16 -07:00
sabrina-shanman
411dbbbad3
Make scripts use the default scaleWithParent when creating ray/parabola
...
picks
2018-09-27 17:34:06 -07:00
Wayne Chen
5d27cddab5
consolidating getting oops message
2018-09-27 17:16:18 -07:00
Howard Stearns
f96c7f4db4
minimal time handshake
2018-09-27 17:05:18 -07:00
David Back
215e7e6da7
remove unneeded variable
2018-09-27 17:04:43 -07:00
