samcake
e2f9eef5e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 12:27:27 -07:00
Seth Alves
32e7e5087e
Merge pull request #12668 from alexiamandeville/marketplace-update
...
Updating repo script to match marketplace script
2018-04-12 09:20:03 -07:00
Sam Gateau
2ca24485e0
and again
2018-04-12 02:11:47 -07:00
Sam Gateau
d0ed5466be
Better experimentation
2018-04-12 01:32:20 -07:00
Sam Gateau
9c4c1bf10f
Better experimentation
2018-04-12 00:03:04 -07:00
Sam Gateau
6a7ae55d9c
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-11 19:08:57 -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
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
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
Sam Gateau
6acda83f5c
Bringing the test to the workload ui
2018-04-09 23:13:39 -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
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
00713ab225
fix selection api
2018-04-06 14:00:50 -07:00
Andrew Meadows
a9f5b57681
merge 'master' into 'workload-010'
2018-04-06 11:11:06 -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
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
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
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
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
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
