Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-17 02:40:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
75648 commits 25 branches 0 tags 1.1 GiB
Commit graph

5652 commits

Author SHA1 Message Date
David Back
5ea84fb952 CR fixes 2019-01-04 15:39:27 -08:00
luiscuenca
d630fe9dbd Add menu checkbox to toggle collisions with other avatars 2019-01-04 16:38:48 -07:00
Andrew Meadows
a642af23b7 enable shapeType=ellipsoid and expose zone shapeType to UI 2019-01-04 12:37:23 -08:00
David Back
eff9d11437 Merge branch 'master' of https://github.com/highfidelity/hifi into propertyRangeAudit 2019-01-04 11:07:28 -08:00
Seth Alves
b2f25629eb don't allow scaling of others' equipped entities 2019-01-03 08:19:18 -08:00
Seth Alves
306c54c060 fix code that allows adjusting of own avatar entities while forbidding adjusting those of others 2019-01-03 08:17:52 -08:00
Seth Alves
bf46960dc3 fix timing on startNearGrab entity-method call for cloned entities. Don't allow grabbing of other's equipped or worn entities 2019-01-03 08:17:52 -08:00
Seth Alves
54a5805b5c add final edit when dropping an avatar-entity. don't allow grabbing of other's avatar entities 2019-01-03 08:17:52 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
613f290226 don't attempt to grab other's avatar-entities 2019-01-03 08:17:52 -08:00
Seth Alves
895e8cdba1 fix off-hand adjustment of equipped entities. make traits-based grabbing be enabled by default, again 2019-01-03 08:17:52 -08:00
Seth Alves
0967a94557 get grabbing and scaling to get along better 2019-01-03 08:17:52 -08:00
Seth Alves
905af34564 disable traits-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
6a547d042c port over PR-14276 2019-01-03 08:17:52 -08:00
Seth Alves
1c1e648b8b port over PR-14429 2019-01-03 08:17:52 -08:00
Seth Alves
9900040ece enable trait-based grabbing by default 2019-01-03 08:17:52 -08:00
Seth Alves
70b68294ff port over PR-14464 2019-01-03 08:17:52 -08:00
Seth Alves
6f25c59a0c turn-off nearEntityGrab when scaleEntity is active 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
David Back
937aa718ae remove selected particle property defaults 2019-01-02 18:22:55 -08:00
unknown
f8f13e974d property range audit - add range info via macros accessible via API, tweak min/max/steps in entityProperties 2019-01-02 11:12:10 -08:00
Ryan Huffman
9c60b09c6b Fix texture MB column not sorting correctly in entity list 2018-12-27 14:50:12 -08:00
Shannon Romano
21ec4e0c53
Merge pull request #14524 from SamGondelman/NOverlays3 
Case 20132, Case 16928: First class Image Entities
 2018-12-20 21:20:49 +00:00
Wayne Chen
c36b3a4b07 fix 2018-12-19 12:46:41 -08:00
Sam Gondelman
e890fc6980
Merge branch 'master' into NOverlays3 2018-12-19 11:37:10 -08:00
Wayne Chen
4116f6ca9a
Merge branch 'master' into loginInitiative2 2018-12-12 18:00:07 -08:00
Jeff Clinton
5a81d8c093
Merge pull request #14453 from danteruiz/keyboard-menus 
Keyboard interaction menus
 2018-12-12 17:53:59 -08:00
Wayne Chen
0a0b7bf1ad removing onUsernameChanged signal to alter login settings 2018-12-12 16:26:35 -08:00
Dante Ruiz
089a223c2d more CR changes 2018-12-12 15:29:01 -08:00
Dante Ruiz
f3fad52e1d make CR changes 2018-12-12 13:29:32 -08:00
Dante Ruiz
51bdf1bf78 adding keyboards settings 2018-12-12 11:55:13 -08:00
Wayne Chen
2f07a0eb5d Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2 2018-12-11 20:01:19 -08:00
Shannon Romano
efedc1f0b5
Merge pull request #14563 from danteruiz/teleport-settings 
Adding menu settings to disable teleporting
 2018-12-11 21:08:23 +00:00
Zach Fox
826644ef08
Merge pull request #14559 from zfox23/MS20161_updatesDot 
Fix MS20161: Fix INVENTORY notification dot state
 2018-12-11 13:03:26 -08:00
Jeff Clinton
e88e15fd94
Merge pull request #14560 from zfox23/MS4382_handshakeSparkles 
Fix MS4382: Add a lifetime to handshake particle effects to prevent persistence
 2018-12-11 11:51:54 -08:00
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