Dante Ruiz
de5a0a714b
handle unable to connect to domain case
2018-09-10 16:25:17 -07:00
Wayne Chen
dcacfdba7c
adding popup property to qml
2018-09-10 16:22:55 -07:00
SamGondelman
0e079e78e6
correct transparent parabola shader
2018-09-10 16:20:50 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
Brad Davis
ba1ac7c180
Ensure a web overlay doesn't access an invalid tabletScriptingInterface
2018-09-10 15:07:15 -07:00
Wayne Chen
e7616c7d34
added logging + activity logging
2018-09-10 15:06:14 -07:00
luiscuenca
6f4e9ded09
Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip
2018-09-10 14:42:02 -07:00
sabrina-shanman
9a86b7451b
Add collision group parameter to collision pick and set my avatar as the default
2018-09-10 14:35:04 -07:00
Anthony Thibault
4754ff7f54
Merge pull request #13963 from hyperlogic/feature/improve-jump-anims
...
Improve animations for jump, inAir and less feminine walk cycle
2018-09-10 13:57:33 -07:00
John Conklin II
9c546fc780
Merge pull request #13957 from ElderOrb/FB18024
...
fix keyboard collapsing in VR/goto
2018-09-10 13:09:28 -07:00
Wayne Chen
a8adaff6c1
Merge branch 'loginOnLaunch' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-10 11:36:53 -07:00
Wayne Chen
ff86e480ba
adding debug statement to check for window close
2018-09-10 11:36:45 -07:00
Seth Alves
cb33222fea
Merge pull request #13886 from ctrlaltdavid/M17901
...
Improve HMD Menu page navigation
2018-09-10 11:34:21 -07:00
Anthony Thibault
d9beadb7e4
remove tabs from avatar-animation.json
2018-09-10 10:49:43 -07:00
Simon Walton
d12376187c
Merge branch 'master' into avatar-mixer-scaling
2018-09-10 10:15:49 -07:00
Wayne Chen
e721844b10
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-10 10:10:16 -07:00
luiscuenca
a9f676354b
Only invisible pointers and scale fix
2018-09-10 08:54:53 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod
...
Enable LOD manager on android
2018-09-08 13:43:36 -07:00
Anthony Thibault
ff645be78b
Update animations for jump, inAir and less feminine walk cycle
2018-09-07 17:09:55 -07:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
Stephen Birarda
be57789ad8
Merge pull request #13931 from SimonWalton-HiFi/safe-landing-cleanup
...
Remove some debug logging left in the safe landing module
2018-09-07 14:58:00 -07:00
John Conklin II
472675f9a8
Merge pull request #13956 from hyperlogic/feature/improve-anim-stats
...
Move animation stats into its own Menu
2018-09-07 14:51:46 -07:00
luiscuenca
d09391faa5
Fix invisible error
2018-09-07 12:17:40 -07:00
Wayne Chen
695f6a8f16
Merging changes, modifying close button
2018-09-07 12:05:28 -07:00
luiscuenca
02065518cb
Merge branch 'master' of https://github.com/highfidelity/hifi into stt_teleport_wip
2018-09-07 11:57:48 -07:00
John Conklin II
405e2da91e
Merge pull request #13949 from sabrina-shanman/stt_parenting_scale
...
Scale Collision Pick to match parent
2018-09-07 11:54:02 -07:00
John Conklin II
2ac0377a6e
Merge pull request #13952 from amantley/steppingReboot
...
Fix for lurching walk(case 16945), when walking in hmd.
2018-09-07 11:43:03 -07:00
Wayne Chen
39041f2942
fixing username field
2018-09-07 11:36:21 -07:00
Wayne Chen
44d36ec622
wallet should save username when checked
2018-09-07 11:31:36 -07:00
Wayne Chen
db96603cda
removing some unused properties
2018-09-07 11:23:58 -07:00
Wayne Chen
d9495275cc
adding cancel button and signed in checkbox
2018-09-07 11:22:31 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod
2018-09-07 10:01:26 -07:00
Simon Walton
741d4ba998
Merge branch 'master' into avatar-mixer-scaling
2018-09-07 09:30:39 -07:00
sabrina-shanman
8d4c47cf8e
Make template specialization of BaseNestableTransformNode explicit
2018-09-07 08:49:44 -07:00
Wayne Chen
e1541fd7e0
Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch
2018-09-07 08:43:42 -07:00
Alexander Ivash
7058b07aea
FB18024: 2 users report that while in VR and in GoTo menu, keyboard is unable to be minimized
2018-09-07 12:41:39 +03:00
Alexia Mandeville
190a335c71
Adding more margin to forgotten links
2018-09-07 00:01:00 -07:00
Alexia Mandeville
92f218ae29
Adding margins to forgotten link text
2018-09-06 22:59:19 -07:00
Alexia Mandeville
2443723a2b
Removing margins, adding width attribute
2018-09-06 21:14:04 -07:00
Anthony Thibault
6508533a15
Remove anim stats from plain ole stats.
...
There are still present in anim stats tho.
2018-09-06 17:58:40 -07:00
Wayne Chen
72818f3729
Merge branch 'master' of https://github.com/highfidelity/hifi into interstitalMerged
2018-09-06 17:37:36 -07:00
Wayne Chen
ef3449f96d
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
2018-09-06 17:36:47 -07:00
sabrina-shanman
7a9480723e
Remove unused variable in PickScriptingInterface::createTransformNode
2018-09-06 17:30:29 -07:00
Wayne Chen
e76ebf7a0b
changing location of shortcuts
2018-09-06 17:29:16 -07:00
Dante Ruiz
2f9119529a
editing the interstitial page
2018-09-06 17:06:17 -07:00
SamGondelman
ed7f993c0d
avatar mixer and manager perf improvements and cleanup
2018-09-06 16:57:20 -07:00
sabrina-shanman
23a6abbaca
Update jsdocs to reflect new collision pick scaling behavior
2018-09-06 16:47:09 -07:00
sabrina-shanman
836f810c41
Have OverlayTransformNode and similar define scale relative to nestable scale on creation time, and refactor code
2018-09-06 16:33:29 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Alexia Mandeville
8e5f5cc796
Moving forgotten links
2018-09-06 16:16:43 -07:00
Zach Fox
0e785f9bdb
Fix MS17877: Persist Connections table sort choice
2018-09-06 15:35:26 -07:00
John Conklin II
7bbedf65c7
Merge pull request #13950 from sethalves/overlay-set-name-crash
...
fix a crash related to setting an overlay's name
2018-09-06 14:28:11 -07:00
Alexia Mandeville
aabfda6eb5
Adding descriptive text
2018-09-06 14:16:42 -07:00
Alexia Mandeville
00e10ad684
Updating sign up text, moving forgotten info links
2018-09-06 14:05:51 -07:00
Gabriel Calero
2d2a4804f7
Add android settings screen. Add AEC setting
2018-09-06 17:49:52 -03:00
amantley
90a51e6181
added walk velocity threshold, this determines if we are in the walk state. when we are then we don't do cg leaning calculation. this will smooth out the walking in a large tracked area
2018-09-06 13:12:48 -07:00
John Conklin II
152ec3d631
Merge pull request #13945 from davidkelly/dk/17915
...
volume slider on individual users in PAL remembers setting now
2018-09-06 12:55:46 -07:00
sabrina-shanman
714cfc5ef1
Add scaling information to CollisionRegion jsdoc and missing info to CollisionPickProperties jsdoc
2018-09-06 12:14:50 -07:00
sabrina-shanman
727b62144f
Fix MyAvatarHeadTransformNode not using avatar scale
2018-09-06 12:03:13 -07:00
Wayne Chen
a5038850f1
right align forgot user/pw shortcuts
2018-09-06 11:37:35 -07:00
Wayne Chen
385027321b
fixing the eye open/closed pw image
2018-09-06 11:18:35 -07:00
Dante Ruiz
ec2d89fd25
fixing toolbar disappering
2018-09-06 11:16:58 -07:00
sabrina-shanman
7839ba42db
Make the Collision Pick threshold scale with the largest dimension of the parent
2018-09-06 11:02:07 -07:00
sabrina-shanman
3f7a7fb11a
Return early from AvatarTransformNode and similar when getTransform fails
2018-09-06 10:29:01 -07:00
sabrina-shanman
e8ea95e375
Use elseifs in PickScriptingInterface::createTransformNode
2018-09-06 10:21:48 -07:00
sabrina-shanman
390e89a64d
Fix missing NestableTransformNode import
2018-09-06 10:20:26 -07:00
Ryan Huffman
80b5f90160
Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive
...
MS17463: only show InteractiveWindow on top of interface window
2018-09-06 10:15:20 -07:00
sabrina-shanman
f7226757ad
Just import TransformNode in AvatarTransformNode.h and similar
2018-09-06 10:03:05 -07:00
Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Seth Alves
042044ceaf
dammit
2018-09-06 09:38:12 -07:00
Seth Alves
5a0a259c21
dammit
2018-09-06 09:37:01 -07:00
Seth Alves
69ae04ab09
protect Base3DOverlay::_name with a mutex
2018-09-06 09:03:28 -07:00
Brad Davis
105a615745
Fix no-ui crashes
2018-09-06 08:59:05 -07:00
Wayne Chen
3f1eba418d
modifying location of links for user/pw
2018-09-06 00:07:23 -07:00
Wayne Chen
6d055ba136
changing sign up label
2018-09-05 23:49:49 -07:00
Wayne Chen
78fa52285f
adding show password toggle in textfield
2018-09-05 23:48:21 -07:00
Wayne Chen
7a136812bf
Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch
2018-09-05 20:05:19 -07:00
Wayne Chen
581aa0c02d
Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch
2018-09-05 20:04:34 -07:00
David Rowe
ab47e16be1
Fix up titles and leading white space of some dev menu tablet dialogs
2018-09-06 14:35:08 +12:00
David Rowe
8420afd143
Fix title not not going back to "Settings" upon Save or Cancel
2018-09-06 14:00:33 +12:00
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
amantley
6fb335429d
starting to re-implement the walking state detection for smoothwalking
2018-09-05 17:55:27 -07:00
Alexia Mandeville
901de120a6
Removing flavortext
2018-09-05 17:20:49 -07:00
luiscuenca
abb632afda
Update capsule when scale/load and teleport without safe landing
2018-09-05 16:51:34 -07:00
sabrina-shanman
84a2512f31
Fix collision pick scale not being used
2018-09-05 16:51:27 -07:00
sabrina-shanman
e8ce152687
Scale collision picks relative to parent by adding and using more
...
specialized transform nodes.
2018-09-05 16:51:28 -07:00
Alexia Mandeville
1e697ad45f
Removing labels, adding flavor text, moving links
2018-09-05 16:25:18 -07:00
David Rowe
a7099025dc
Fix up some Settings dialogs' titles
2018-09-06 11:15:14 +12:00
David Rowe
960bf00e12
Modify look of HMD mode Settings dialogs' titles
2018-09-06 11:02:24 +12:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black
...
Improving the LOD manager behavior for better scaling
2018-09-05 16:01:09 -07:00
David Kelly
b022697dfa
volume slider on users fixed
2018-09-05 15:36:07 -07:00
David Rowe
398724de73
Make Save in HMD settings dialogs return to previous dialog
...
Same as Cancel key does.
2018-09-06 10:23:45 +12:00
Alexia Mandeville
dcf2e00bd7
Adding placeholder text
2018-09-05 14:55:12 -07:00
amantley
73e628bb8d
merge with master fixes
2018-09-05 14:42:49 -07:00
David Rowe
097b4c177a
Merge branch 'master' into M17901
2018-09-06 09:30:10 +12:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
...
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Wayne Chen
841080ea72
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-05 11:54:21 -07:00
Wayne Chen
77bb6fa4d5
adding position to try again zone; updating whitespace
2018-09-05 11:53:49 -07:00
Sam Gateau
2ced6d9681
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 11:35:59 -07:00
Anthony Thibault
584d39744f
Merge pull request #13918 from hyperlogic/bug-fix/avatars-with-no-eyes-in-hmd-mode
...
HMD mode bug fix for avatars with no eyes
2018-09-05 10:57:21 -07:00
Seth Alves
1bea6c9ea3
if not already logged in, show login dialog at launch-time rather than connect-to-domain-time
2018-09-05 10:38:12 -07:00
Wayne Chen
c6229c5c60
updating serverless file to have dynamic oops
2018-09-05 10:37:45 -07:00
Wayne Chen
179138aa10
updating serverless file to have dynamic oops
2018-09-05 10:36:06 -07:00
Andrew Meadows
4a1bd98584
Merge pull request #13914 from SamGondelman/avatarmanager
...
Miscellaneous low-level performance improvements
2018-09-05 10:12:05 -07:00
Wayne Chen
ebedbabace
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-05 09:06:36 -07:00
Wayne Chen
f38a26a1ff
updating location of oops dialog script
2018-09-05 09:04:17 -07:00
Sam Gateau
d2dcf6a3eb
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-09-05 08:40:30 -07:00
Thijs Wenker
62d4b1805d
Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive
2018-09-05 17:25:14 +02:00
Wayne Chen
d6442b350c
updating redirect to the interstitial page url
...
TODO: Fix this link to s3 bucket hosted file
2018-09-04 23:18:57 -07:00
Wayne Chen
62abb51b26
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-04 23:18:06 -07:00
Wayne Chen
afd7321e7f
updating redirect with proper fbx
...
TODO: fix path when uploaded the fbx files
2018-09-04 23:16:59 -07:00
Wayne Chen
8b6c21e0bb
updating script path
...
TODO: will fix with s3 hosted script
2018-09-04 22:19:20 -07:00
Wayne Chen
7721cba483
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into interstitalMerged
2018-09-04 22:18:16 -07:00
Wayne Chen
af1c473a9c
updating with models in meshes folder
2018-09-04 22:17:33 -07:00
Wayne Chen
1ce6c84c08
updating metacall for loadServerlessDomain
2018-09-04 18:24:49 -07:00
Wayne Chen
2e17140c07
fixing loadServerlessDomain function to be from 404 redirect
2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4
merging with dante's PR
2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1
adding property to location, updating domain
2018-09-04 17:46:23 -07:00
Simon Walton
262dbaf5ed
Merge commit 'ade58a52cc97fe06c2f4bb88c4b9d097636fd4b9' into avatar-mixer-scaling
2018-09-04 15:27:41 -07:00
Simon Walton
695fabf4f5
Merge commit 'd01b438cb320a7ccc0aa8a0085e86940bb73c09c' into avatar-mixer-scaling
2018-09-04 15:27:18 -07:00
Simon Walton
6ae2ca1576
Merge commit '5f08ed5027a8904242a47b17e994ab4f309e3930' into avatar-mixer-scaling
...
Merge of Samuel's change to use simple sort instead of priority queue
2018-09-04 15:26:26 -07:00
Wayne Chen
002c6547ee
entity script URL update
2018-09-04 14:08:13 -07:00
Wayne Chen
22a8164401
adding back refusal notifications + domain bounds/floor
2018-09-04 13:53:03 -07:00
Anthony Thibault
b21fa1037f
Code review feedback and bug fixes for calibraiton matrices
2018-09-04 11:55:52 -07:00
SamGondelman
ade58a52cc
reserve priority sort util vectors
2018-09-04 11:21:43 -07:00
Wayne Chen
a7abebd7aa
adding redirect json to post build in Mac
2018-09-04 11:11:34 -07:00
Simon Walton
fff6a10bcd
Remove some debug logging from safe landing additions
2018-09-04 10:58:40 -07:00
Anthony Thibault
3a034fdf66
HMD mode bug fix for avatars with no eyes
...
Previously getCenterEyeCalibrationMat() would return the average eye position for an avatar, if the eyes are missing.
Now we fall back to using the HeadCalibrationMat() and adding an offset from the head to the center of the eyes.
This is more accurate for characters that don't quite have human proportions.
2018-09-04 10:13:57 -07:00
Zach Fox
24cf4adb44
Fix MS17902: Prevent case where My Purchases says Open instead of Uninstall
2018-09-04 09:08:42 -07:00
Wayne Chen
c95cb97b9b
adding working version with networking signals
2018-08-31 19:29:48 -07:00
Sam Gateau
bd9136812d
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-31 17:53:49 -07:00
Stephen Birarda
20912349a4
cycle avatar entity IDs for new avatar mixer
2018-08-31 16:53:58 -07:00
Sam Gondelman
7cdc7dcc66
Merge pull request #13873 from sabrina-shanman/stt_parenting
...
Collision Pick Parenting
2018-08-31 14:43:55 -07:00
sam gateau
5067047e52
warnings on ubuntu
2018-08-31 14:24:52 -07:00
sam gateau
ec18806546
INtegrating in the algorithm, not in the public values the overshoot for the target FPS to make it simpler to understand
2018-08-31 12:15:28 -07:00
SamGondelman
d01b438cb3
CR
2018-08-31 11:25:17 -07:00
sabrina-shanman
62344c106d
Make render states a map when returned from PointerScriptingInterface::getPointerProperties
2018-08-31 11:19:53 -07:00
sam gateau
84ad5c79f9
fixing a no op
2018-08-31 11:09:16 -07:00
sabrina-shanman
2e290ea798
Only create a NestableTransformNode if the spatially nestable exists
2018-08-31 10:52:00 -07:00
sabrina-shanman
f71fc83309
Remove PickResult::needsToCompareResults
2018-08-31 10:48:48 -07:00
sabrina-shanman
4d85cb17f3
Include full transform in CollisionPick::getResultTransform
2018-08-31 10:46:17 -07:00
sabrina-shanman
9bf088d32b
Just assign mathPick.loaded in CollisionPick::getMathematicalPick
2018-08-31 10:28:45 -07:00
sam gateau
6bd1ab5ae0
fixing a bad constant
2018-08-31 09:18:33 -07:00
sabrina-shanman
e94d7de99a
Add JS API hook for getting overlay IDs from a pointer via
...
Pointer.getPointerProperties
2018-08-31 09:18:07 -07:00
sam gateau
262fdb3c28
ardressing coding standard
2018-08-31 09:09:22 -07:00
sam gateau
eb5f6c8eb3
ardressing coding standard
2018-08-31 09:07:34 -07:00
Wayne Chen
b6d23843dd
adding fix to domain redirection URL
2018-08-30 22:32:02 -07:00
Sam Gateau
764f75c340
including review feedback
2018-08-30 22:26:45 -07:00
Sam Gateau
371105d0c4
Removing cruft and warnings
2018-08-30 22:18:34 -07:00
Sam Gateau
0ae18febc7
Removing cruft and warnings
2018-08-30 22:09:48 -07:00
