David Rowe
|
095c1b837c
|
Update JSDoc
|
2018-04-04 09:48:33 +12:00 |
|
David Rowe
|
6868ca971f
|
Make Window.x and Window.y report top left of drawable area of window
|
2018-04-04 09:43:39 +12:00 |
|
David Rowe
|
a3c8b2792d
|
Fix Window.geometryChanged() values for moving and resizing window
|
2018-04-04 09:42:05 +12:00 |
|
David Rowe
|
63603ff97c
|
Fix window height reported by Window.geometryChanged() signal
|
2018-04-03 14:21:15 +12: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
samcake
|
2ee0af03c8
|
Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet
|
2018-03-28 16:17:55 -07:00 |
|
Stephen Birarda
|
a697f971bb
|
Merge pull request #12732 from birarda/bug/scripts-copy-in-dev
fix cmake changes for script copy for dev builds
|
2018-03-28 15:55:37 -07: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 |
|
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 |
|
John Conklin II
|
5a7267a844
|
Merge pull request #12671 from Triplelexx/21794_inspect_avatars
WL#21794: Modify inspect.js to work with Avatars as well as entities
|
2018-03-28 10:44:30 -07:00 |
|
amantley
|
95f1d0e4fa
|
added get and set functions for the activate recenter variables
|
2018-03-28 10:33:00 -07:00 |
|
Brad Hefta-Gaub
|
16df773de4
|
Merge pull request #12721 from highfidelity/RC66
RC66 - Mergeback
|
2018-03-28 09:55:46 -07:00 |
|
John Conklin II
|
586fb4829c
|
Merge pull request #12637 from druiz17/fix-asset-server-qml
Fix asset server qml sorting
|
2018-03-28 09:35:53 -07:00 |
|
John Conklin II
|
d59a721f16
|
Merge pull request #12724 from sethalves/fix-entity-import
fix entity importing
|
2018-03-28 09:18:20 -07:00 |
|
Brad Davis
|
9be162de95
|
Synchronously shut down QML rendering threads
|
2018-03-28 09:13:46 -07:00 |
|
Brad Davis
|
aacfe92751
|
Don't trigger crashes from timers while waiting for some operation on exit
|
2018-03-28 09:09:56 -07:00 |
|
Seth Alves
|
46fb2033f2
|
Merge pull request #12574 from druiz17/remap-keybaord
changing keyboard mapping
|
2018-03-27 19:00:05 -07:00 |
|
Seth Alves
|
bb101956a6
|
fix entity importing
|
2018-03-27 18:25:43 -07:00 |
|
amantley
|
9f3b82a417
|
added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly
|
2018-03-27 18:21:14 -07:00 |
|
Dante Ruiz
|
ad9ca0da20
|
fix tablet version
|
2018-03-27 16:03:06 -07:00 |
|
John Conklin II
|
a258a330d3
|
Merge pull request #12676 from druiz17/fix-keyboard
fixing AddressManager keyboard when switching domains
|
2018-03-27 15:34:23 -07:00 |
|
Brad Davis
|
29106fbbbe
|
Prevent potential double delete of QML overlays
|
2018-03-27 14:18:19 -07:00 |
|
Brad Davis
|
eb20181b60
|
Shut down the overlay interface on exit
|
2018-03-27 14:18:01 -07:00 |
|
Dante Ruiz
|
3d7f7f0e62
|
fix parent tree grabbing
|
2018-03-27 14:05:43 -07:00 |
|
John Conklin II
|
0862f345fe
|
Merge pull request #12717 from sethalves/workaround-dialog-crash
fix -- work around asset-upload dialog crash
|
2018-03-27 13:35:50 -07:00 |
|
Clément Brisset
|
d8042f78e8
|
Merge pull request #12713 from highfidelity/RC66
RC66 - Merge Back
|
2018-03-27 13:01:14 -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 |
|
John Conklin II
|
7c505a0b85
|
Merge pull request #12711 from sethalves/serverless-tutorial-rc66
Serverless tutorial rc66
|
2018-03-27 11:17:07 -07:00 |
|
Seth Alves
|
4f7d856a1c
|
don't free dialogs to avoid crash in setKeyboardRaised
|
2018-03-27 09:28:55 -07:00 |
|