Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 02:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
70414 commits 76 branches 59 tags 1.2 GiB
Commit graph

26205 commits

Author SHA1 Message Date
Alexander Ivash
425209189d reduce precision 2018-07-07 03:03:24 +03:00
Cristian Luis Duarte
be8351dc0d Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background 2018-07-06 20:43:52 -03:00
Alexander Ivash
7feb9910c9 use rotation degrees instead of quaternions for comparison 
re-query entity properties after editing it to get actual changes
 2018-07-07 02:36:19 +03:00
Alexander Ivash
4716be01f6 eliminate binding loop which could lead to not updating spinbox UI 2018-07-07 02:36:19 +03:00
Alexander Ivash
536395d199 only compare properties which exist for both objects in 'numeric comparer' 
note: this is attempt to quick-n-dirty workaround weird issue with having colors informaiton inside 'dimensions' in the latest master

example:

 "blue": 0.2367398738861084,
   "green": 0.08945406973361969,
   "red": 0.25246158242225647,
   "x": 0.25246158242225647,
   "y": 0.08945406973361969,
   "z": 0.2367398738861084
 2018-07-07 02:36:19 +03:00
Clement
23e5dd0d2c annotate with fingerprint immidiately 2018-07-06 15:52:30 -07:00
Clement
d9d72774d8 Add exception for backtrace requests 2018-07-06 15:51:40 -07:00
Simon Walton
607a898c32 Transmit a maximum number of identity requests before giving up 2018-07-06 15:16:13 -07:00
John Conklin II
01610a1520
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444 
Fix AddressManager copyAddress/copyPath functionality
 2018-07-06 14:11:08 -07:00
John Conklin II
1bd698a5dc
Merge pull request #13558 from danteruiz/fix-falling-through-floor 
Fix falling through floor
 2018-07-06 13:44:08 -07:00
John Conklin II
6e13b0e141
Merge pull request #13453 from gcalero/web_overlay_android 
Support web3d overlays in android
 2018-07-06 13:02:56 -07:00
