Cristian Luis Duarte
|
ffb8b0a60e
|
Android fly - Use new asset and screen position
|
2018-04-04 18:19:01 -03:00 |
|
Cristian Luis Duarte
|
88c83f3bfe
|
Merge remote-tracking branch 'hifi/master' into android_jump
|
2018-04-03 19:59:21 -03:00 |
|
Clément Brisset
|
3d4490f3fd
|
Merge pull request #12737 from highfidelity/RC66
RC66 mergeback
|
2018-04-03 15:39:16 -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 |
|
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 |
|
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 |
|
Cristian Luis Duarte
|
cbf13c9f8c
|
Merge remote-tracking branch 'hifi/master' into android_jump
|
2018-04-03 16:12:17 -03:00 |
|
Cristian Luis Duarte
|
1ea056a8a9
|
Android - Initial Jump button implementation
|
2018-04-03 16:07:40 -03: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 |
|
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 |
|
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 |
|
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
|
59fb448698
|
Remove duplicate function
|
2018-03-30 10:28:40 -07:00 |
|
Zach Fox
|
bd6dbadade
|
No magic numbers
|
2018-03-30 10:18:03 -07:00 |
|
Zach Fox
|
32e5e9986f
|
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
|
2018-03-30 10:10:43 -07:00 |
|
SamGondelman
|
5a7e9d8e3e
|
fix shadows on primitives
|
2018-03-30 09:48:04 -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 |
|
Brad Davis
|
440c01ae05
|
Merge remote-tracking branch 'upstream/master' into bindless
|
2018-03-30 09:29:35 -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 |
|
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 |
|
John Conklin II
|
b1ac2fd191
|
Merge pull request #12728 from SamGondelman/signedChar
Android: Fix octal code signed char issue
|
2018-03-29 13:56:06 -07: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 |
|
John Conklin II
|
a76b4b1008
|
Merge pull request #12734 from samcake/RC66-fetchMetaItem
RC66: Add an extra sanity check when calling fetchMetaSubItemBounds
|
2018-03-29 11:05:08 -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
|
c4b46d0a5f
|
Merge pull request #12719 from Atlante45/fix/ess-method-call
Fix ESS remote method calls for connect only users
|
2018-03-29 10:07:44 -07:00 |
|