Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 16:53:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70819 commits 25 branches 0 tags 1.1 GiB
Commit graph

26381 commits

Author SHA1 Message Date
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
SamGondelman
3d4639bfdd CR 2018-07-27 16:36:22 -07:00
SamGondelman
1ef54b2fe6 back to ray teleport 2018-07-27 14:58:56 -07:00
John Conklin II
9c37e30fe6
Merge pull request #13678 from ElderOrb/FB17023 
FB17023 - Make visible avatar url in the avatar app
 2018-07-27 14:57:25 -07:00
Simon Walton
5315b020ec Use locking for the OctreePacketProcessor additions 2018-07-27 14:51:24 -07:00
John Conklin II
021e09d083
Merge pull request #13708 from sethalves/fix-grab-entity-w-child-overlay-crash 
fix a crash when grabbing a non-dynamic entity with an overlay child
 2018-07-27 12:49:14 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue 
Fix ScriptEngine begin held onto after script stopped runnning
 2018-07-27 12:31:31 -07:00
John Conklin II
d4cbbfe4c1
Merge pull request #13692 from amantley/leanBackSittingFix 
Fix For Unnatural Hips Behaviour When Sitting In HMD
 2018-07-27 12:30:31 -07:00
Simon Walton
3d390203e2 More fixes for clang & gcc 
C++14 issues, I think.
 2018-07-27 11:34:08 -07:00
Seth Alves
91d509f5a4 fix a crash when grabbing a non-dynamic entity with an overlay child 2018-07-27 10:35:26 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings 
17016 flying settings
 2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create 
Fix computePickRay when in mirror mode
 2018-07-27 09:05:58 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
Alexander Ivash
d38f0b0fde use updated 'Last Legends: Male' from Mukul 2018-07-27 12:32:18 +03:00
Simon Walton
0cec9a72d6 Implement client-side enable physics once indicated EntityData has arrived 
Also now use Entity Server Protocol sequence numbers.
 2018-07-26 18:10:38 -07:00
SamGondelman
f5364f752f fix scaling 2018-07-26 18:01:24 -07:00
Alexander Ivash
29f7cab7df FB16702 - Avatar App does not save Animation JSON Override URL 
note: PR also changes logic of 'hint' - previously it showed hard-coded senseless text, now - current value of 'animation URL'
 2018-07-27 02:08:44 +03:00
r3tk0n
f3d0d9b4a0 Clean up garbage comments. 2018-07-26 15:37:42 -07:00
r3tk0n
f8c611b1d0 Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp 2018-07-26 15:35:12 -07:00
SamGondelman
6a52b7b8f3 CR improvements 2018-07-26 12:15:12 -07:00
amantley
12cb212dc7 used avatar constants from AvatarConstants.h to initialize tpposehips and tposerightfoot, and added space between multiplication to meet coding standards 2018-07-26 12:05:17 -07:00
Anthony Thibault
6c92949aed
Merge pull request #13672 from luiscuenca/fixElbowPoleVector 
Redesign and enable hand's Pole Vectors for elbow simulation
 2018-07-26 11:51:33 -07:00
howard-stearns
9b61e8c4ad Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-26 11:50:15 -07:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4 Missed an identifier change 2018-07-25 17:36:53 -07:00
sabrina-shanman
de6d30e160 Add JS docs for CollisionPick API 2018-07-25 16:49:41 -07:00
NissimHadar
ce53b44b02 CR comments. 2018-07-25 15:58:46 -07:00
SamGondelman
9b41cb5554 improve model picking performance, scale parabola v/a with avatar, improve followNormal behavior, turn off followNormal on teleport, remove 1 m no teleport spot 2018-07-25 15:19:25 -07:00
NissimHadar
630df7c233 Corrects loading of texture and default visibility. 2018-07-25 13:28:23 -07:00
John Conklin II
89e7e3b938
Merge pull request #13682 from zfox23/MS16704_removeWearableAvatar 
Fix MS16704: Remove worn Avatar/Wearable before updating
 2018-07-25 12:12:50 -07:00
sabrina-shanman
8f993e4740 Change meaning/naming of collision points in CollisionPick API to better match spec and be more clear 2018-07-25 11:45:13 -07:00
amantley
37540c79b3 removed print statement and added const upper leg fraction 2018-07-25 10:51:19 -07:00
amantley
c5599623f7 added a reset when the hips go below 1/3 of the default avatar height of the hips also reset the vertical this prevents real life sitting 2018-07-25 10:29:29 -07:00
Dante Ruiz
a21a475784 Merge branch 'master' of github.com:highfidelity/hifi into fix-audio-hmd-issue 2018-07-25 08:44:28 -07:00
Dante Ruiz
8da1db31df fix audio page being in desktop when your in HMD 2018-07-25 08:44:11 -07:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces 
Removed non-working getResource() API functions.
 2018-07-25 22:10:14 +12:00