Thijs Wenker
4b2e0765db - cleanup (parent) signals InteractiveWindow after window is closed 2018-07-06 20:24:43 +02:00
Wayne Chen
cb89b046b4 moving copyToClipboard from slots to functions 2018-07-06 11:07:35 -07:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Wayne Chen
eb4704620c reverting unintended line from previous debug 2018-07-06 11:06:16 -07:00
Wayne Chen
0facbedbbc adding Q_INVOKABLE method for copying to Application clipboard 2018-07-06 11:03:58 -07:00
Thijs Wenker
eed1f66e71 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-06 20:01:48 +02:00
Alexander Ivash
67fb8af87c update avatarapp on avatar switch 2018-07-06 21:00:56 +03:00
Alexander Ivash
aaa2e3f6a8 fix issue with duplicated wearables on switching between bookmarks / cancelling 'adjust wearables' 2018-07-06 21:00:56 +03:00
Alexander Ivash
e943a607b0 'Wear wearable' => 'Wear wearables' (from QA feedback) 2018-07-06 21:00:56 +03:00
Alexander Ivash
33c45a224c return 'override' to fix mac/linux builds 2018-07-06 21:00:56 +03:00
Alexander Ivash
745a957e05 more clear description of bookmarks added/loaded/removed signals 2018-07-06 21:00:56 +03:00
Alexander Ivash
7fa09aef8f slightly update jsdoc with functions description 2018-07-06 21:00:55 +03:00
Alexander Ivash
7854b28498 move empty function to header per Dante's request 2018-07-06 21:00:55 +03:00
Alexander Ivash
fae5cd22f0 remove signals blocking 2018-07-06 21:00:55 +03:00
Alexander Ivash
fb1a2037e3 move specifying custom properties for preferences dialog from C++ to QML (per Dante's request) 2018-07-06 21:00:55 +03:00
Alexander Ivash
68041dc93c get rid of TextStyle1..11 per request from Dante 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbcc654af1 remove comments 2018-07-06 21:00:55 +03:00
Alexander Ivash
b8b3c21c89 added jsdoc comments 2018-07-06 21:00:55 +03:00
Alexander Ivash
ea55df48ca fix coding style 2018-07-06 21:00:55 +03:00
Alexander Ivash
9b5135b66b remove debug outputs per Dante's request 2018-07-06 21:00:55 +03:00
Alexander Ivash
48fc81b082 Buy wearables from Marketplace [new line] 
Wear wearable from My Purchases [new line]
 2018-07-06 21:00:55 +03:00
Alexander Ivash
a9f10b2305 avatarisland link should direct to 11.5848,-8.10862,-2.80195 2018-07-06 21:00:55 +03:00
Alexander Ivash
89c478310f update avatarbookmarks.json 2018-07-06 21:00:55 +03:00
Alexander Ivash
12c0292595 experimental fix for Mukul's issue 2018-07-06 21:00:55 +03:00
Alexander Ivash
e4d6528ab9 fix trashcan overlay over 'guy-in-circle' 2018-07-06 21:00:55 +03:00
Alexander Ivash
41a9b22bf6 long text truncation 2018-07-06 21:00:55 +03:00
Alexander Ivash
8d921b123d The new layout from zeplin (https://zpl.io/aMm76Yr) 2018-07-06 21:00:55 +03:00
Alexander Ivash
46992f04ad replace bodymart & avatarisland images 2018-07-06 21:00:55 +03:00
Alexander Ivash
83f92aff9f Create data directory if doesn't exist 2018-07-06 21:00:55 +03:00
Alexander Ivash
939749e084 The keyboard should appear at the bottom of the screen. 2018-07-06 21:00:55 +03:00
Alexander Ivash
3f86f3d91f present avatar model name without marketId in black 2018-07-06 21:00:55 +03:00
Alexander Ivash
4db346167d fix extracting default avatar bookmarks from resources 2018-07-06 21:00:55 +03:00
Alexander Ivash
0ad11c4a6e Open 'Learn to make a custom…' in default external browser 2018-07-06 21:00:55 +03:00
Alexander Ivash
2581157794 "The button changes from Confirm to overwrite, and the button style changes from blue to red" 2018-07-06 21:00:55 +03:00
Alexander Ivash
24885c3512 use avatarbookmarks.json from resources by default 2018-07-06 21:00:55 +03:00
Alexander Ivash
345c294d47 invalidate avatar model on using custom avatar url 
disable navigation if no marketId
 2018-07-06 21:00:55 +03:00
Alexander Ivash
dbf1aa779a reflect changes in grabbed wearable position/rotation in UI 2018-07-06 21:00:55 +03:00
Alexander Ivash
c7570dbf83 integrate onscreen keyboard 2018-07-06 21:00:54 +03:00
Alexander Ivash
5381dce8d8 get rid of 'isExternal' due to changes requirements 
show avatar thumbnail if url was specified & valid, show 'guy-in-circle' otherwise
 2018-07-06 21:00:54 +03:00
Alexander Ivash
9925bc2822 don't treat empty display name as an error 2018-07-06 21:00:54 +03:00
Alexander Ivash
2c07aa787f allow passing properties to preferences; left align 'User real-world height' & right-align 'reset sensors' (Mukul's request) 2018-07-06 21:00:54 +03:00
Alexander Ivash
56cd4e57a6 add 'reset sensors' to preferences 2018-07-06 21:00:54 +03:00
Alexander Ivash
929fec731c remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
b445cc6105 allow changing avatar scale without saving; revert on cancel 2018-07-06 21:00:54 +03:00
Alexander Ivash
67b2512a2a query avatar model name for current avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
6ff2ea96f4 crop avatar thumbnails to fit aspect ratio 2018-07-06 21:00:54 +03:00
Alexander Ivash
9a4ea07614 limit avatar name to 14 characters + … at the end 2018-07-06 21:00:54 +03:00
Alexander Ivash
ee856266c7 allow updating existing avatars 2018-07-06 21:00:54 +03:00
Alexander Ivash
b4c4ab88f0 update logging 2018-07-06 21:00:54 +03:00
Alexander Ivash
fdd7644cba use numeric animation for avatar bookmark & page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
3c78ba0060 resolve constant switching between hover/no-hover for page indicator 2018-07-06 21:00:54 +03:00
Alexander Ivash
afc09c13b2 specify updated shadow params from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
99affb22f5 show spinner during avatar thumbnails loading 2018-07-06 21:00:54 +03:00
Alexander Ivash
567298b59b shadow for wearables indicator (based on mockups) 2018-07-06 21:00:54 +03:00
Alexander Ivash
6efcea2c27 adjust settings layout according to mockups, update style9 2018-07-06 21:00:54 +03:00
Alexander Ivash
b7614684de add check for duplicate names into 'create favorites dialog', style accordingly to mockups 2018-07-06 21:00:54 +03:00
Alexander Ivash
a26248e1d2 switch to regexp-based method of extracting marketplaceId from url 2018-07-06 21:00:54 +03:00
Alexander Ivash
1778e59142 blue version of TextStyle3 should only be used for avatar name under favorites 2018-07-06 21:00:54 +03:00
Alexander Ivash
a4a1ac5d12 The height of the “Take it off” button should be the same as “save” button 
“m” and “deg” should align with “Position” and “Rotation” text
The step size in degrees should be 1 degree
 2018-07-06 21:00:54 +03:00
Alexander Ivash
17acb5e106 when the user clicks on it should take the user to the marketplace info page of the avatar 2018-07-06 21:00:54 +03:00
Alexander Ivash
9f7fd3faa2 add slight animation on hover 2018-07-06 21:00:54 +03:00
Alexander Ivash
462d2d5d80 fix 'card moves rapidly between hover and non-hover' 2018-07-06 21:00:54 +03:00
Alexander Ivash
73ec34825b add proper application icon 2018-07-06 21:00:54 +03:00
Alexander Ivash
459a1906a5 make highlight border width 4 per request from Mukul 2018-07-06 21:00:54 +03:00
Alexander Ivash
bad7890c83 extract avatar name from url if empty 2018-07-06 21:00:54 +03:00
Alexander Ivash
c765730c5a use avatarUrl instead of avatarThumbnailUrl for comparison, as thumbnail url is calculated 2018-07-06 21:00:53 +03:00
Alexander Ivash
3520285079 remove debug code 2018-07-06 21:00:53 +03:00
Alexander Ivash
e740f494ce styling settings slider, adjust height of edit fields 2018-07-06 21:00:53 +03:00
Alexander Ivash
764dc6d156 add link to 'external avatar' dialog 2018-07-06 21:00:53 +03:00
Alexander Ivash
235b0e9f4d change icon for 'guy-in-circle' 2018-07-06 21:00:53 +03:00
Alexander Ivash
91e1714b0e external avatars support 2018-07-06 21:00:53 +03:00
Alexander Ivash
856c95b52a move avatarapp-specific images into appropriate subfolder 2018-07-06 21:00:53 +03:00
Alexander Ivash
0efb5437e8 remove sample avatar thumbnails 2018-07-06 21:00:53 +03:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
1cc086f9c6 cleanup and bugfixing 2018-07-06 21:00:53 +03:00
Alexander Ivash
74bfea59cc reply => data 2018-07-06 21:00:53 +03:00
Alexander Ivash
bcb373618f navigation to market / my purchases from message dialog links 2018-07-06 21:00:53 +03:00
Alexander Ivash
4ce8e29d97 navigate to BodyMart / AvatarIsland on 'get avatars' / 'get wearables' 2018-07-06 21:00:53 +03:00
Alexander Ivash
3baa1a588f bound 'displayName' to backend, adjust font 2018-07-06 21:00:53 +03:00
Alexander Ivash
10f2fe5fe6 implement adding bookmark 
improve comparision of attachments/wearables
 2018-07-06 21:00:53 +03:00
Alexander Ivash
18a3901d29 update hifi-glyphs.ttf font file 2018-07-06 21:00:53 +03:00
Alexander Ivash
fe8bb3c8ea simplify code a bit 
explicite store attachments in model
use models for comparison instead JS Objects
 2018-07-06 21:00:53 +03:00
Alexander Ivash
47ffcf8c42 change logic for determining if current avatar is bookmarked & move to model 2018-07-06 21:00:53 +03:00
Alexander Ivash
512e72d6d1 integrate deleting favorite avatars with backend 2018-07-06 21:00:53 +03:00
Alexander Ivash
6ff397e9e0 move all messagebox-es into dedicated component 2018-07-06 21:00:53 +03:00
Alexander Ivash
d1bf80b50c update UI based on the latest zeplin mockups 2018-07-06 21:00:53 +03:00
Alexander Ivash
a88a851f15 allow specifying fontSize for uit-controls Button, expose impliciTextWidth to allow adjust-to-content type of sizing 2018-07-06 21:00:53 +03:00
Alexander Ivash
5ebe26887d updated text styles based on the latest zeplin specs 2018-07-06 21:00:53 +03:00
Alexander Ivash
51c8248463 introduce reverting avatar wearables on cancel 2018-07-06 21:00:53 +03:00
Alexander Ivash
9914a1d523 AdjustWearables: implement deleting/refreshing wearables/wearable 2018-07-06 21:00:52 +03:00
Alexander Ivash
b6769f9678 avatar selection & wearables adjustments work-on-progress 2018-07-06 21:00:52 +03:00
Alexander Ivash
57568d120e attempt to produce thumbnail url from marketId (works only partially), move model population code to model 2018-07-06 21:00:52 +03:00
Alexander Ivash
566074c86f use slider from ui-toolkit (per request from Mukul) 2018-07-06 21:00:52 +03:00
Alexander Ivash
de81f30407 page indicators styling 2018-07-06 21:00:52 +03:00
Alexander Ivash
fe2ebe63e8 glyph font update to version 1.32 2018-07-06 21:00:52 +03:00
Alexander Ivash
4fa72eab6d show real wearables from avatar in combobox 2018-07-06 21:00:52 +03:00
Alexander Ivash
245ab7a309 explicitely specify 'getMoreAvatars', otherwise QML starts complaining about not-existing property 2018-07-06 21:00:52 +03:00
Alexander Ivash
1ccd4aaab7 fix typo 2018-07-06 21:00:52 +03:00
Dante Ruiz
ce3015662e backend integration from Dante 
* adding some functionality to avatar bookmarks
* saving work
 2018-07-06 21:00:52 +03:00
Alexander Ivash
5007c259bb query real avatar favorites (but use fake urls for now) 2018-07-06 21:00:52 +03:00
Alexander Ivash
6059ef2904 a few updates to adjust wearables & settings pages 2018-07-06 21:00:52 +03:00
Alexander Ivash
4bb517f620 reimplement 'text input with pencil' based on QQC2 TextField 2018-07-06 21:00:52 +03:00
Alexander Ivash
00b54c3f46 disable hover effect for selected avatar 2018-07-06 21:00:52 +03:00
Alexander Ivash
7723d0f306 turn all input controls to uit-based 2018-07-06 21:00:52 +03:00
Alexander Ivash
cdc9a325eb use standard radiobuttons with light color scheme 2018-07-06 21:00:52 +03:00
Alexander Ivash
d3848ea0c5 spelling issue fix 2018-07-06 21:00:52 +03:00
Alexander Ivash
34693a8562 use correct overlay for avatars in management state 2018-07-06 21:00:52 +03:00
Alexander Ivash
3acde99587 hide 'get all avatars' while in 'manage' state 2018-07-06 21:00:52 +03:00
Alexander Ivash
f8917a835a hide page indicator when only one page 2018-07-06 21:00:52 +03:00
Alexander Ivash
1916df6c81 specify border radius for 'get more avatars' 2018-07-06 21:00:52 +03:00
Alexander Ivash
8a5abb32a7 rework avatar selection logic based on changed requirements: selecte avatar always goes to the beginning of the list, selected page auto-switches to the first one 2018-07-06 21:00:52 +03:00
Alexander Ivash
bdacd1b792 left-to-right layout in favorites grid 2018-07-06 21:00:52 +03:00
Alexander Ivash
10e5f03f5e move selected avatar to the beginning of the page 2018-07-06 21:00:52 +03:00
Alexander Ivash
e0a8d90141 adjust link icon size 2018-07-06 21:00:52 +03:00
Alexander Ivash
3d4fb2d368 fix spelling error 2018-07-06 21:00:52 +03:00
Alexander Ivash
4d2a37aff2 show add to favorites on clicking star 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd48ff9ee6 remove link glyph rotation 2018-07-06 21:00:51 +03:00
Alexander Ivash
c54b2c8f26 adjust avatar thumbnail image radius 2018-07-06 21:00:51 +03:00
Alexander Ivash
bd719286d8 move highlight under the green wearable indicator, use internal highlight of ShadowImage instead of extra Rectangle 2018-07-06 21:00:51 +03:00
Alexander Ivash
8a8f599583 rounded avatar images 2018-07-06 21:00:51 +03:00
Alexander Ivash
1ddfc87396 wip on avatarapp 2018-07-06 21:00:51 +03:00
Dante Ruiz
10bce7ea8d adding some functionality to avatar bookmarks 2018-07-06 21:00:51 +03:00
John Conklin II
7aaf17a3c8
Merge pull request #13496 from thoys/feat/interactive-window 
InteractiveWindow scripting API
 2018-07-06 10:58:12 -07:00
David Back
e29873ad66 prevent right-click strafe with ctrl 2018-07-06 10:52:53 -07:00
David Back
473166a6e7 Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-06 10:26:57 -07:00
Seth Alves
c0e1e9c23a
Merge pull request #13353 from vladest/address_dialog_focus_fix 
Remove extra textfield fro address bar input
 2018-07-06 09:00:00 -07:00
Dante Ruiz
533164e1e4 some more fixes 2018-07-06 08:55:20 -07:00
Thijs Wenker
1b63dfa20a - OSX fixes (right camera after coming from native window, disappearing content) 
- Fix show() to show the window after it was minimized
 2018-07-06 17:50:48 +02:00
Clement
8c283806b3 Fix Warnings 2018-07-05 20:02:57 -07:00
Wayne Chen
3994ec4176 adding potential fix - moving methods to Application 2018-07-05 17:54:27 -07:00
Simon Walton
f77b2903a1 Minor tweaks 2018-07-05 17:13:27 -07:00
David Back
4763ccf1ec Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-05 14:53:21 -07:00
Clement
546ee2b96f cleanup cmake code 2018-07-05 14:18:09 -07:00
amantley
0ebc7fc29e fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency 2018-07-05 13:41:06 -07:00
Clement
b8f821a6a6 Use binary path in args to find crashpad handler 2018-07-05 12:05:48 -07:00
Thijs Wenker
2b8372c959 Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-05 17:59:11 +02:00
Sam
58f004352a Added per pixel GPU stats 2018-07-04 17:15:12 +02:00
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing 
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
 2018-07-03 21:50:57 -07:00
Thijs Wenker
3a32472b0b added test / more docs 2018-07-04 02:49:20 +02:00
amantley
6460c9e861 fixed case for 0.0 as the filter length 2018-07-03 17:11:19 -07:00
Wayne Chen
cfa54c2905 adding updated keyboard mapping .jpg to repo 2018-07-03 16:28:19 -07:00
John Conklin II
d34d7388a1
Merge pull request #13537 from r3tk0n/move_hide_overlays_menu 
Moved "Show Overlays" menu item to Developer Menu
 2018-07-03 15:59:02 -07:00
Simon Walton
ec67b8ad56 Address reviewer comments 2018-07-03 15:31:34 -07:00
David Back
263506174e Ctrl rules for e,q,a,d 2018-07-03 15:09:35 -07:00
amantley
4995b57712 removed print statements and fixed rotation threshold update code 2018-07-03 14:31:36 -07:00
John Conklin II
65daee2353
Merge pull request #13513 from vladest/double_asset_server_fix 
Tablet Asset Server dialog was instantiated twice
 2018-07-03 13:14:12 -07:00
John Conklin II
6737647a56
Merge pull request #13524 from danteruiz/fix-calibration 
fix configuration page
 2018-07-03 13:13:48 -07:00
r3tk0n
4426173021 Moved "Show Overlays" menu item to Developer Menu 2018-07-03 11:56:34 -07:00
amantley
59dfe80940 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-03 11:47:09 -07:00
amantley
9e5763ea5c adding the recentering back into the non hmd lean code 2018-07-03 11:46:59 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix 
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
 2018-07-03 19:38:01 +01:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
SamGondelman
90091d11e4 parabola picks, started implementing math 2018-07-03 09:47:31 -07:00
Thijs Wenker
3f6793b462 - center default native window 
- close button destroys window by default unless Desktop.CLOSE_BUTTON_HIDES flag is set
 2018-07-03 18:42:39 +02:00
Thijs Wenker
d886bc2d9c Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window 2018-07-03 18:19:48 +02:00
Sam Gateau
96b26c94eb Really add safe check for targetDisplayPLugin 2018-07-03 16:59:40 +02:00
Thijs Wenker
3a6ab3562f Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-07-03 16:51:24 +02:00
Thijs Wenker
7390983721 introduce scriptable presentationMode instead of automatic mode switching windows 2018-07-03 16:49:49 +02:00
amantley
f216316b55 removed some comments and whitespace 2018-07-02 18:19:31 -07:00
amantley
47110d080f removed clang induced changes to MyAvatar.cpp 2018-07-02 17:06:16 -07:00
Cristian Duarte
6b5e5702dd Android - implement pause-resume of requests chain in ResourceCache 2018-07-02 20:05:59 -03:00
amantley
7f5f762208 fixing merge conflict 2018-07-02 15:54:21 -07:00
amantley
ed279e7331 added tweaks to the avatar animation json that speed up the transitions to better match the new step detection 2018-07-02 15:46:58 -07:00
amantley
096d0d2827 reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update 2018-07-02 15:43:57 -07:00
John Conklin II
3f975cfa84
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit 
Fix Mac Crashes On Shutdown
 2018-07-02 15:27:26 -07:00
Bradley Austin Davis
b862694e32
Merge pull request #13505 from samcake/punk 
Fixing a bug if the last session display plugin is an invalid name, resolve to default
 2018-07-02 14:55:04 -07:00
Dante Ruiz
603ab87c47 fix configuration page 2018-07-02 14:38:16 -07:00
Cristian Duarte
6b3a9def7a Merge branch 'hifi_master' into android_stop_downloads_bg 2018-07-02 17:37:40 -03:00
Dante Ruiz
e2757e80ea
Merge pull request #13512 from wayne-chen/passwordFieldLoginFix-case-14261 
Hitting Enter Key in Password Field To Login
 2018-07-02 12:55:44 -07:00
John Conklin II
844bd3f48d
Merge pull request #13518 from zfox23/MS16390_buyFail 
Fix MS16390: Correctly update UI when Buy endpoint fails
 2018-07-02 12:36:19 -07:00
John Conklin II
58a9bdc86f
Merge pull request #13511 from r3tk0n/mouse_menu2 
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
 2018-07-02 12:33:35 -07:00
Zach Fox
c95b359aa7 Fix MS16390: Correctly update UI when Buy endpoint fails 2018-07-02 10:23:53 -07:00
vladest
0657992e9c Tablet Asset Server dialog was instantiated twice 2018-07-01 19:56:51 +02:00
Anthony J. Thibault
fff4348a0f Bug fix for poleVector smoothing 
Needs to occur in sensor space rather then avatar space.
 2018-06-29 17:54:21 -07:00
Gabriel Calero
762e8f4bf0 Refactor WebViewActivity using fragment. Try SlidingDrawer. 2018-06-29 20:43:58 -03:00
Wayne Chen
99a64f31d7 Adding Enter/Return for sign up dialog in pw field 2018-06-29 16:21:03 -07:00
r3tk0n
39f491d9d0
Update PreferencesDialog.cpp 
Removing errant newline
 2018-06-29 16:17:15 -07:00
Wayne Chen
2c32dc1cf5 adding enter key event for logging in in pw textfield 2018-06-29 16:13:02 -07:00
r3tk0n
4feba7e66e
Correction of string literals 
Last update to string literals, miscommunication.
 2018-06-29 16:12:31 -07:00
r3tk0n
5158a9c4fd
Update Mouse Sensitivity Settings Text 
Changed text for clarity to new users.
 2018-06-29 16:11:18 -07:00
r3tk0n
9b59dc5809 Changed SpinnerSliderPreference.qml to general-case UI element as originally intended, 
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
 2018-06-29 15:22:57 -07:00
amantley
44d9edec3c added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning 2018-06-29 14:42:23 -07:00
vladest
27906bcdc8 Turn on focus hacks again 2018-06-29 21:16:14 +02:00
amantley
c9c222a253 added the failsafe code to the stepping 2018-06-29 11:33:42 -07:00
Gabriel Calero
aeddf2ed67 Restore resources 2018-06-29 15:15:54 -03:00
Gabriel Calero
5186b7d60f Merge branch 'web_overlay_android' of https://github.com/gcalero/hifi into web_overlay_android 2018-06-29 15:14:49 -03:00
Gabriel Calero
a6d093d8c9 Merge remote-tracking branch 'upstream/master' into web_overlay_android 2018-06-29 15:09:32 -03:00
vladest
0f1312ab9b Merge branch 'master' into address_dialog_focus_fix 2018-06-29 19:41:26 +02:00
sabrina-shanman
9dc03f5013 Destroy GeometryCache explicitly in Application destructor 2018-06-29 10:39:16 -07:00
Gabriel
32419127a1
Delete hand.svg 2018-06-29 14:08:13 -03:00
Gabriel
8af91ca0d4
Delete Cairo-SemiBold.ttf 2018-06-29 14:07:48 -03:00
sabrina-shanman
c849d8e2a8 Merge branch 'mac-shutdown-crash-on-present' into fix-osx-crash-on-exit 2018-06-29 09:37:54 -07:00
Sam Gateau
d543cd0766 Fixing a bug if the last session display pluginis an invalid name, resolve to default 2018-06-29 15:42:19 +02:00
amantley
15a17ae32a finished the step detection, need to finish the failsafe 2018-06-28 18:36:13 -07:00
Gabriel Calero
2112af4400 Apply desing to android web entities and overlays 2018-06-28 17:46:33 -03:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster 
The client should render "something" for an avatar even if mesh or identity is not available
 2018-06-28 12:12:16 -07:00
amantley
3e6d54e83c added all the parts for the step conditional to do: failsafe 2018-06-28 11:56:46 -07:00
Thijs Wenker
8ade709c1f Merge branch 'feat/create/interactive-window' into feat/create/native-windows 2018-06-28 19:14:46 +02:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
Thijs Wenker
5029767493 InteractiveWindow scripting API 2018-06-28 19:04:08 +02:00
John Conklin II
040978830a
Merge pull request #13413 from Atlante45/fix/audio-starve 
Fix audio device sometimes being on the wrong thread
 2018-06-28 09:59:00 -07:00
John Conklin II
b07d317f4c
Merge pull request #13488 from hyperlogic/bug-fix/qstring-from-script-engine 
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
 2018-06-28 09:56:51 -07:00
John Conklin II
af13196d3f
Merge pull request #13489 from r3tk0n/mouse_menu 
Re-added mouse sensitivity settings to General Preferences dialog.
 2018-06-28 09:43:55 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay 
Implement MS16257: Remove 'clear overlay when moving' setting and code
 2018-06-28 09:31:04 -07:00
Sam Gondelman
736c56f5f4
Merge pull request #13487 from gcalero/single_account_manager_android 
Remove the duplicated AccountManager used for android
 2018-06-28 09:07:23 -07:00
Angus Antley
2307c8e24a more work on the mode threshold 2018-06-28 15:40:42 +01:00
amantley
621ca7d2b4 more work on the mode function 2018-06-27 18:46:24 -07:00
amantley
61a935dbb5 added the first pass at mode computation 2018-06-27 18:02:11 -07:00
r3tk0n
f36ba49fbd
Update TabletGeneralPreferences.qml 
Fixed a typo
 2018-06-27 16:30:38 -07:00
r3tk0n
d6684e5ef7 Re-add mouse sensitivity option to tablet. 2018-06-27 16:23:40 -07:00
r3tk0n
c80ab0d237 Re-added mouse sensitivity settings to General Preferences dialog. 2018-06-27 16:10:07 -07:00
Anthony J. Thibault
70a3c9ce3c Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings 
Using gflags on windows and enabling full page heap verification, I was able to detect this as a source of
memory corruption.

https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap

Running interface with pageheap before and after, this change leads me to believe that this is a source of
some of our heap-corruption crashes on backtrace.

Specifically these 19 crashes in the last month, and possibly more.

https://highfidelity.sp.backtrace.io/dashboard/highfidelity/project/Interface/query-builder?qb=%7B%22mode%22%3A%22aggregate%22%2C%22sorting%22%3A%7B%22aggFactor%22%3A%22count%22%2C%22aggSortOrder%22%3A%22descending%22%2C%22selectFactor%22%3A%22timestamp%22%2C%22selectSortOrder%22%3A%22descending%22%2C%22sortedColumnNames%22%3A%5B%5D%7D%2C%22dateTimePicker%22%3A%7B%22granularity%22%3A%221M%22%2C%22start%22%3A%222018-05-27T07%3A00%3A00.000Z%22%2C%22end%22%3A%222018-06-27T23%3A05%3A29.399Z%22%7D%7D&qn=&query=%7B%22filter%22%3A%5B%7B%22callstack%22%3A%5B%5B%22contains%22%2C%22saveAll%22%5D%5D%2C%22timestamp%22%3A%5B%5B%22at-least%22%2C1527404400%5D%2C%5B%22at-most%22%2C1530140729%5D%5D%7D%5D%2C%22fold%22%3A%7B%22timestamp%22%3A%5B%5B%22range%22%5D%2C%5B%22bin%22%2C32%2C1527404400%2C1530140729%5D%5D%7D%2C%22group%22%3A%5B%22classifiers%22%5D%2C%22select%22%3A%5B%22timestamp%22%2C%22fingerprint%22%2C%22_deleted%22%2C%22callstack%22%2C%22object%22%5D%7D
 2018-06-27 16:06:23 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default 
Disable flying by default
 2018-06-27 16:04:16 -07:00
John Conklin II
02d0c7d795
Merge pull request #13454 from danteruiz/mac-fix-general-settings 
make general settings be under settings instead of preferences
 2018-06-27 15:59:16 -07:00
John Conklin II
8c516e1ca8
Merge pull request #13480 from birarda/bug/go-to-before-clear-master 
move AddressManager to NodeList thread, make AccountManager safer
 2018-06-27 15:58:56 -07:00
Zach Fox
1b414fbbfe Quick CR comments 2018-06-27 15:11:59 -07:00
Gabriel Calero
e15fc787d3 Remove the duplicated AccountManager used for android 2018-06-27 19:04:27 -03:00
Zach Fox
8ba184db6a Don't use flags; use a bool 2018-06-27 14:59:46 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also 
added the virtual keyword to the createOrb virtual method in OtherAvatar
 2018-06-27 14:31:39 -07:00
Zach Fox
2347634d72 Fixed View Overlays checkbox (thanks Dante) 2018-06-27 14:28:43 -07:00
amantley
7b49ae4950 added the within threshold of height function and to do: the mode computation 2018-06-27 14:23:24 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892 
Fix entity detaching from head joint not becoming visible
 2018-06-27 12:32:52 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
amantley
1804422df0 remove orb in the otherAvatar destructor, and check 
_otherAvatarOrbMeshPlaceholder pointer before updating the position
 2018-06-27 11:15:42 -07:00
amantley
3893b7e339 added the head angular velocity check 2018-06-27 10:37:54 -07:00
sabrina-shanman
18219464f1 Fix shutdown crash on Mac in Application::onPresent 2018-06-27 09:56:03 -07:00
Seth Alves
d9f8cd46ea
Merge pull request #13415 from ctrlaltdavid/21896 
Zero avatar velocity if protocol version mismatch so that overlays show
 2018-06-27 09:35:15 -07:00
amantley
8cf59783d1 removed white space 2018-06-27 09:20:46 -07:00
amantley
be6fadbc2d Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-06-27 09:16:43 -07:00
Angus Antley
eba4a27329 added newline to the end of AvatarManager.cpp 2018-06-27 05:59:53 +01:00
John Conklin II
a03a5693a5
Merge pull request #13466 from danteruiz/fix-login-2.0 
fix login links (forgot username and password)
 2018-06-26 18:51:10 -07:00
amantley
39edc21423 spaced comment fixed 2018-06-26 17:47:36 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
7ecf8c24df Merge remote-tracking branch 'upstream/master' into glowingOrbMaster 
syncing with upstream master
 2018-06-26 16:44:34 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
Sam Gondelman
7fb2e535ff
Merge pull request #13468 from SamGondelman/secondaryShadows 
Disable shadows in secondary camera
 2018-06-26 15:45:44 -07:00