24552 commits

Author	SHA1	Message	Date
Zach Fox	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Sam Gondelman	d781cf43ee	Merge pull request #12775 from Cristo86/android_jump ... Android Control - jump and view sensitivity	2018-04-09 17:32:57 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
John Conklin II	890a63afb4	Merge pull request #12833 from ElderOrb/FB14015_RC66 ... Close 'goto' app on pressing 'forward' / 'backward' buttons	2018-04-09 11:42:17 -07:00
John Conklin II	be3d5d03cc	Merge pull request #12808 from ElderOrb/FB13962_RC66 ... Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)	2018-04-09 09:42:00 -07:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Cristian Luis Duarte	f556c8d3a7	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-06 18:02:30 -03:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -07:00
Cristian Luis Duarte	bd6f0fd59e	Make view/rotation control independent of touchUpdate events rate	2018-04-06 16:17:28 -03:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Alexander Ivash	557b7ded66	fix for closed query dialogs auto-reopening (FB13962 Import Entity URL Dialogue Box Will not Disappear) ... Signed-off-by: Alexander Ivash <elderorb@gmail.com>	2018-04-06 03:00:44 +03:00
Howard Stearns	ad191defb8	Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError ... Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 13:51:33 -07:00
Seth Alves	8de545acdf	add new address accessor for 'public' addresses, use it for snapshot and stream	2018-04-05 13:39:51 -07:00
Zach Fox	ac2721fe6a	Logging improvements	2018-04-05 13:04:09 -07:00
Zach Fox	8e46ebf83b	Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 11:27:26 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
Seth Alves	4b0d338e57	on first run, send user to serverless tutorial rather than checking for a local sandbox	2018-04-04 18:00:11 -07:00
Cristian Luis Duarte	1a967e45a6	Android View control - Remove limit, use a scale filter, remove deadZone to increase sensitivity	2018-04-04 21:54:12 -03:00
John Conklin II	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -07:00
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
John Conklin II	cba307f28b	Merge pull request #12762 from samcake/one ... Remove notifications and print outs when degrading LOD	2018-04-04 10:35:05 -07:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
Zach Fox	752246d950	Merge pull request #12760 from zfox23/inspection_rightClickTweaking ... Inspection: Tweak mouse-right-click-to-inspect behavior	2018-04-04 09:32:29 -07:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Cristian Luis Duarte	88c83f3bfe	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 19:59:21 -03:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
howard-stearns	01d90ea1a5	Introduce safeLoading.	2018-04-03 13:49:09 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
samcake	2dc4630e68	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-04-03 12:55:21 -07:00
Seth Alves	a1ce9481bb	Merge pull request #12739 from druiz17/fix-mapping-mistake ... map flying down back to C key	2018-04-03 12:39:46 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Cristian Luis Duarte	cbf13c9f8c	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 16:12:17 -03:00
Cristian Luis Duarte	1ea056a8a9	Android - Initial Jump button implementation	2018-04-03 16:07:40 -03:00
Alexander Ivash	ccea3efe1e	FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links	2018-04-03 21:43:40 +03:00
John Conklin II	53a5261905	Merge pull request #12712 from zfox23/newUpdateCertLocation ... Fix cert location for content sets; handle .content.zip content sets	2018-04-03 09:10:11 -07:00
samcake	5a1eac563b	Code review fixes	2018-04-02 15:50:18 -07:00
John Conklin II	9dcef996c5	Merge pull request #12684 from vladest/assetserver_wrong_dialog ... Fix invalid message if cancel adding asset to AssetServer	2018-04-02 15:28:46 -07:00
John Conklin II	74ca98dc81	Merge pull request #12727 from amantley/triggerRecenterBehaviour ... Trigger Avatar Recenter Behaviour	2018-04-02 14:42:21 -07:00
Zach Fox	1f3063193a	Tweak right-click to inspect	2018-04-02 14:24:51 -07:00
samcake	d4bc61fb3d	Remove notifications and print outs for LOD changes because it was too much noise	2018-04-02 13:53:30 -07:00
John Conklin II	796bd069b2	Merge pull request #12659 from alexiamandeville/script_charcontroller ... Updating char controller	2018-04-02 13:24:15 -07:00
Dante Ruiz	a9a53c7d64	make resquested changes	2018-04-02 10:51:39 -07:00
Seth Alves	e8a62d2943	Merge pull request #12740 from druiz17/fix-scope ... Fix name conflict with c++ class and qml file(master)	2018-03-30 15:41:42 -07:00
Dante Ruiz	4b7e2cb331	made requested changes	2018-03-30 15:15:17 -07:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
Andrew Meadows	73fa6d3d2f	slightly simpler EntityMotionState delete logic	2018-03-30 13:18:32 -07:00
Andrew Meadows	6837d042ad	move entityCollisionWithEntity to PhysicalEntitySimulation	2018-03-30 13:18:32 -07:00
Olivier Prat	5c26b4030b	Merge branch 'master' of http://github.com/highfidelity/hifi into fade	2018-03-30 14:38:42 -04:00