amantley
b91df1b2d4 cleaned up stray files and old hud code 2018-07-24 17:25:27 -07:00
amantley
91b9865f27 Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-24 17:14:24 -07:00
Simon Walton
47e99cdeac Initial code for AC side of Enabling Physics plan 
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
 2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf fix script memory issue 2018-07-24 16:31:12 -07:00
sabrina-shanman
083991dc1a Fix CollisionPick not detecting when collision points for collision models are loaded 2018-07-24 15:50:18 -07:00
sabrina-shanman
5ec277e458 Move bullet references in collision pick API to PhysicsEngine 2018-07-24 15:47:49 -07:00
Zach Fox
eea4630d2b Fix MS16704: Remove worn Avatar/Wearable before updating 2018-07-24 14:29:05 -07:00
SamGondelman
fbcddf1445 test gradual normal interpolation 2018-07-24 14:15:49 -07:00
SamGondelman
645f905239 cleanup, model performance improvements 2018-07-24 13:25:49 -07:00
Alexander Ivash
c9d9f7363a use 'light' color scheme 2018-07-24 23:19:11 +03:00
Alexander Ivash
dfb20c4afc FB16840 - Qml spinboxes in UI toolkit should focus the underlying field when clicked on 2018-07-24 23:02:06 +03:00
Alexander Ivash
c13f27e2eb FB17023 - Make visible avatar url in the avatar app 2018-07-24 22:10:18 +03:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper 
Added _aboutToQuit guard on eventFilter()
 2018-07-24 11:37:19 -07:00
SamGondelman
318ef907b8 parabola/polyvox, fixing some bugs 2018-07-24 10:08:35 -07:00
sabrina-shanman
a1202d9bd5 Do not use dynamic cast with bullet objects, and add missing template syntax 2018-07-24 09:07:18 -07:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
John Conklin II
2ac9463830
Merge pull request #13653 from ElderOrb/fake-wearables-fix 
FB16870: Avatar Wearables showing incorrect number
 2018-07-23 15:55:11 -07:00
howard-stearns
48184c102b Merge branch 'master' of github.com:highfidelity/hifi into forget-you 2018-07-23 15:25:46 -07:00
howard-stearns
f87db26cad pal refresh that remembers your place 2018-07-23 15:25:06 -07:00
John Conklin II
27b35d84cc
Merge pull request #13652 from r3tk0n/16206-flying-settings 
MS16206 - Enable flight by default in desktop, controls menu changes re: flying
 2018-07-23 15:19:46 -07:00
MuteTab
52e5bdb360 Added _aboutToQuit guard on eventFilter() 2018-07-23 14:27:38 -07:00
luiscuenca
2adb334034 unused code deleted 2018-07-23 14:25:30 -07:00
Alexander Ivash
fd7fb424f5 apply updated image from Mukul 2018-07-23 23:48:06 +03:00
sabrina-shanman
a3560d1a1b Remove wrong template from RigidBodyResultCallback function definitions 2018-07-23 13:47:02 -07:00
sabrina-shanman
66f355e5ba Move bullet callbacks for collision picks to source file 2018-07-23 13:33:16 -07:00
sabrina-shanman
ca30bb59af Remove unused Bullet callbacks for collision picking 2018-07-23 13:25:09 -07:00
Alexander Ivash
e12569c747 FB16992 - Layout changes to the two lightboxes in the Avatar app 2018-07-23 23:24:17 +03:00
luiscuenca
9d2d7c3aa4 Redesign and enable hand's Pole Vectors for elbow simulation 2018-07-23 13:16:11 -07:00
sabrina-shanman
7f743de150 Fix CollisionRegion serialization/deserialization issues and CollisionPick implicit cast warning 2018-07-23 12:59:23 -07:00
Alexander Ivash
091de4a9b5 Avatarapp: hover animate 'get more avatars' 2018-07-23 22:33:47 +03:00
Alexander Ivash
33c858774b fix coding standard compliance 2018-07-23 21:01:43 +03:00
Seth Alves
ae83c33621
Merge pull request #13646 from sethalves/put-back-old-style-attachment-dialog-master 
put back old-style avatar-attachments menu-item
 2018-07-23 10:25:23 -07:00
