David Back
243b3637c4
fix grab.js change
2018-04-12 12:41:36 -07:00
Dante Ruiz
43b92299d6
changing highlighting percentage
2018-04-12 10:35:29 -07:00
David Back
09f3b845a8
Merge branch 'master' of https://github.com/highfidelity/hifi into desktopEquip
2018-04-12 10:17:17 -07:00
Dante Ruiz
7243160dac
making requested changes
2018-04-11 14:42:26 -07:00
Dante Ruiz
cdc248129c
fix grab.js
2018-04-11 14:25:06 -07:00
Dante Ruiz
ba9d5d18bc
make requested changes
2018-04-11 13:30:21 -07:00
John Conklin II
2f4bc5bd04
Merge pull request #12701 from misslivirose/fix-edit-grid-color
...
Fix for grid color changes not applying
2018-04-11 12:06:09 -07:00
John Conklin II
28168e6e45
Merge pull request #12699 from misslivirose/fix/save-settings-for-editing
...
Fix for edit preferences not persisting
2018-04-11 11:59:58 -07:00
David Back
59971869f5
desktop equip
2018-04-10 19:06:27 -07:00
Zach Fox
095b4ba5f2
Reduce logging from some Commerce/Discovery features
2018-04-10 16:02:58 -07:00
Zach Fox
01fec2edc7
Prevent the Bubble icon from ever blinking as per 14026
2018-04-10 16:00:35 -07:00
Zach Fox
a2f5891a0b
Cleanup 'Private' HMD Preview State Machine Logic
2018-04-10 16:00:18 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
Liv
c7be6e0934
Update edit.js
...
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..
tested locally but might have gotten in a weird state, so fixing in GH editor.
2018-04-10 12:15:57 -07:00
Dante Ruiz
54c3f48e65
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
2018-04-10 09:32:40 -07:00
Dante Ruiz
447163bd07
clean up scripts
2018-04-10 09:23:40 -07:00
Liv Erickson
20ee169054
two more spaces
2018-04-10 09:23:14 -07:00
Liv Erickson
6c15577653
style fixes for eslint
2018-04-10 09:18:54 -07:00
Dante Ruiz
2e1ebac03f
clean up functionality
2018-04-09 18:07:03 -07:00
Dante Ruiz
1113202a90
reverting file
2018-04-09 16:51:20 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
Dante Ruiz
2c20593b6d
editing equip code
2018-04-06 16:30:45 -07:00
Dante Ruiz
fd47832857
saving changes
2018-04-06 11:47:09 -07:00
Dante Ruiz
07b1a6be01
saving work
2018-04-06 11:01:40 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
...
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
Dante Ruiz
893832f4c7
Merge branch 'master' of github.com:highfidelity/hifi into feature-entity-highlighting
2018-04-05 16:01:36 -07:00
Dante Ruiz
cc341e8ad7
highlight nearby entities
2018-04-05 15:38:56 -07:00
Zach Fox
8e46ebf83b
Prevent Interface from crashing when a Snapshot upload fails
2018-04-05 11:27:26 -07:00
John Conklin II
89127a06b3
Merge pull request #12714 from dback2/editUpDownArrowFix
...
Fix Y arrow translation handle issues
2018-04-04 13:46:31 -07:00
Dante Ruiz
42149e295d
editing seletion style
2018-04-04 12:55:28 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one
...
Remove notifications and print outs when degrading LOD
2018-04-04 10:35:05 -07:00
Zach Fox
b641f87792
Merge pull request #12778 from zfox23/MS13792
...
Prevent Context Overlay from flashing when briefly hovering over certified entity
2018-04-04 09:31:33 -07:00
Dante Ruiz
c9c3d8f332
adding entity selection for far grabbing
2018-04-04 08:07:35 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
Zach Fox
5f47d51171
Prevent Context Overlay from flashing when briefly hovering over certified entity
2018-04-03 15:35:46 -07:00
howard-stearns
f229e24e60
fix help.js noisy log reference to undefined string#startsWith
2018-04-03 13:48:51 -07:00
samcake
2dc4630e68
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-04-03 12:55:21 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline
...
fix ContextOverlayInferface highlighing unspecified entities.
2018-04-03 12:29:19 -07:00
Seth Alves
249a97b5d0
don't move or rotate children if a parent is being changed by the same action
2018-04-03 12:14:59 -07:00
Seth Alves
08b7326bd1
when moving a group of selections, don't move a child if a parent is being moved
2018-04-03 12:14:40 -07:00
samcake
077b2dab30
Code review fixes
2018-04-02 16:09:43 -07:00
samcake
5a1eac563b
Code review fixes
2018-04-02 15:50:18 -07:00
samcake
d4bc61fb3d
Remove notifications and print outs for LOD changes because it was too much noise
2018-04-02 13:53:30 -07:00
John Conklin II
7ba05e3a5b
Merge pull request #12653 from vladest/bubblu_button_blink_fix
...
Bubble button blink fix
2018-04-02 11:12:12 -07:00
Dante Ruiz
16749df83a
fix highlighting edge case
2018-03-30 14:14:13 -07:00
Livi Erickson
799963a009
fix syntax based on CR feedback
2018-03-30 13:50:46 -07:00
Liv Erickson
810930ff23
handle correct first time settings
2018-03-30 13:50:46 -07:00
Liv Erickson
ec0874be1a
fix for edit preferences not persisting
2018-03-30 13:50:46 -07:00
John Conklin II
542d1ad1ff
Merge pull request #12720 from druiz17/fix-parent-tree
...
Fix far grabbing a grabbable child when the parent is not grabbable.
2018-03-30 12:25:22 -07:00
Sam Gondelman
d2a74e5713
Merge pull request #12686 from gcalero/android_ui_not_move_camera
...
Android - Prevent Camera movement with UI (especially Windows and Radar mode)
2018-03-28 17:14:42 -07:00
Cristian Luis Duarte
fe9481b28d
Cleanup code, comment out log, simplify radar is valid touch code (no more flag)
2018-03-28 19:50:44 -03:00
John Conklin II
790162c88b
Merge pull request #12689 from ctrlaltdavid/21808
...
Reinstate Overlays.getOverlayObject API function
2018-03-28 14:00:28 -07:00
Cristian Luis Duarte
f0bcaa47c8
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-28 16:47:21 -03:00
Dante Ruiz
3d7f7f0e62
fix parent tree grabbing
2018-03-27 14:05:43 -07:00
John Conklin II
bcd2de3bf8
Merge pull request #12660 from alexiamandeville/awayImage-update
...
Update away image and image paths
2018-03-27 12:46:37 -07:00
unknown
194b00d732
fix translate arrow normals
2018-03-26 16:31:58 -07:00
Cristian Luis Duarte
6cb5cd7f92
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
2018-03-26 11:19:42 -03:00
Cristian Luis Duarte
686af4ff77
Clean code that manually checked for windows coordinates to disable radar touch
2018-03-23 20:02:51 -03:00
Cristian Luis Duarte
242b009562
Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.
2018-03-23 18:59:55 -03:00
Liv Erickson
c66badc53c
replace accidentally deleted line
2018-03-23 11:42:39 -07:00
Liv Erickson
9dd91ea31e
style fixes and fix for grid color changes not applying
2018-03-23 11:39:44 -07:00
John Conklin II
563ff61325
Merge pull request #12661 from SamGondelman/android
...
Android: Stats, disable IK, reduce impact of InputRecorder
2018-03-23 11:08:50 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1
...
Commerce: Item Updates!
2018-03-22 15:40:22 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable
...
Merge stable back into master
2018-03-22 15:08:30 -07:00
David Rowe
05efc5a231
Revert "Remove Overlays.getOverlayObject() from JavaScript API"
...
This reverts commit 8e2a3e8c99
2018-03-21 15:36:39 +13:00
Cristian Duarte
0d6bfada40
Prevent Go To and Avatar windows to move Radar Mode's camera when touched or interacted with
2018-03-20 17:24:38 -03:00
Zach Fox
daa68768b9
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-19 12:18:10 -07:00
David Back
3f2a49d243
fix list of tablet IDs ray cast checks in edit.js
2018-03-17 10:59:18 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move
...
Android joystick rotate move
2018-03-16 17:24:15 -07:00
Zach Fox
a792bcc3d3
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-16 13:24:17 -07:00
Alexia Mandeville
921b19139d
Updating indentation
2018-03-16 11:09:53 -07:00
Alexia Mandeville
74c654690f
Updating image path in script for HMD
2018-03-15 16:55:41 -07:00
Alexia Mandeville
700d828b67
Updating away image and image path in away script
2018-03-15 16:46:21 -07:00
SamGondelman
0fa73c73ce
stats
2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169
New notification flow for item updates
2018-03-15 16:03:49 -07:00
Cristian Luis Duarte
03cbadece5
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-15 17:11:40 -03:00
vladest
3e00243c37
Merge branch 'master' into bubblu_button_blink_fix
2018-03-15 19:45:33 +01:00
vladest
c385bf26e9
Do not use timer for switching bubble button active state
2018-03-15 19:43:00 +01:00
Seth Alves
a64f0d2779
if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done.
2018-03-15 11:39:05 -07:00
Seth Alves
8a0b8aa034
make tablet invisible in secondary-camera if wallet passphrase page is up
2018-03-15 11:01:13 -07:00
Zach Fox
74e24ec289
Final touches?
2018-03-14 10:58:18 -07:00
Gabriel Calero
884da98466
Change default mode to My View (android)
2018-03-14 14:50:44 -03:00
Zach Fox
98cdbbb3e6
Small update to dot before merging in filterBar
2018-03-14 09:45:42 -07:00
Zach Fox
e2326a3733
Initial work for 'messages waiting' light
2018-03-13 17:05:16 -07:00
Zach Fox
7b6b08fd26
Upgrade specific edition
2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-13 13:42:42 -07:00
Cristian Luis Duarte
9e429e9f03
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-12 15:51:46 -03:00
Cristian Luis Duarte
ce0d76be2b
Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move
2018-03-09 20:51:21 -03:00
Cristian Luis Duarte
3d933e1810
Android - Joystick hidden when opening login and shown after Cancel.
2018-03-09 17:41:05 -03:00
NissimHadar
317d9a8dbc
Correct can cast shadow flag being visible on entities that can't cast shadows.
2018-03-09 11:45:39 -08:00
Brad Hefta-Gaub
8e44b429d8
Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport
...
[Case 4315] Resolves Particle Tab Color Picker visual inconstency
2018-03-09 08:49:07 -08:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes
...
tablet scale and position changes
2018-03-08 15:36:06 -08:00
Cristian Luis Duarte
4c3ee195de
Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front).
2018-03-08 19:58:15 -03:00
Zach Fox
4df58f1e67
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-08 12:16:36 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android
...
Android Tip
2018-03-08 10:18:35 -08:00
David Back
554c37d14b
removed undefined event checks in scaling
2018-03-07 19:34:08 -08:00
David Back
9681f0eb77
restore old scale math, disable avatar collisions while scaling
2018-03-07 18:20:26 -08:00
Zach Fox
08b2be85d2
Don't pass isUpdating around
2018-03-07 11:44:54 -08:00
