Andrew Meadows
|
299f2a92e0
|
merge 'master' into 'workload'
|
2018-04-05 12:01:19 -07: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|