amantley
b9701d2b7a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-07-23 09:53:42 -07:00
r3tk0n
bc91affa70 Bring this PR inline with RC70.1 PR. 2018-07-20 15:13:44 -07:00
amantley
962f3c6c53 added a placeholder for the animation stack stats that will be added 2018-07-20 14:16:20 -07:00
SamGondelman
763e6465a2 followNormal, fixin stuff 2018-07-20 10:41:24 -07:00
Alexander Ivash
f5717b7648 add check for SELF_ID 2018-07-20 19:33:16 +03:00
Alexander Ivash
849c91d8f6 remove not necessary EntityTreeRenderer from removeAvatarEntities's condition 2018-07-20 19:32:58 +03:00
r3tk0n
3108d650de
Restore original menu string for flying 
Restore the original menu string for flying as it apparently *does* effect jumping.
 2018-07-20 08:29:11 -07:00
Cristian Luis Duarte
9bb4bada8a Merge remote-tracking branch 'hifi/master' into android_loading_stuck 2018-07-19 21:45:03 -03:00
Cristian Luis Duarte
eb5cc00fff newlines 2018-07-19 21:24:29 -03:00
Alexander Ivash
fb8640de47 FB16870: Avatar Wearables showing incorrect number 2018-07-20 02:51:17 +03:00
Cristian Luis Duarte
6d239f40fb Android - Freeze at startup problem - remove logs 2018-07-19 20:47:05 -03:00
Ryan Huffman
1f259d235d Fix computePickRay when in mirror mode 
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
 2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6 Merge remote-tracking branch 'upstream/master' into parabolic 2018-07-19 15:23:25 -07:00
MuteTab
dfcf47e8ee Removed useless comment. 2018-07-19 14:44:32 -07:00
MuteTab
8d65e14193 Remove one change, turned out to be unnecessary. 2018-07-19 14:43:46 -07:00
MuteTab
3080539b63 Make getFlyingEnabled() always true when in desktop. 2018-07-19 14:40:20 -07:00
MuteTab
97e5d65592 Added conditional check for VR vs non-VR menu. 2018-07-19 14:30:06 -07:00
MuteTab
b70b424447 Added new menu classification for VR vs non-VR movement. 2018-07-19 14:27:49 -07:00
Qliemillar
e779e42d90
Merge pull request #13635 from NissimHadar/bug16645 
Fix for bug16645 "disturbing flash when adding an overlay (even when everything is cached)"
 2018-07-19 14:43:04 -06:00
David Rowe
a3e677e64f Code review 2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd Re-added missing semi-colon. 2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da Add first-run checks for flying settings. 2018-07-19 12:41:24 -07:00
SamGondelman
39fa3420ec pointer rendering, update teleport.js 2018-07-19 12:02:39 -07:00
Brad Davis
63fa54ceda Fix for audio continuing on destroyed Web 3D overlays 2018-07-19 11:50:18 -07:00
Seth Alves
965c35292c put back old-style avatar-attachments menu-item 2018-07-19 11:32:19 -07:00
Qliemillar
566c837bba
Merge pull request #13631 from ElderOrb/avatarapp-combobox-fix 
fix 'the drop down does not shows the wearable'
 2018-07-19 12:23:48 -06:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8 Fix HMD.mountedChanged() API signal 2018-07-19 13:00:57 +12:00
NissimHadar
4c0b7ca24c Updated per Samuel's/Austin's comments. 2018-07-18 17:30:46 -07:00
Wayne Chen
37131d75e9
Merge pull request #13629 from wayne-chen/loginDialogBrowser-case-16537 
MS16537: Updating "Forgot Username/Forgot Password" behavior
 2018-07-18 16:32:55 -07:00
NissimHadar
a882931c6b Only show overlay if textures have loaded 2018-07-18 15:02:02 -07:00
David Rowe
835fb927b7 Merge branch 'master' into 21899 2018-07-19 09:34:37 +12:00
David Rowe
396382afd7 Fill in Audio API JSDoc 2018-07-19 09:31:48 +12:00
NissimHadar
99b95acada Merge branch 'master' of github.com:highfidelity/hifi into bug16645 2018-07-18 13:56:12 -07:00
NissimHadar
446ef97fc5 Only show overlay if textures have loaded 2018-07-18 13:54:03 -07:00
howard-stearns
0a47672d64 machinery for fetching next page of inifinite scroll before it really 
needed, and use in our infinite scrolls
 2018-07-18 13:00:03 -07:00
Alexander Ivash
fe96ad2389 fix 'the drop down does not shows the wearable' 2018-07-18 21:16:47 +03:00
Wayne Chen
0cbcae9181 reverting onLinkActivated brackets 2018-07-18 10:44:37 -07:00
Howard Stearns
db212a0c99
Merge pull request #13625 from zfox23/MS16802_openGlyph 
Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button
 2018-07-18 10:12:47 -07:00
