22114 commits

Author	SHA1	Message	Date
Zach Fox	23245e2fb9	Modify context overlay filter	2017-10-04 10:39:23 -07:00
Zach Fox	9c4b02c659	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-03 14:37:07 -07:00
Zach Fox	b7e50c5b73	First steps	2017-10-03 14:36:22 -07:00
Seth Alves	ea4068f1f9	Merge pull request #11478 from vladest/fix_menu_linux ... Added workaround to enable menu bar under Linux	2017-10-03 13:10:34 -07:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Sam Gateau	ab8757eeb2	Merge pull request #11504 from AndrewMeadows/main-loop-stats-audit ... Tweak debug stats for more clarity	2017-10-03 11:23:16 -07:00
Zach Fox	409360e55d	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-03 11:17:38 -07:00
Zach Fox	e64b0861a1	Change passphrase working	2017-10-03 10:53:10 -07:00
Andrew Meadows	cd4be1473f	put more of Application::update() under time measurement	2017-10-03 10:34:12 -07:00
Andrew Meadows	773c48bbc9	use floating point for game loop stats values	2017-10-03 10:32:19 -07:00
Andrew Meadows	21cd986645	tally PerformanceTimer records when it is active	2017-10-02 20:57:20 -07:00
druiz17	86f580919c	remove what space	2017-10-02 17:43:43 -07:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	8a0ecf4e6f	propertly determine is laser intersects with HUD UI	2017-10-02 16:46:43 -07:00
Andrew Meadows	c3167444a9	decouple 'general timing' from 'game loop' details	2017-10-02 16:31:20 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Zach Fox	1d1b846f39	Better 'view backup instructions' behavior	2017-10-02 12:44:51 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake ... Asset Browser tweaks	2017-10-02 11:29:36 -07:00
Zach Fox	2b03e08c96	Fix errant status when requesting it for the first time	2017-10-02 10:20:24 -07:00
Sam Gateau	68046ae4e3	Merge pull request #11491 from jherico/dev/disable_watchdog ... Disable watchdog with environment variable	2017-10-02 10:19:32 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
Zach Fox	2783293d24	Merge pull request #11490 from vladest/fix_walletsetup_focus ... Remove mouse area for text fields. use activeFocusOnPress property in…	2017-10-02 08:38:04 -07:00
vladest	9a00468ea9	semicolons, yes	2017-10-01 19:21:30 +02:00
vladest	feafd441b1	Make sure keyboard will be rised after lowering on another click	2017-10-01 18:54:07 +02:00
vladest	c3bc67b72d	Merge branch 'master' into fix_walletsetup_focus	2017-10-01 18:24:38 +02:00
SamGondelman	0bb27a7165	fix modeloverlay visible change	2017-09-29 17:48:59 -07:00
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	e6ea76eefe	Tiny language fix - Thanks Cain!	2017-09-29 15:44:44 -07:00
Zach Fox	4668294389	Fix login flow regression	2017-09-29 15:25:24 -07:00
Zach Fox	bbbce96407	Fix gray securityimage	2017-09-29 14:30:02 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
vladest	7f6773b1f4	Added semicolons	2017-09-29 21:12:21 +02:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
SamGondelman	3ae41b9b75	cleanup client and stats string	2017-09-29 11:34:35 -07:00
SamGondelman	f7af581c71	track traversal time, rename entity server stat	2017-09-29 11:34:35 -07:00
Andrew Meadows	fb3e74398f	don't invalidate viewFrustum sent to server	2017-09-29 11:34:35 -07:00
SamGondelman	247764b679	add total entity packets in stat (kbps)	2017-09-29 11:34:34 -07:00
SamGondelman	cbf82a6f2c	fix timeout for physics check	2017-09-29 11:34:34 -07:00
Andrew Meadows	171151b92a	use new form of MovingEntitiesOperator ctor	2017-09-29 11:34:32 -07:00
Brad Davis	a7d507e9fd	Disable watchdog with environment variable	2017-09-29 10:44:04 -07:00
Seth Alves	e7705175a3	Merge pull request #11481 from ZappoMan/animatedOverlays ... support animation of model overlays	2017-09-29 10:26:24 -07:00
ZappoMan	9c81bc5479	CR fixes	2017-09-29 09:52:30 -07:00
vladest	01a0b26b90	Remove mouse area for text fields. use activeFocusOnPress property instead	2017-09-29 17:14:35 +02:00
Atlante45	af69222fdb	Fix icon name change	2017-09-28 18:34:42 -07:00
Zach Fox	a1ae13489e	Slight changes to tutorial	2017-09-28 16:41:29 -07:00
Zach Fox	4814f277c1	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-09-28 16:07:32 -07:00
ZappoMan	be7729b276	support animation of model overlays	2017-09-28 15:14:59 -07:00
Zach Fox	2cff5c1fa6	First time Purchases tutorial	2017-09-28 15:12:55 -07:00