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
David Rowe
adb6f66a05
Handle tablet entities and overlays not being available
2018-02-08 09:51:48 +13: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
Olivier Prat
733d36df47
Fixed save / load of fade effect configurations
2018-02-06 17:57:04 +01:00
Olivier Prat
fc1d9319bd
Finished correcting transition.qml layouts
2018-02-06 16:31:53 +01:00
Olivier Prat
8c12ab9b76
Used color selectors in transition.qml
2018-02-06 16:19:15 +01:00
Olivier Prat
51ea89ffea
Renamed fade scripts to transition scripts and still working on layout
2018-02-06 15:16:50 +01:00
Dante Ruiz
601914180d
fixing teleport module for sit script
2018-02-05 11:52:35 -08:00
Olivier Prat
2896c32bda
Switched debug fade script to app but still working on broken layout
2018-02-05 17:49:31 +01:00
David Rowe
615e54620b
Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API
2018-02-04 15:38:33 +13:00
David Rowe
0c0734a255
Remove unused Overlays property, borderSize, and associated code
2018-02-04 14:54:14 +13:00
David Rowe
8e2a3e8c99
Remove Overlays.getOverlayObject() from JavaScript API
2018-02-04 14:15:48 +13:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01: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
ZappoMan
8a9153a461
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-02 16:08:05 -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
Elisa Lupin-Jimenez
308e481e63
switch to image property list not working
2018-02-02 10:11:37 -08:00
Elisa Lupin-Jimenez
ceb621a521
reverted protocol change for images
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58
entity item properties hooked up for image
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
ecb53192ad
edit properties reflect image members
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
c9c55af661
setting up properties page (not complete)
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea
more infrastructure links
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fdca8ab93e
added image button to edit.js, working on connecting to cpp
2018-02-02 10:08:39 -08:00
Alexander Ivash
46bace97cf
FB11844 - Disable Preview enabled some time after unchecking the Display >Disable Preview option.
2018-02-02 19:08:50 +03:00
Cristian Luis Duarte
5a8e0d5bcb
Android - Radar mode implemented.
2018-02-02 12:57:41 -03:00
David Back
55f55cd78b
few more updates
2018-02-01 17:59:38 -08:00
David Back
db56246cd6
more fixes, clean up, updates
2018-02-01 17:30:56 -08:00
David Back
c69eff3322
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-02-01 17:29:42 -08:00
Melissa Brown
bf5b875382
Merge pull request #12241 from 1P-Cusack/FogBugz/Case_4315_okbutton
...
[Case 4315] Edit menu color picker OK button is hard to use in HMD
2018-02-01 16:52:07 -08:00
ZappoMan
8751ef506e
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-02-01 14:29:12 -08:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511
...
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 12:11:30 -08:00
Zach Fox
89e52561e3
Silly bugfix
2018-02-01 11:56:54 -08:00
Melissa Brown
93e039d6d6
Merge pull request #12310 from Triplelexx/tetherball_cachebuster
...
remove createTetherballStick.js cache buster
2018-02-01 11:55:09 -08:00
Zach Fox
268c12e47a
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-02-01 11:38:47 -08:00
John Conklin II
6eac91a3c7
Merge pull request #12304 from sethalves/fix-upside-down-equip
...
allow upside-down equip
2018-02-01 10:47:07 -08:00
John Conklin II
acde2511ba
Merge pull request #12305 from sethalves/fix-run-reload
...
fix left-over run button when scripts are reloaded
2018-02-01 10:46:44 -08:00
Zach Fox
bd26c9dfc0
More improvements
2018-02-01 09:36:41 -08:00
David Back
c01790bd3e
punch list updates and various fixes
2018-01-31 18:27:15 -08:00
David Back
54e496329c
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-31 18:26:49 -08:00
Alexander Ivash
1ed7d164c4
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 01:15:03 +03:00
Triplelexx
257932cedc
remove cache buster
2018-01-31 22:00:30 +00:00
Brad Hefta-Gaub
f5614618b9
Merge pull request #12288 from ctrlaltdavid/21729
...
Add location.domainID as a synonym for location.domainId
2018-01-31 13:50:48 -08:00
vladest
87ab8a5840
Image overlay uses bounds property
2018-01-31 21:46:05 +01:00
Zach Fox
90c2371f0c
It's working!
2018-01-31 12:09:23 -08:00
Seth Alves
a596e07464
fix left-over run button when scripts are reloaded
2018-01-31 11:05:35 -08:00
David Back
09bcee7c2e
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-31 11:03:11 -08:00
Zach Fox
8a729e3cf0
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_SendMoneyNearbyParticle
2018-01-31 10:54:32 -08:00
Cristian Luis Duarte
f7f90935c1
Fix +android/defaultScripts array of filenames.
2018-01-31 15:12:44 -03:00
Seth Alves
c4f57877dd
if hand is already in 'drop gesture' position when equipping something, don't unequip until the hand has been upright
2018-01-31 10:06:20 -08:00
Olivier Prat
3fa2babec2
Moved cascade frustum pre-computation to single ShadowSetup job
2018-01-31 11:55:46 +01:00
Olivier Prat
f344e44d26
Switched to a simpler manual fixed/slope based shadow bias system. Automatic stuff fail most of the time
2018-01-31 10:19:17 +01:00
Zach Fox
05fe33e417
Initial work
2018-01-30 18:01:46 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
David Back
3bbe821aba
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-30 14:08:27 -08:00
ZappoMan
cd4b3b1a54
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-30 12:52:41 -08:00
Gabriel Calero
999e3a39fa
Add mode selector (my view / radar), not finished
2018-01-30 14:48:37 -03:00
Gabriel Calero
7fb28f4296
Add audio bar to mute/unmute the mic
2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d
Add bottom bar and address dialog (Android)
2018-01-30 14:48:37 -03:00
David Rowe
280264d7ed
Add location.domainID as a synonym for location.domainId
...
And deprecate location.domainId.
2018-01-30 20:46:27 +13:00
David Back
e679b75e99
fix degree display position
2018-01-29 19:02:36 -08:00
David Back
3a8e17173e
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-29 18:53:18 -08:00
David Back
2f0d92c3cd
ctrl 22.5 snapping
2018-01-29 18:15:01 -08:00
Liv Erickson
3aa12eb7df
pass in deletedIDs so can delete children depth > 1
2018-01-29 17:51:26 -08:00
David Back
9ee7153641
fix scale speed, fix stretch panels, fix scale cube highlight
2018-01-29 16:53:02 -08:00
Dante Ruiz
08511a2a2e
fix new model path
2018-01-29 15:27:55 -08:00
Zach Fox
00555250a0
400 connections per page for Wallet and PAL
2018-01-29 12:07:07 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
David Back
d03838026f
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-29 10:30:25 -08:00
ZappoMan
efc63a41e9
make sure true results for delete actually work, add more examples
2018-01-26 18:49:55 -08:00
ZappoMan
b883d006c8
add flags to support asking for specific messages, update examples
2018-01-26 18:26:48 -08:00
ZappoMan
a3d86a0242
cleanup
2018-01-26 17:37:24 -08:00
Olivier Prat
6b0b17ff63
Working on better adaptive bias algorithm for shadow
2018-01-26 17:57:20 +01:00
ZappoMan
6192625942
add delete filter support
2018-01-25 15:01:50 -08:00
ZappoMan
4497302a2b
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-25 11:39:56 -08:00
John Conklin II
d537146fd1
Merge pull request #12240 from luiscuenca/gotoFixForHMD
...
RC63 GoTo fix for HMD
2018-01-25 09:37:59 -08:00
John Conklin II
1529fea983
Revert "Display both lasers on tablet and Web surfaces"
...
(cherry picked from commit 455090d2b9
)
2018-01-24 14:51:42 -08:00
luiscuenca
29dd24b05f
Fix GoTo app in HMD mode
2018-01-23 15:50:32 -07:00
LaShonda Hopper
180be18178
[Case 4315] Fixes color picker issue in HMD mode (details below).
...
Previously when in HMD mode, using the color picker to select a color via the
gradient or hue areas would result in the page scrolling making it difficult to
select the color or hue desired.
This resolves the issue by turning off touch actions for the elements
of the color picker that should have it when using the color picker.
Tested in HMD & Desktop mode.
Changes Committed:
modified: scripts/system/html/css/colpick.css
2018-01-23 14:02:31 -05:00
LaShonda Hopper
4da7a1e65a
[Case 4315] ESLint pass on entityProperties.js.
...
Re-ran after changes and issue count was 0.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
2018-01-23 13:48:47 -05:00
LaShonda Hopper
72ed5f6d91
[Case 4315] Fixes OK button hard to use within HMD mode (details below).
...
* Shape Color picker dynamically updates entity color.
* This removes the OK button which was hard to interact with in HMD mode. The user no
longer needs to click the OK button to submit changes to the color; rather the color
of the entity updates as the user manipulates the color wheel and/or slider.
Known Issue/TODO(s):
* Color Picker's Color Preview area has a bug where the original/starting color preview
is black as opposed to reflecting the entity's color upon clicking the color picker.
* Color preview restore color functionality isn't working. Clicking the initial
color preview doesn't restore the color.
* In HMD Mode: While interacting with the picker the user is able to control scrolling
navigation for the edit menu. For example, when moving up or down to change the hue
the edit menu behind the picker will scroll up and down correlatively.
* In HMD Mode: When the picker is dismissed (user clicks outside the picker), the RGB
fields for the color still receive input.
Tested in Desktop & HMD Modes.
Changes Committed:
modified: scripts/system/html/js/entityProperties.js
2018-01-23 13:40:31 -05:00
Brad Davis
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -08:00
humbletim
51d8b9aea6
update and expand on js unit tests
2018-01-23 03:12:50 -05:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
...
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
8d028d4bd4
Merge pull request #12220 from RebeccaStankus/API-Debugger-UI
...
Updated UI to fit Toolkit Standards
2018-01-22 10:30:48 -08:00
John Conklin II
8b461b960f
Merge pull request #12223 from zfox23/commerce_sendMoney2
...
Commerce: Pixel-perfect "Send Money" UI
2018-01-22 09:39:23 -08:00
Seth Alves
45a00bebc0
Merge pull request #12217 from luiscuenca/sortOrderFix
...
Fix sortOrder param on tablet buttons
2018-01-21 10:40:25 -08:00
David Back
c722b4b04d
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-19 18:20:49 -08:00
David Back
c4359de859
entity edit tools wip update
2018-01-19 18:20:36 -08:00
ZappoMan
f6062ebfcc
new icon and button layout
2018-01-19 16:00:08 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces"
2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
...
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
RebeccaStankus
5db5f24043
Updated UI to fit Toolkit Standards
2018-01-19 14:52:44 -08:00
Brad Davis
3e7872637d
Merge branch 'android' into android_new
2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
David Rowe
7898aa2c4b
Code review
2018-01-20 10:32:42 +13:00
Stephen Birarda
018bcc623b
Merge pull request #12213 from birarda/feat/hide-error-decrypting-notification
...
suppress Interface notification for DS decryption error
2018-01-19 14:10:10 -07:00
David Rowe
94e6a68d41
Code review
2018-01-20 09:50:24 +13:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700
...
Add Window browseChanged signal as replacement for openFileChanged
2018-01-19 10:45:27 -08:00
Ryan Downe Karpf
08b4c6eb40
Merge pull request #12206 from druiz17/fix-reduce-calls-isPointOnDesktopWindow
...
reduce calls to isPointOnDesktopWindow in controllerModules
2018-01-19 10:44:57 -08:00
Brad Davis
d6f7b23b2d
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 10:37:41 -08:00
Brad Davis
9529488dd3
Merge remote-tracking branch 'upstream/master' into android_new
2018-01-19 10:37:29 -08:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08:00
luiscuenca
27ea74f5bf
Fix sortOrder param on tablet buttons
2018-01-19 11:22:37 -07:00
David Back
4ed117b66d
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-19 10:14:44 -08:00
Zach Fox
8c52f92de8
Merge pull request #12208 from zfox23/fixBubbleButtonFlash
...
Fix the Space Bubble button flash behavior; Rate limit sound
2018-01-19 09:29:17 -08:00
David Rowe
fb684909ce
Merge branch 'master' into 21703
2018-01-19 17:25:12 +13:00
David Rowe
45bc6b8dab
Dominant hand gets the highlight if both start pointing simultaneously
2018-01-19 16:41:23 +13:00
David Rowe
e0e6fc711b
Replace Pointers API function setNonHoverItems() with setDoesHover()
2018-01-19 16:05:09 +13:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
Zach Fox
c6429f4f33
Path towards pixel perfection
2018-01-18 17:05:36 -08:00
Stephen Birarda
a97b4b010d
suppress Interface notification for DS decryption error
2018-01-18 16:54:04 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
ZappoMan
8364f64d4d
Merge branch 'master' of https://github.com/highfidelity/hifi into oldPropsFilters
2018-01-18 15:08:27 -08:00
ZappoMan
25f5eb6b4f
named property example
2018-01-18 15:08:13 -08:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
Zach Fox
13d8d643f7
Also rate limit the bubble sound
2018-01-18 12:05:16 -08:00
Zach Fox
1bda3faaf2
Fix the Space Bubble button flash behavior
2018-01-18 11:23:49 -08:00
Dante Ruiz
d88ff701b5
reduce calls to isPointOnDesktopWindow
2018-01-18 10:48:35 -08:00
Brad Davis
d3c4b0ef45
Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new
2018-01-18 10:04:03 -08:00
Andrew Meadows
82cab5e4a1
add scripted/qml debug UI for render LOD
2018-01-18 08:53:45 -08:00
David Rowe
403dd3d7d0
Only first laser highlights
2018-01-18 22:31:12 +13:00
David Back
26bf78fb5d
first pass new entity selection edit tools wip
2018-01-17 18:30:31 -08:00