3943 commits

Author	SHA1	Message	Date
Wayne Chen	695f6a8f16	Merging changes, modifying close button	2018-09-07 12:05:28 -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
Wayne Chen	e1541fd7e0	Merge branch 'master' of https://github.com/wayne-chen/hifi into loginOnLaunch	2018-09-07 08:43:42 -07: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
Wayne Chen	e76ebf7a0b	changing location of shortcuts	2018-09-06 17:29:16 -07:00
Alexia Mandeville	8e5f5cc796	Moving forgotten links	2018-09-06 16:16:43 -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
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
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
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
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
Alexia Mandeville	901de120a6	Removing flavortext	2018-09-05 17:20:49 -07:00
Alexia Mandeville	1e697ad45f	Removing labels, adding flavor text, moving links	2018-09-05 16:25:18 -07:00
David Kelly	b022697dfa	volume slider on users fixed	2018-09-05 15:36:07 -07:00
Alexia Mandeville	dcf2e00bd7	Adding placeholder text	2018-09-05 14:55:12 -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
Sam Gateau	9e2a540bab	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-30 12:12:24 -07:00
Sam Gateau	12ec56875e	Merge pull request #13867 from SamGondelman/recurse ... findRayIntersection/findParabolaIntersection performance improvements	2018-08-30 09:49:16 -07:00
Sam Gateau	349f782697	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-29 16:07:50 -07:00
Zach Fox	67e57a9487	Merge pull request #13849 from zfox23/MS16003_backCloses ... Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back	2018-08-29 14:29:12 -07:00
SamGondelman	0c8a4cc81e	merge with master	2018-08-28 17:31:51 -07:00
Thijs Wenker	c4d43b3fbc	CR fixes	2018-08-28 19:43:59 +02:00
Thijs Wenker	c05fe7f0b7	Merge branch 'master' of github.com:highfidelity/hifi into fix/interactiveWindows/onlyOnTopWhileMainWindowActive	2018-08-28 00:00:44 +02:00
Thijs Wenker	efa3fa7907	Don't always on top InteractiveWindows (Windows OS)	2018-08-27 20:42:06 +02:00
Sam Gateau	8f8bcc1901	Merge branch 'master' of github.com:highfidelity/hifi into black	2018-08-24 15:23:37 -07:00
John Conklin II	477fba4b15	Merge pull request #13847 from AndrewMeadows/workload-avatars-002 ... workload tracks other avatars and adds/removes from physics simulation accordingly	2018-08-24 12:43:51 -07:00
SamGondelman	3d048c77ba	Merge remote-tracking branch 'upstream/master' into recurse	2018-08-24 11:39:05 -07:00
Sam Gateau	699240027e	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2018-08-23 19:29:14 -07:00
SamGondelman	b5b7167644	add to stats	2018-08-23 17:56:24 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00
Zach Fox	a1d88a8588	Merge howard/wallet-locker2 into my branch	2018-08-23 14:45:16 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Sam Gateau	473f8d0ca5	Working on the LOD system	2018-08-23 11:39:47 -07:00
John Conklin II	32562511e8	Merge pull request #13782 from ElderOrb/FB17184 ... Add Support for Managing Avatar Entities to the Avatar App	2018-08-22 10:20:04 -07:00
Alexander Ivash	cfb820762d	bulk adjusting to coding guidelines	2018-08-22 00:42:01 +03:00
Zach Fox	a378435683	Fix MS16003: In PAL/GoTo WebView, 'BACK' closes app when you can't go back	2018-08-21 10:20:51 -07:00
Alexander Ivash	9f92ff5de9	fix for duplicating wearables on saving ... note: the issue was caused by newly-introduced code converting between attachments & entities fix removes attachments-related code because attachments are deprecated and converted into entities on the fly	2018-08-18 16:38:35 +03:00
Alexander Ivash	3bcd6f4a25	take 'relayParentJoints' into account during wearables comparison	2018-08-18 16:33:30 +03:00
Alexander Ivash	877bce23d2	explicitely specify localRotations on joint change, otherwise it will be updated by engine	2018-08-18 16:32:31 +03:00