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 |
|
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 |
|
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 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -07:00 |
|
Zach Fox
|
f20eddefc8
|
Fix 'Private' HMD preview texture enable/disable...again
|
2018-04-03 13:46:02 -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 |
|
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 |
|
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
|
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 |
|
Dante Ruiz
|
a9a53c7d64
|
make resquested changes
|
2018-04-02 10:51:39 -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
|
c99676b510
|
atlernate fix for selected entities
|
2018-03-30 13:44:54 -07:00 |
|
Ken Cooke
|
ff6c9f3127
|
Merge pull request #12704 from ElderOrb/FB13057
Improve audio devices selection logic
|
2018-03-30 11:18:05 -07:00 |
|
Zach Fox
|
32e5e9986f
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-30 10:10:43 -07:00 |
|
Ken Cooke
|
a2be291363
|
Merge pull request #12715 from ctrlaltdavid/21677
Add Window.raise() as replacement for Window.raiseMainWindow()
|
2018-03-30 09:41:54 -07:00 |
|
John Conklin II
|
5013760aa1
|
Merge pull request #12742 from jherico/fix/rc66_crashes
Fix/rc66 crashes
|
2018-03-29 18:04:52 -07:00 |
|
Alexander Ivash
|
814cfa4587
|
fix TabletAssetServer
|
2018-03-30 00:09:28 +03:00 |
|
John Conklin II
|
90dec1d3ef
|
Merge pull request #12733 from birarda/bug/scripts-copy-in-dev-rc66
RC66: fix cmake changes for script copy for dev builds
|
2018-03-29 13:57:45 -07:00 |
|
Alexander Ivash
|
e5da59a62f
|
FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"
|
2018-03-29 23:01:59 +03:00 |
|
John Conklin II
|
c7f7e2487c
|
Merge pull request #12738 from sethalves/fix-json-drag-and-drop-rc66
fix -- make drag-and-drop of json mean import again
|
2018-03-29 12:46:09 -07:00 |
|
John Conklin II
|
d6b652bdf3
|
Merge pull request #12735 from druiz17/RC66
Fix name conflict with c++ class and qml file(RC66)
|
2018-03-29 12:06:15 -07:00 |
|
John Conklin II
|
379df87d0c
|
Merge pull request #12697 from misslivirose/feat/disable-add-without-url
Disable Add Button in Model Modal until user has entered text in the model URL
|
2018-03-29 11:39:48 -07:00 |
|
Dante Ruiz
|
f7a081c9ec
|
minimize diff
|
2018-03-29 11:24:31 -07:00 |
|
Dante Ruiz
|
420672a769
|
fix-qml-confict
|
2018-03-29 11:24:08 -07:00 |
|
Dante Ruiz
|
e738274e90
|
map flying down back to C key
|
2018-03-29 11:10:39 -07:00 |
|
Seth Alves
|
dcfebde54a
|
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
|
2018-03-29 10:50:43 -07:00 |
|
amantley
|
3f44b88d2d
|
added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class
|
2018-03-29 10:09:51 -07:00 |
|
John Conklin II
|
97d9c1b735
|
Merge pull request #12726 from jherico/fix/rc66_crashes
Attempt to resolve potential overlay crashes at shutdown
|
2018-03-29 09:37:23 -07:00 |
|
Dante Ruiz
|
0bdf26faaf
|
minimize diff
|
2018-03-29 09:29:01 -07:00 |
|
Dante Ruiz
|
8cdb59413d
|
fix-qml-confict
|
2018-03-29 09:26:05 -07:00 |
|
Liv Erickson
|
387ff680d5
|
support deleted scenario
|
2018-03-28 18:12:30 -07:00 |
|
Liv Erickson
|
b78f00342e
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url
|
2018-03-28 17:53:42 -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 |
|
Stephen Birarda
|
35ee1bec09
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:56:53 -07:00 |
|
Stephen Birarda
|
0172c24cf2
|
fix cmake changes for script copy for dev builds
|
2018-03-28 14:47:09 -07:00 |
|
amantley
|
90d87c5b5d
|
changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety
|
2018-03-28 14:00:36 -07: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 |
|
amantley
|
4b1f974561
|
fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h
|
2018-03-28 11:57:48 -07:00 |
|
Zach Fox
|
0175028a88
|
Ensure location is correctly updated when replacing set from Checkout page
|
2018-03-28 11:31:51 -07:00 |
|
amantley
|
95f1d0e4fa
|
added get and set functions for the activate recenter variables
|
2018-03-28 10:33:00 -07:00 |
|