Wayne Chen
c104e95ef4 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-18 09:06:22 -07:00
Zach Fox
919bfce7ab Simplify 2018-07-18 09:00:01 -07:00
Qliemillar
080d664341
Merge pull request #13619 from luiscuenca/handTouchDisabler 
Allow creators to disable hand touch from javascript
 2018-07-18 08:16:37 -06:00
luiscuenca
e3594fe1b7 mutex added 2018-07-17 17:23:03 -07:00
Wayne Chen
3b7f88a4a8 Merge branch 'master' of https://github.com/highfidelity/hifi into loginDialogBrowser-case-16537 2018-07-17 17:08:43 -07:00
luiscuenca
ba884f8a94 Forgotten coment 2018-07-17 16:42:59 -07:00
luiscuenca
6225435385 some ortographic fixes 2018-07-17 16:38:34 -07:00
luiscuenca
fcb7614f7e Format and fixes 2018-07-17 16:34:30 -07:00
Zach Fox
ef4265de4b Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button 2018-07-17 16:16:43 -07:00
SamGondelman
86c56195d3 refactoring common path pointer functionality 2018-07-17 16:15:20 -07:00
SamGondelman
845ddda695 parabola-overlay and -avatar intersection, handle case where acceleration == 0 2018-07-17 12:41:03 -07:00
Cristian Luis Duarte
c664ce7671 Android - bypass settings reset dialog with cli option 2018-07-17 15:05:56 -03:00
Qliemillar
d498d6bb3d
Merge pull request #13617 from amantley/rotateRecenter 
Reduce Frequent Flipping of Avatar Facing Direction By Resetting _headControllerFacingMovingAverage
 2018-07-17 08:57:24 -06:00
luiscuenca
82a3b73de8 Added disable hand touch for entityID 2018-07-17 07:06:48 -07:00
luiscuenca
84dac94379 Allow creator to disable hand touch 2018-07-16 17:03:50 -07:00
Zach Fox
7cdb84ee68
Merge pull request #13602 from zfox23/MS16562_massivePalSpeedup 
Fix MS16562: Massive PAL speedup!
 2018-07-16 16:45:01 -07:00
amantley
abb2c7ef14 Added reset of the _headControllerFacingMovingAverage in MyAvatar.cpp prePhysicsUpdate(). This stops some of the flipping back and forth that has been happening with rotational recenter. 2018-07-16 11:29:49 -07:00
Zach Fox
ac2351e49f Make JSDoc happy 2018-07-16 11:00:27 -07:00
Cristian Luis Duarte
f9baeaf151 Android - logs during startup - weirdly did not get stuck during tests 2018-07-16 12:28:44 -03:00
David Rowe
806228299e Stub out Audio JSDoc 2018-07-15 10:31:48 +12:00
Zach Fox
4daa0c6537 CR feedback 2018-07-13 12:47:45 -07:00
John Conklin II
33fb759c0a
Merge pull request #13599 from danteruiz/fix-combobox 
fixing combo boxes
 2018-07-13 10:33:33 -07:00
Zach Fox
5e2074c06a
Merge pull request #13603 from zfox23/MS16701_uninstallFirst 
Fix MS16701: Uninstall installed app before updating
 2018-07-13 10:18:16 -07:00
Zach Fox
2da911ad84 Merge branch 'master' of github.com:highfidelity/hifi into MS16562_massivePalSpeedup 2018-07-13 09:47:49 -07:00
Seth Alves
5085112722
Merge pull request #13594 from ctrlaltdavid/21677-a 
Remove deprecated Window.raiseMainWindow API function
 2018-07-12 19:48:33 -07:00
Zach Fox
04f856019d Fix MS16701: Uninstall installed app before updating 2018-07-12 16:27:19 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg 
Android - Prevent pending downloads to happen when going back to home
 2018-07-12 15:22:56 -07:00
Zach Fox
92756d81ad Implement MS16562: Massive PAL speedup! 2018-07-12 15:05:31 -07:00
Wayne Chen
089831b6ee Adding potential fix 2018-07-12 14:15:16 -07:00
Dante Ruiz
1c64ebc3ca fixing combo boxes 2018-07-12 13:57:48 -07:00
Sam Gondelman
2597568a0a
Merge pull request #13591 from Cristo86/android_revert_pr12888_qmls 
Rollback PR 12888 by deleting alternative +android files
 2018-07-12 12:06:35 -07:00
