22356 commits

Author	SHA1	Message	Date
Seth Alves	58534a5a6d	Merge pull request #11550 from druiz17/fix-test-audio ... fixed looping sample sound bug	2017-10-09 15:21:24 -07:00
Zach Fox	38b95b5403	Instructions HTML file and flow	2017-10-09 15:07:14 -07:00
Seth Alves	d1d2b8a4da	don't export avatar-parent sessions IDs into json	2017-10-09 14:02:20 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Seth Alves	13da20e1f0	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-09 12:18:09 -07:00
Seth Alves	54204833df	add a getParentTree call for overlays	2017-10-09 12:17:56 -07:00
Zach Fox	acdd1e32e4	First round	2017-10-09 12:11:07 -07:00
Anthony Thibault	13919907de	Merge pull request #11539 from Nex-Pro/patch-1 ... Fixed typo in qWarning message.	2017-10-09 12:10:27 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" ... This reverts commit 28a8b18060.	2017-10-09 11:52:43 -07:00
druiz17	cd97ab0fdf	fixed looping sample sound bug	2017-10-09 11:39:57 -07:00
Stephen Birarda	1fb7b0df7a	re-bake new default avatar to compress mesh	2017-10-09 10:57:34 -07:00
Andrew Meadows	bbde1bcd63	move stuff out of writelock when possible	2017-10-09 10:42:42 -07:00
Stephen Birarda	78c5e84140	update to re-baked hipsFixed avatar	2017-10-09 10:33:35 -07:00
Stephen Birarda	198dbf83c3	fix name in mannequin FST	2017-10-09 10:33:34 -07:00
Stephen Birarda	429e037534	fix path to mannequin FBX from FST	2017-10-09 10:33:34 -07:00
Stephen Birarda	72b23a0fbb	update default avatar to be better with oculus grab triggers	2017-10-09 10:33:34 -07:00
Andrew Meadows	0bcecdbe66	be picky when finding nearby entities at login	2017-10-09 10:27:46 -07:00
Andrew Meadows	0f4e7fb532	workaround for bad physics polling on login	2017-10-09 10:27:46 -07:00
Seth Alves	4d2f16efc3	allow project to be built with clang on Linux	2017-10-08 18:01:41 -07:00
Brad Davis	7aeeaeb4e7	Fix rendering transform for text3d overlays	2017-10-07 19:41:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Thijs Wenker	77a36bf788	Merge pull request #10892 from ctrlaltdavid/vr-edit-a ... VR edit app	2017-10-07 02:19:00 +02:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Seth Alves	195d96bd43	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 11:02:35 -07:00
Nex-Pro	24974fdae3	Fixed typo in qWarning message.	2017-10-06 18:42:02 +01:00
Zach Fox	051b63503c	Merge pull request #11534 from zfox23/commerce_daveIntegration1 ... Commerce backend changes sync, October 5 2017	2017-10-06 09:45:45 -07:00
Ryan Huffman	9c06afc4c8	Merge pull request #11326 from cain-kilgore/21537 ... WL 21537 - Improve log naming	2017-10-06 08:51:42 -07:00
Seth Alves	8d00731620	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 07:20:34 -07:00
Zach Fox	525e0d8f61	Make SettingsScriptingInterface accessible to tablet	2017-10-05 16:51:13 -07:00
David Rowe	28c7ef2e97	Merge branch 'master' into vr-edit-a	2017-10-06 11:54:08 +13:00
Zach Fox	0b600a74c3	Fix passphrase input focus problem; fix getting inventory and balance after logging in on Checkout	2017-10-05 14:34:53 -07:00
Andrew Meadows	a3bafa3c44	Merge pull request #11506 from SamGondelman/sharks ... Fix and improve laser pointer locking	2017-10-05 14:10:06 -07:00
Zach Fox	9290a51685	Fix confirmed text	2017-10-05 14:03:56 -07:00
Seth Alves	30269c6794	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 13:57:44 -07:00
Andrew Meadows	05f2dfbbc3	Merge pull request #11529 from vladest/fix_audiotab_name_alignment ... Fix alignment of audio devices input header	2017-10-05 13:50:29 -07:00
SamGondelman	6b02cbb911	move locking inside laserpointer and raypick	2017-10-05 13:17:57 -07:00
Zach Fox	8e82095135	Number sold and limited run	2017-10-05 12:46:20 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00
vladest	193dc83b99	Fix alignment of audio devices input header	2017-10-05 13:59:42 +02:00
Sam Gateau	25dae2f24e	Merge pull request #11499 from samcake/blue ... Moving Camera update and render frame to Game Loop (Main thread)	2017-10-04 18:42:02 -07:00
Zach Fox	9d51d40af4	Merge pull request #11489 from vladest/login_dialog_rework ... Login dialog rework	2017-10-04 15:47:44 -07:00
David Rowe	63e7521711	Merge branch 'master' into vr-edit-a	2017-10-05 11:29:49 +13:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
samcake	d773b40a63	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-04 13:25:14 -07:00
Andrew Meadows	e3ea013d5f	Merge pull request #11518 from SamGondelman/avatarRay ... Fix calling AvatarManager.findRayIntersection() from script	2017-10-04 12:04:30 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
vladest	86e8076362	Fix puntuation mode	2017-10-04 20:30:25 +02:00
Zach Fox	1ed10ecf59	Fix passphrase crash	2017-10-04 11:05:17 -07:00
samcake	d7333d3fa3	Merging with master	2017-10-04 10:55:38 -07:00
vladest	073fa81d5b	Merge branch 'master' into login_dialog_rework	2017-10-04 19:37:38 +02:00
vladest	0a505617df	Implemented single keyboard instance for all Tablet login dialog items	2017-10-04 19:33:36 +02:00
Zach Fox	fcafbef109	Fix buying free items using Commerce system	2017-10-04 09:34:32 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
SamGondelman	0614fd9b4f	fix AvatarManger::findRayIntersection from script thread	2017-10-03 15:31:49 -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
vladest	6fddf49988	Merge branch 'master' into login_dialog_rework	2017-10-03 21:39:38 +02: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	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
David Rowe	f52df6667a	Merge branch 'master' into vr-edit-a	2017-10-03 21:50:49 +13:00
Sam Gateau	64f70f1ebb	more cleanups	2017-10-02 22:00:41 -07:00
Sam Gateau	895e3d0430	more cleanups	2017-10-02 21:46:52 -07:00
Sam Gateau	316156db46	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-02 21:31:59 -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
samcake	bb99f68d40	Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead	2017-10-02 17:04:00 -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
SamGondelman	97b09d680c	fix and improve laser pointer locking	2017-10-02 13:17:53 -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
vladest	bf39eb9a77	Test Tablet keyboard specific	2017-10-02 20:02:55 +02: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
samcake	fc2329193e	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-02 10:15:38 -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
vladest	07ba2cce5b	Merge branch 'master' into login_dialog_rework	2017-10-02 18:24:12 +02:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02: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
Sam Gateau	ec10d38983	more cleaning	2017-10-01 22:28:04 -07:00
David Rowe	829cc8e5e6	Merge branch 'master' into vr-edit-a	2017-10-02 17:08:27 +13:00
Sam Gateau	6c510bc18f	fine tuning the changes to respect clean up	2017-10-01 20:05:48 -07:00
samcake	0cbf19bcf1	Removing comments	2017-10-01 17:47:35 -07:00
samcake	aa10c29609	Cleaning up the changed code	2017-10-01 17:16:10 -07:00
samcake	da4de38e91	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-01 15:01:18 -07:00
SamGondelman	572986bfad	fix modeloverlay visible change ... (cherry picked from commit 0bb27a7165)	2017-10-01 13:40:00 -07:00
Sam Gateau	44cc6deac2	moving render specific code from Application.cpp to Application_render.cpp	2017-10-01 12:55:44 -07:00
vladest	ad32e7bdf5	Merge branch 'master' into login_dialog_rework	2017-10-01 19:27:23 +02: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
David Rowe	0daa5012ca	Enable toolbar and tablet icons to load from local script directory	2017-09-30 15:00:15 +13:00
SamGondelman	0bb27a7165	fix modeloverlay visible change	2017-09-29 17:48:59 -07:00
samcake	577378f539	Adding stuff that seems to break?	2017-09-29 17:45:10 -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
samcake	225d2bbbb4	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-29 13:47:37 -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
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
samcake	3265fe62ad	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-29 09:09:27 -07:00
vladest	01a0b26b90	Remove mouse area for text fields. use activeFocusOnPress property instead	2017-09-29 17:14:35 +02:00
vladest	d3cd034d61	Cleanup	2017-09-29 16:33:52 +02:00
vladest	174287c5f5	Merge branch 'master' into login_dialog_rework	2017-09-29 15:57:27 +02:00
Atlante45	af69222fdb	Fix icon name change	2017-09-28 18:34:42 -07:00
samcake	e637842f8a	Separating some of the code sepecific to render in its own cpp	2017-09-28 17:45:50 -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
samcake	c112a3baf1	Seting up of camera and avatar correctly in game loop, not in render loop	2017-09-28 15:09:49 -07:00
Zach Fox	66be558a04	My Items Interface	2017-09-28 14:04:57 -07:00
Ryan Huffman	ff019d6195	Fix extension detection when tracking asset uploads	2017-09-28 13:56:49 -07:00
vladest	4023c40149	Cleanup	2017-09-28 22:55:01 +02:00
Zach Fox	3a537cdcc3	Make usernameDropdown collapse when clicking anywhere outside it	2017-09-28 13:21:55 -07:00
Zach Fox	3742ccbdd3	Fix keyboard focus during setup while tip is up	2017-09-28 13:12:42 -07:00
Zach Fox	751dca0761	styling updates for purchases	2017-09-28 13:06:37 -07:00
Zach Fox	68c08969ae	Update Purchases	2017-09-28 12:49:38 -07:00
Andrew Meadows	60fe9ec5e9	Merge pull request #11480 from AndrewMeadows/fix-debug-build-20170928 ... fix interface crash in Debug build	2017-09-28 12:41:12 -07:00
vladest	c3225c2c76	Make fix precisely for Linux	2017-09-28 21:38:03 +02:00
vladest	769c57208c	Signup ready	2017-09-28 21:35:41 +02:00
Zach Fox	b5dc6b791b	Fix commerce setting handle	2017-09-28 10:42:45 -07:00
Zach Fox	8d74487393	Use edition number; fix CONFIRMED timer	2017-09-28 10:25:05 -07:00
samcake	2f9779c02c	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-28 10:08:20 -07:00
Seth Alves	912305fd4b	Merge pull request #11476 from ElderOrb/case7925 ... 7925 Create Mode: keyboard focused entry field is not visible	2017-09-28 10:03:28 -07:00
Zach Fox	b6ce294bb2	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-09-28 09:38:48 -07:00