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 |
|
Sam Gateau
|
4870ce1d76
|
Merge pull request #12771 from NissimHadar/addMDtoAutoTester
Add .md creation to autoTester
|
2018-04-04 12:30:11 -07:00 |
|
NissimHadar
|
235996911a
|
Fixed gcc warning.
|
2018-04-04 11:38:14 -07:00 |
|
NissimHadar
|
bb0d4a66b6
|
Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester
|
2018-04-04 11:03:56 -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 |
|
NissimHadar
|
7a6b071e46
|
Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester
|
2018-04-04 10:20:35 -07:00 |
|
Howard Stearns
|
3a428bc44f
|
Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1
Fix 'Private' HMD preview texture enable/disable...again
|
2018-04-04 10:03:18 -07:00 |
|
Zach Fox
|
752246d950
|
Merge pull request #12760 from zfox23/inspection_rightClickTweaking
Inspection: Tweak mouse-right-click-to-inspect behavior
|
2018-04-04 09:32:29 -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 |
|
Seth Alves
|
a980361afc
|
Merge pull request #12706 from druiz17/baking
adding python baking scripts
|
2018-04-04 09:08:31 -07:00 |
|
Seth Alves
|
2df334c50e
|
Merge pull request #12663 from ElderOrb/FB12870
Fix for not updating checkbox state on 'baking' / 'unbaking'.
|
2018-04-04 09:03:03 -07:00 |
|
Seth Alves
|
db82c464eb
|
Merge pull request #12741 from ctrlaltdavid/21816
Remove Entities.currentAvatarEnergy and related from the API
|
2018-04-04 08:07:46 -07:00 |
|
Anthony Thibault
|
00bec7310e
|
Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js
JavaScript exceptions during Controller system callbacks are now logged
|
2018-04-03 16:22:44 -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 |
|
Zach Fox
|
f20eddefc8
|
Fix 'Private' HMD preview texture enable/disable...again
|
2018-04-03 13:46:02 -07:00 |
|
John Conklin II
|
5151041e4a
|
Merge pull request #12770 from sethalves/pr12769-for-rc66
Fix move after import
|
2018-04-03 13:41:56 -07:00 |
|
NissimHadar
|
cb5bd4c080
|
Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester
|
2018-04-03 13:25:30 -07:00 |
|
John Conklin II
|
db56656fcc
|
Merge pull request #12768 from ElderOrb/FB13789_RC66
Fix regression with 'Log in/Sign up' dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-04-03 13:24:50 -07:00 |
|
NissimHadar
|
4f5895cb16
|
Added MD file to autoTester.
|
2018-04-03 13:17:37 -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
|
a1ce9481bb
|
Merge pull request #12739 from druiz17/fix-mapping-mistake
map flying down back to C key
|
2018-04-03 12:39:46 -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 |
|
Alexander Ivash
|
ccea3efe1e
|
FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links
|
2018-04-03 21:43:40 +03:00 |
|
Sam Gateau
|
987aa40783
|
Merge pull request #12566 from jherico/bindless
Bindless Textures
|
2018-04-03 10:14:12 -07:00 |
|
John Conklin II
|
53a5261905
|
Merge pull request #12712 from zfox23/newUpdateCertLocation
Fix cert location for content sets; handle .content.zip content sets
|
2018-04-03 09:10:11 -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 |
|
John Conklin II
|
9dcef996c5
|
Merge pull request #12684 from vladest/assetserver_wrong_dialog
Fix invalid message if cancel adding asset to AssetServer
|
2018-04-02 15:28:46 -07:00 |
|
John Conklin II
|
74ca98dc81
|
Merge pull request #12727 from amantley/triggerRecenterBehaviour
Trigger Avatar Recenter Behaviour
|
2018-04-02 14:42:21 -07:00 |
|
Zach Fox
|
1f3063193a
|
Tweak right-click to inspect
|
2018-04-02 14:24:51 -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
|
796bd069b2
|
Merge pull request #12659 from alexiamandeville/script_charcontroller
Updating char controller
|
2018-04-02 13:24:15 -07:00 |
|
Brad Davis
|
14ea168ab3
|
Merge remote-tracking branch 'upstream/master' into bindless
|
2018-04-02 13:13:28 -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
|
a9a53c7d64
|
make resquested changes
|
2018-04-02 10:51:39 -07:00 |
|
Anthony Thibault
|
dc9c9fd0ee
|
Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping
Reduce avatar elbow fluttering by disabling pole vectors
|
2018-04-02 10:51:28 -07:00 |
|
John Conklin II
|
aceb3d13b4
|
Merge pull request #12749 from samcake/rc66-mirror
RC66: Fix crash on Macos when looking at a mirror or when secondary camera is enabled
|
2018-04-02 10:16:04 -07:00 |
|
Sam Gateau
|
8178ee7f34
|
Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror
|
2018-03-30 17:00:11 -07:00 |
|
Sam Gateau
|
d5496d68fd
|
FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly
|
2018-03-30 16:58:41 -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
|
4b7e2cb331
|
made requested changes
|
2018-03-30 15:15:17 -07:00 |
|
Dante Ruiz
|
16749df83a
|
fix highlighting edge case
|
2018-03-30 14:14:13 -07:00 |
|
Dante Ruiz
|
c99676b510
|
atlernate fix for selected entities
|
2018-03-30 13:44:54 -07:00 |
|
John Conklin II
|
8c8400947f
|
Merge pull request #12745 from SamGondelman/shadow
RC66: Fix shadows on primitives
|
2018-03-30 12:52:08 -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 |
|