Zach Fox
f57fe892c3
Merge pull request #13590 from zfox23/MS16615_openFromPurchases 
Fix MS16615: Don't early-remove .app.json we JUST installed
 2018-07-12 11:51:52 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale 
Render Scale Resolution applied only to 3D rendering not HUD
 2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539 
MS9539: Update Controls Reference pages
 2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac 
Add Crashpad to Mac
 2018-07-11 19:16:24 -07:00
David Rowe
46c9853152 Remove deprecated Window.raiseMainWindow API function 2018-07-12 14:04:08 +12:00
Cristian Luis Duarte
b1d39e4959 Rollback PR 12888 by deleting alternative +android files 2018-07-11 21:21:12 -03:00
Zach Fox
bf4954d667 Fix MS16615: Don't early-remove .app.json we JUST installed 2018-07-11 15:27:43 -07:00
Wayne Chen
cea2b94d2b removing debug print statements 2018-07-11 11:58:17 -07:00
Wayne Chen
179ba6506e Adding check for WindowsMR to the showHelp menu 2018-07-11 11:56:14 -07:00
Wayne Chen
f7e906440f Merge branch 'master' of https://github.com/highfidelity/hifi into updateControlsReference-case-9539 2018-07-11 11:20:10 -07:00
Sam Gateau
54d2f42fa4
Merge pull request #13544 from Zvork/haze 
Fix haze on Mac (bug #15515)
 2018-07-11 20:04:22 +02:00
Olivier Prat
703fc20856 Separate scale between 3D rendering and HUD 2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85 Not using render resolution scale in application and display plugin 2018-07-11 10:11:49 +02:00
Clement
85f56e2aa7 Remove Mac domain exception 2018-07-10 17:41:07 -07:00
Wayne Chen
81aac274ed Updating controls reference page 2018-07-10 17:34:03 -07:00
Clement
b5252da3f2 CR 2018-07-10 16:53:11 -07:00
Zach Fox
d3c0236602 Merge branch 'master' of github.com:highfidelity/hifi into MS16480_disableOverlays 2018-07-10 15:02:05 -07:00
howard-stearns
8b713a437f don't store undefined in a qml int. 2018-07-10 12:14:31 -07:00
howard-stearns
886df959d1 expose totalPages and totalEntries, and use the later to display 
connections count
 2018-07-10 11:26:23 -07:00
SamGondelman
d2699e8e5b some more attempted cleanup 2018-07-10 10:50:01 -07:00
Anthony Thibault
1d33f51ca4
Merge pull request #13528 from amantley/integratedStepping 
Step Detection From Head and Hands Tracking
 2018-07-10 09:59:22 -07:00
Wayne Chen
8f23fb01a4 removing unused variables 2018-07-10 07:30:02 -07:00
Wayne Chen
bf5cdb0e5f removing unused variables from lambda capture expressions 2018-07-09 22:31:49 -07:00
John Conklin II
81f5631ce9
Merge pull request #13386 from ElderOrb/FB13949 
AvatarApp
 2018-07-09 15:20:18 -07:00
amantley
cb421fd5b0 fixed build errors for mac and linux 2018-07-09 15:09:45 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00
amantley
55ae08c071 Merge remote-tracking branch 'upstream/master' into integratedStepping 2018-07-09 13:55:59 -07:00
amantley
b2d77ef51a bracket spacing 2018-07-09 13:54:18 -07:00
amantley
7ed8f17b57 tweaked posterior threshold and head velocity threshold 2018-07-09 13:49:21 -07:00
amantley
a3417cace9 implemented code review changes. 1. checking for divide by zero before glm::normalize. 2. clearing the ring buffer on reset. 3. renaming _standingHeightMode to _currentStandingHeight 2018-07-09 11:58:02 -07:00
Zach Fox
01eb3eddab Fix MS16480: Disable active ContextOverlays when disabling ContextOverlayInterface 2018-07-09 10:49:11 -07:00
David Back
d4f43a56f2
Merge pull request #13556 from dback2/deselectInput 
Change deselecting entities to Ctrl + D and prevent W/A/S/D/E/Q movements with Ctrl
 2018-07-09 10:40:33 -07:00
John Conklin II
e6801c303a
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request 
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
 2018-07-09 10:07:19 -07:00
Clement
1aeb66f70f Fix Windows warning 2018-07-06 18:17:17 -07:00
amantley
defd6f88e6 started changes suggested by code review, ie mode computation 2018-07-06 18:17:13 -07:00
Clement
c02366a811 Fix android build failure 2018-07-06 17:17:40 -07:00
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