Gabriel Calero
578012b662
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-11 16:30:53 -03: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
Olivier Prat
2974e05cf2
Tweaked bloom intensity mix
2018-04-10 11:13:37 +02:00
Sam Gateau
6acda83f5c
Bringing the test to the workload ui
2018-04-09 23:13:39 -07:00
Dante Ruiz
2e1ebac03f
clean up functionality
2018-04-09 18:07:03 -07:00
samcake
87b3f9bd1f
More featuers for the view of the workload and test scrtpts to stress the system)
2018-04-09 17:27:55 -07:00
samcake
72649f5c06
More featuers for the view of the workload and test scrtpts to stress the system)
2018-04-09 17:27:40 -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
Gabriel Calero
b30cb25a3f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-09 12:20:35 -03:00
Gabriel Calero
e85f5c97dc
Remove bottom bar. Apply new design for android
2018-04-09 11:41:00 -03:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
Dante Ruiz
2c20593b6d
editing equip code
2018-04-06 16:30:45 -07:00
Dante Ruiz
00713ab225
fix selection api
2018-04-06 14:00:50 -07:00
Dante Ruiz
fd47832857
saving changes
2018-04-06 11:47:09 -07:00
Andrew Meadows
a9f5b57681
merge 'master' into 'workload-010'
2018-04-06 11:11:06 -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
Andrew Meadows
299f2a92e0
merge 'master' into 'workload'
2018-04-05 12:01:19 -07:00
Zach Fox
8e46ebf83b
Prevent Interface from crashing when a Snapshot upload fails
2018-04-05 11:27:26 -07:00
Gabriel Calero
15163f5e87
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-04 19:25:20 -03:00
Gabriel Calero
99d8f822b2
Fix crash selecting domain for second time. Stop rendering while Goto activity is started
2018-04-04 19:24:26 -03:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade
...
Update to Transitions debugging / editing script
2018-04-04 14:31:59 -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
Gabriel Calero
ddbf4417ff
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-04 12:24:25 -03:00
Dante Ruiz
c9c3d8f332
adding entity selection for far grabbing
2018-04-04 08:07:35 -07:00
samcake
88a5105b81
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-04-03 18:00:16 -07:00
samcake
fa35d659dc
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-04-03 17:56:41 -07:00
samcake
ff5b418ddf
Starting to buiuild on the jet component and adding the widget to luci and workload inspectors
2018-04-03 17:21:37 -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
samcake
efd2b2720b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-03 12:46:10 -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
Gabriel Calero
78c50410b3
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-04-03 14:37:19 -03:00
Sam Gateau
2afd5f9813
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-02 19:11:02 -07:00
samcake
54e2ad06b8
GOing over the jet lib ui and the nightmare that is the js/qml family
2018-04-02 17:59:28 -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
Gabriel Calero
176038aa53
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-02 12:23:04 -03:00
Gabriel Calero
2ff13270ed
Go back to GoTo screen
2018-04-02 12:22:21 -03:00
Sam Gateau
dada0b9024
Exploring better task job config api that work
2018-04-02 01:09:35 -07:00
Sam Gateau
9e2295525d
merging with upstream workload after it s been updated with master
2018-03-31 13:31:20 -07:00
samcake
59a081bcdb
merge with upstream
2018-03-30 18:08:38 -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
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
Olivier Prat
0c2c09e77b
Fixed layout in HMD
2018-03-30 15:22:48 -04:00
Gabriel Calero
b123b67134
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-03-30 15:38:36 -03:00
samcake
028959f240
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-29 12:00:10 -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
Olivier Prat
ef63651b2b
Duration and timing controls are disabled when event is not time based
2018-03-29 12:07:56 -04:00
Olivier Prat
648e6a6c9b
Added description for each event
2018-03-29 10:47:18 -04:00
Olivier Prat
07cb1c1f9e
Moved gradient invert checkbox
2018-03-29 10:19:24 -04:00
Olivier Prat
3c8cd48dfb
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-29 07:21:01 -04: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
Olivier Prat
9a7f88cd78
Moved save / load buttons to top
2018-03-28 19:23:09 -04: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
Olivier Prat
6639a245df
Object picking / edition for transitions are activate / deactivated when transition editor window is shown / hidden
2018-03-28 18:20:10 -04: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
Olivier Prat
e4416db06f
Added save/file dialog for transition configurations in transition editor
2018-03-28 16:54:53 -04: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
Olivier Prat
7fa5e384b9
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-28 11:21:07 -04: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
samcake
025730a329
Just merging with master and trying to see the ui working again...
2018-03-26 18:24:01 -07:00
unknown
194b00d732
fix translate arrow normals
2018-03-26 16:31:58 -07:00
Gabriel Calero
7be11fc697
Align UI of Go To activity
2018-03-26 19:44:26 -03: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
Alexia Mandeville
35551f045c
Updating with jshint edits
2018-03-21 15:35:10 -07:00
David Rowe
05efc5a231
Revert "Remove Overlays.getOverlayObject() from JavaScript API"
...
This reverts commit 8e2a3e8c99
2018-03-21 15:36:39 +13:00
Olivier Prat
6b44d79f90
Proposal to improve fade editing with some extra visual cues
2018-03-20 17:48:41 -07:00
samcake
a678a38211
Merge with master
2018-03-20 17:35:57 -07:00
Olivier Prat
143a315f1d
Fade edited objects are now selected with ray picking
2018-03-20 15:29:50 -07: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
samcake
816e7a21c2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-20 09:07:41 -07: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
Sam Gateau
44459cf5da
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-18 01:03:35 -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
f356de5fdf
Updating repo script to match marketplace script
2018-03-16 11:51:03 -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
samcake
50bdd1ad2f
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-15 17:00:20 -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
David Rowe
63e07f1a7f
Fix typo in developer Messages test script
2018-03-15 15:23:46 +13: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
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
samcake
7116d82dc5
Merge branch 'workload-master' of github.com:samcake/hifi into workload-bis
2018-03-12 12:04:20 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -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
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Olivier Prat
bafd6340a2
Removed unused fonts in scripts
2018-03-12 14:21:48 -04:00
Sam Gateau
e3c8b9c62d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
2018-03-09 22:24:58 -08: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
