26668 commits

Author	SHA1	Message	Date
Wayne Chen	aa62a89318	removing more logging for login dialog	2018-09-11 09:49:12 -07:00
Wayne Chen	9d7ba377ca	removing logging for login dialog	2018-09-11 09:42:53 -07:00
Wayne Chen	ee516fd79f	adding proper checking for saved username/login	2018-09-11 09:36:46 -07:00
Wayne Chen	6bcf6eaae7	Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch	2018-09-11 09:13:41 -07:00
Wayne Chen	565bf7f6bd	adding correct implementation of show password	2018-09-11 09:08:35 -07:00
Wayne Chen	030ee13f31	removing logging from tabletlogindialog	2018-09-10 23:05:31 -07:00
Wayne Chen	69ae475787	adding user activity logging	2018-09-10 23:04:50 -07:00
Wayne Chen	5ece8d8707	using different paradigm for checking login dialog popup	2018-09-10 18:32:21 -07:00
Wayne Chen	dcacfdba7c	adding popup property to qml	2018-09-10 16:22:55 -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
Wayne Chen	e7616c7d34	added logging + activity logging	2018-09-10 15:06:14 -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
Wayne Chen	e721844b10	Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch	2018-09-10 10:10:16 -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	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
Wayne Chen	695f6a8f16	Merging changes, modifying close button	2018-09-07 12:05:28 -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
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
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
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
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