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 |
|
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 |
|
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 |
|
Seth Alves
|
e8a62d2943
|
Merge pull request #12740 from druiz17/fix-scope
Fix name conflict with c++ class and qml file(master)
|
2018-03-30 15:41:42 -07:00 |
|
Dante Ruiz
|
16749df83a
|
fix highlighting edge case
|
2018-03-30 14:14:13 -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 |
|
Dante Ruiz
|
420672a769
|
fix-qml-confict
|
2018-03-29 11:24:08 -07:00 |
|
Dante Ruiz
|
8cdb59413d
|
fix-qml-confict
|
2018-03-29 09:26:05 -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 |
|
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 |
|
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
|
d7081b261b
|
Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera
|
2018-03-20 18:52:20 -03:00 |
|
Sam Gateau
|
5cc0e24921
|
Merge pull request #12666 from jherico/fix/web_overlay_crash
Fix invalid QML surface cache interaction
|
2018-03-20 14:26:39 -07: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 |
|
John Conklin II
|
91db0ab00f
|
Merge pull request #12650 from ctrlaltdavid/21798
Messages API JSDoc
|
2018-03-19 13:56:57 -07:00 |
|
Zach Fox
|
daa68768b9
|
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
|
2018-03-19 12:18:10 -07:00 |
|
John Conklin II
|
9219868406
|
Merge pull request #12667 from jherico/fix/web_overlay_crash
HOTFIX RC65: Fix invalid QML surface cache interaction
|
2018-03-19 10:37:48 -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 |
|
Brad Davis
|
ca38b9fe34
|
Fix invalid QML surface cache interaction
|
2018-03-16 10:53:59 -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 |
|