John Conklin II
6148c407a5
Merge pull request #12422 from misslivirose/fix-overlay-lines
...
Show outline for zones when rotating
2018-02-20 09:30:22 -08:00
Liv Erickson
175532c444
show outline for zones when rotating
2018-02-15 15:51:54 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals
2018-02-15 11:02:49 -08:00
Sam Gondelman
09645c8b48
Merge pull request #12403 from 1P-Cusack/EntityPropertiesJS_801_on_split
...
[EntityPropertiesJS] Fix for 801 Uncaught TypeError (details below).
2018-02-15 09:34:59 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
LaShonda Hopper
d466c079a4
Simple fix for 801 Uncaught TypeError (details below).
...
entityProperties.js was throwing out: 801 Uncaught TypeError: Cannot read property 'split' of undefined
This moves properties.modelURL related checks behind the property.type validation check to avoid
calling the function on an undefined member if the object doesn't have that key defined.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
2018-02-14 17:00:52 -05:00
Dante Ruiz
e14f46101b
fix tablet rotation when switching into and out of create mode
2018-02-14 13:49:43 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
SamGondelman
38290064c1
replace materials by name, hide material mode for now
2018-02-13 13:24:08 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
John Conklin II
915870018a
Merge pull request #12359 from misslivirose/fix/collapse-headers
...
Fix collapse headers in edit.js
2018-02-13 10:34:30 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
John Conklin II
1d0e358246
Merge pull request #12234 from dback2/newEditGrab
...
New Edit Selected Entity Manipulation Handles
2018-02-09 12:23:34 -08:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
Dante Ruiz
0dac851def
fixing case when grabbed target is destroyed
2018-02-08 17:08:51 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Dante Ruiz
a0ec0f10b4
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
2018-02-08 09:11:50 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
John Conklin II
40851b097f
Merge pull request #12324 from ElderOrb/FB11844
...
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
2018-02-07 14:31:20 -08:00
Liv Erickson
be4a009e11
make it so only the icon on collapse headers collapses headers
2018-02-07 13:18:32 -08:00
Liv Erickson
62de08f324
fix issue with top icon changing
2018-02-07 10:16:27 -08:00
David Back
51b55aedcf
CR changes, fix colors, add minimum overlay dimensions for HMD
2018-02-06 16:07:46 -08:00
Dante Ruiz
365a1fcdab
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
2018-02-06 13:45:14 -08:00
Dante Ruiz
4f0ca6a904
fix lasers going to origin
2018-02-06 13:44:59 -08:00
Alexander Ivash
151f20a92f
define onWalletScreen in this marketplaces.js scope
2018-02-06 21:25:41 +03:00
David Back
22c0ca86ed
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-02-06 10:10:39 -08:00
Dante Ruiz
601914180d
fixing teleport module for sit script
2018-02-05 11:52:35 -08:00
David Back
ececd1c60f
fix loop index change
2018-02-02 17:14:48 -08:00
David Back
7621ba180d
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-02-02 17:05:34 -08:00
David Back
ed4cbe2679
fix fill ring rotation
2018-02-02 17:05:25 -08:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
David Back
900669d937
fix multi-selection rotation yay!
2018-02-02 16:44:59 -08:00
Elisa Lupin-Jimenez
e2bf8ad231
reverted to S3 for model URL
2018-02-02 15:36:28 -08:00
Zach Fox
2a0d85a119
Merge pull request #12315 from zfox23/commerce_SendMoneyNearbyParticle
...
Commerce: Send Money Nearby particle effect!
2018-02-02 14:17:48 -08:00
Seth Alves
00b184124d
Merge pull request #12308 from vladest/fix_progress_animation
...
Image overlay uses bounds property
2018-02-02 12:53:20 -08:00
Elisa Lupin-Jimenez
d20ff0955c
qml doesn't work, .js might not work on osx
2018-02-02 11:26:21 -08:00
Zach Fox
2f3448ed1f
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-02-02 10:59:49 -08:00
Elisa Lupin-Jimenez
73fde4333e
new local reference to image model
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d7a847930d
added image icon
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a
snapshot referenced locally, won't work on OS
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
cc4bafb46f
image entities shown as images in entity list
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
bd7204e6ef
image entity now has grabbable and dynamic options
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
d390e20139
removed extraneous commenting and image class
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
fe3bc00baa
loading and rendering atp and http image files
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4
creating new image entity opens image property options
2018-02-02 10:14:27 -08:00
