19698 commits

Author	SHA1	Message	Date
Zach Fox	a669aff453	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171018	2017-10-18 10:45:30 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
Olivier Prat	25b3549e04	Working multiple outlines except debugging scripts which applies config to all outlines and graphics bug when filled	2017-10-18 15:00:53 +02:00
David Rowe	fcc7a3e440	Code review	2017-10-18 21:08:10 +13:00
Seth Alves	f1abb0cd55	don't send avatar-entity updates for queryCube-changes, because avatar-entities don't use them	2017-10-17 19:01:24 -07:00
SamGondelman	58172cfbd4	merge from master	2017-10-17 18:05:59 -07:00
SamGondelman	640ad514bc	updates based on austin's comments	2017-10-17 17:53:10 -07:00
Bradley Austin Davis	9e46e288b1	Merge pull request #11604 from SamGondelman/endSphere ... Scale LaserPointer end overlay in C++	2017-10-17 16:37:35 -07:00
SamGondelman	05f4883104	get rid of valid	2017-10-17 16:15:54 -07:00
SamGondelman	6d6ede075f	resolve conflicts	2017-10-17 15:26:32 -07:00
SamGondelman	8a5759df69	PickManager::addPick	2017-10-17 15:22:39 -07:00
SamGondelman	3ef7ebffba	working generalized pickmanager	2017-10-17 15:09:41 -07:00
SamGondelman	596be8ec27	pickmanager wip	2017-10-17 13:16:37 -07:00
SamGondelman	ba4f41b59a	fix warnings	2017-10-17 12:03:59 -07:00
Sam Gondelman	2e69d2b1ad	missed one scripting interface reference	2017-10-17 11:13:02 -07:00
Olivier Prat	76589316df	Working debug script with multiple selection	2017-10-17 10:24:05 +02:00
Sam Gateau	74b02a3e9b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-16 20:58:11 -07:00
David Rowe	ed1c974f75	Use MyAvatar.SELF_ID instead of Uuid.SELF	2017-10-17 15:58:51 +13:00
Brad Hefta-Gaub	f7a1816a99	Merge pull request #11593 from hyperlogic/bug-fix/reduce-pressure-on-event-queue ... Reduce present traffic on main thread event queue.	2017-10-16 18:02:11 -07:00
SamGondelman	429905de51	update scripts to use ignoreItems, fix caching bug	2017-10-16 15:52:17 -07:00
Zach Fox	a4b8bf0be6	Bugfixes and CR	2017-10-16 15:33:10 -07:00
Bradley Austin Davis	3f99e70af0	C++ cleanup for pointers / picking	2017-10-16 14:20:31 -07:00
SamGondelman	c6b636901a	fewer undesirable couplings	2017-10-16 13:46:23 -07:00
SamGondelman	aee817fbbc	scale end sphere in c++ for controller modules	2017-10-16 13:31:25 -07:00
SamGondelman	d274d99411	merge from master	2017-10-16 12:17:37 -07:00
Andrew Meadows	e109101acc	update profiling timers	2017-10-16 11:52:30 -07:00
Zach Fox	febc725520	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57	2017-10-16 09:53:15 -07:00
Olivier Prat	e42699c0ea	Added multiple selections but still only first linked to outline	2017-10-16 10:57:06 +02:00
Brad Davis	2ae61cb96b	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
Zach Fox	bcbddb7106	Fix unix warnings	2017-10-14 14:13:19 -07:00
SamGondelman	c4e6cb28ce	move contextoverlay connection to contextoverlayinterface	2017-10-13 16:23:29 -07:00
Anthony J. Thibault	67d43b4fac	Use atomic<bool> and compare_exchange_strong	2017-10-13 16:03:56 -07:00
SamGondelman	5bfb0baf09	const references	2017-10-13 14:38:46 -07:00
Zach Fox	5be9f2022e	Fix writing backup instructions when restoring wallet backup	2017-10-13 14:33:36 -07:00
Anthony J. Thibault	a2a6cd0c7a	Reduce present traffic on main thread event queue. ... In an effort to diagnose the root cause of several deadlocks, it seems possible that the main thread event queue can grow to a size where it can take many seconds to drain. This PR attempts to address this in two ways: * Change the connection between the DisplayPlugin::presented signal and the Application::onPresent slot to be a DirectConnection. This should prevent the main thread from filling up with signal events. * Within Applicaiton::onPresent use an atomic counter to prevent the main thread from filling up with repeated Idle events.	2017-10-13 14:28:23 -07:00
Brad Hefta-Gaub	60030c08fa	Merge pull request #11573 from druiz17/bug-hud-module ... hud module intersects with dev stats window	2017-10-13 11:48:06 -07:00
Dante Ruiz	d14e6b6e5a	Merge pull request #11450 from ElderOrb/case7722 ... 7722 Add onHover Outline to Tablet "X" Button	2017-10-13 11:38:38 -07:00
Bradley Austin Davis	4dcce6ef45	Merge pull request #11578 from hyperlogic/bug-fix/delete-on-wrong-thread ... Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread.	2017-10-12 17:37:05 -07:00
SamGondelman	dacd48862f	put back overlay signals for scripts	2017-10-12 16:43:33 -07:00
Zach Fox	d75c0a00bb	Closer than ever	2017-10-12 16:29:05 -07:00
SamGondelman	0d164363af	cleanup mousePressOffEntity signal	2017-10-12 15:29:29 -07:00
SamGondelman	a48221d915	fix context overlays	2017-10-12 14:51:15 -07:00
SamGondelman	7f3268548c	direct connection to web3doverlay	2017-10-12 14:14:08 -07:00
druiz17	83d2a54b0f	fixed some bugs	2017-10-12 13:48:21 -07:00
Zach Fox	6a47884fcf	Cleanup and fix	2017-10-12 13:41:19 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities ... Import av entities	2017-10-12 13:30:53 -07:00
Zach Fox	abe1cd1b51	Minor cleanup	2017-10-12 11:53:47 -07:00
Zach Fox	0e96fc5cab	It's working!	2017-10-12 11:37:26 -07:00
SamGondelman	27b585cb0b	Merge remote-tracking branch 'upstream/master' into pointerEvents	2017-10-12 11:22:23 -07:00
SamGondelman	53fde83922	cleaning up pointerevents, wip	2017-10-12 11:21:50 -07:00
vladest	67ee4a7679	Merge branch 'master' into webbrowser_updates	2017-10-12 20:15:53 +02:00
Zach Fox	5efa920712	Getting closer	2017-10-12 11:13:23 -07:00
vladest	f1d5df5926	Restore lost-in-merge context property	2017-10-12 18:26:50 +02:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
samcake	480047548d	exposing the Render interface to the overlay web3d	2017-10-11 18:04:29 -07:00
Anthony J. Thibault	0a943fbe7b	Crash/Deadlock fix: Web3DOverlay could be destroyed on wrong thread. ... When script calls Entities.getChildrenIDs*() it is possible to deadlock the main thread, and also invoke the destructor of Entities and Overlays, which is very NOT thread safe. The fix is to use a pattern already in use in several places in our codebase. Use the custom deleter parameter of std::shared_ptr to call deleteLater() instead of destroying the object in place. This allows any thread to use shared_ptrs of SpatiallyNestables without fear.	2017-10-11 17:32:34 -07:00
Zach Fox	c3e66c9581	Fixes	2017-10-11 16:56:47 -07:00
Brad Hefta-Gaub	cd2a742974	Merge pull request #11576 from SamGondelman/pointerEvents ... Remove unused HFMetaEvents	2017-10-11 16:10:43 -07:00
samcake	9abe098436	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-11 15:48:40 -07:00
Sam Gateau	38b467a6bf	Merge pull request #11570 from jherico/overlays_blocking ... Remove unnecessary blocking call	2017-10-11 15:40:53 -07:00
SamGondelman	403b18977b	remove unused HFMetaEvents	2017-10-11 14:37:23 -07:00
Zach Fox	9e570fdba3	First pass at encryption/decryption. Exciting!	2017-10-11 13:08:04 -07:00
Zach Fox	f037eab26c	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-11 11:07:32 -07:00
Zach Fox	99109fe8e5	Merge pull request #11567 from zfox23/commerce_daveIntegration3 ... 2017-10-10 Commerce Frontend Updates	2017-10-11 11:07:03 -07:00
Brad Davis	69f869b339	Remove unecessary blocking call	2017-10-11 11:01:06 -07:00
Anthony J. Thibault	cb01c5cada	compile fix	2017-10-10 16:30:11 -07:00
Zach Fox	4ebccfa65c	Use put instead of get sob	2017-10-10 16:23:43 -07:00
Anthony J. Thibault	cbb0d27f68	div by zero fix	2017-10-10 16:20:52 -07:00
Anthony J. Thibault	18d723b6b4	div by zero fixes, detected by address sanitizer	2017-10-10 16:17:39 -07:00
Zach Fox	5e383e2b1c	My Item certificates	2017-10-10 14:56:17 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	0ae69b6ad9	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-10 12:38:14 -07:00
Zach Fox	1c0a564155	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_daveIntegration3	2017-10-10 12:36:06 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
Clément Brisset	3b48833cc0	Merge pull request #11451 from huffman/feat/upload-user-event ... Add uploading to asset server event	2017-10-10 11:03:33 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Ryan Huffman	9c120f1194	Update AssetMappingsScriptingInterface to not open file for activity event	2017-10-10 09:44:13 -07:00
Seth Alves	8ac1875a91	Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login ... Find nearby entities at login	2017-10-09 17:54:44 -07:00
Seth Alves	f349ba3674	replace parent avatar-id with avatar-self-id when exporting entities	2017-10-09 15:32:45 -07:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -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
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
Zach Fox	a7d43c63b6	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-09 11:38:13 -07:00
Andrew Meadows	bbde1bcd63	move stuff out of writelock when possible	2017-10-09 10:42:42 -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
samcake	1f3623e8e9	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-09 09:37:25 -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
samcake	988d8a1a62	TRying to debug the overlay notifications to show ?)	2017-10-06 18:17:48 -07:00
Zach Fox	59a6726af6	Checkpoint; lotsa changes...	2017-10-06 16:55:05 -07: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
Zach Fox	1fa9bd8fc6	Better implementation of location change and bugfixes	2017-10-06 12:22:29 -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	e5e6d84e07	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-06 09:47:21 -07: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
Andrew Meadows	a3bafa3c44	Merge pull request #11506 from SamGondelman/sharks ... Fix and improve laser pointer locking	2017-10-05 14:10:06 -07:00
SamGondelman	6b02cbb911	move locking inside laserpointer and raypick	2017-10-05 13:17:57 -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
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	27d6cc2657	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-04 15:49:33 -07:00
Clément Brisset	74fd69ac2d	Merge pull request #11523 from Atlante45/new-master ... RC56 into Master	2017-10-04 15:17:52 -07:00
Zach Fox	b35eaf2cc8	Throw a bunch of code at the wall and hope some sticks	2017-10-04 15:06:55 -07:00
samcake	d773b40a63	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-04 13:25:14 -07:00
Zach Fox	ab08dc6bd6	Progress?	2017-10-04 12:33:58 -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
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
Zach Fox	23245e2fb9	Modify context overlay filter	2017-10-04 10:39:23 -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
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
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
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
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	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
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
Sam Gateau	ec10d38983	more cleaning	2017-10-01 22:28:04 -07: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
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
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
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
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
samcake	e637842f8a	Separating some of the code sepecific to render in its own cpp	2017-09-28 17:45:50 -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
samcake	c112a3baf1	Seting up of camera and avatar correctly in game loop, not in render loop	2017-09-28 15:09:49 -07:00
Ryan Huffman	ff019d6195	Fix extension detection when tracking asset uploads	2017-09-28 13:56:49 -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
Zach Fox	b5dc6b791b	Fix commerce setting handle	2017-09-28 10:42:45 -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
Zach Fox	65a63ea8c3	Remove dead OS X code	2017-09-28 09:38:22 -07:00
samcake	b1daae0150	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-28 09:16:02 -07:00
Ryan Huffman	97bf093cab	Fix ambiguous conversion in AssetMappingScriptingInterface	2017-09-28 08:16:54 -07:00
vladest	0a9bebeefc	Added workaround to enable menu bar under Linux	2017-09-28 15:34:56 +02:00
samcake	40ca98214b	Moving all of the camera and avatar eval to game loop	2017-09-27 17:58:43 -07:00
samcake	29da0c663f	Merge branch 'master' of https://github.com/highfidelity/hifi into flash	2017-09-27 16:21:55 -07:00
Sam Gateau	287f4f1d71	Merge pull request #11466 from SamGondelman/mirrorCrash ... Fix mirror and fade threading crashes	2017-09-27 16:17:04 -07:00
Atlante45	eb06c33187	Naming coding standard fix	2017-09-27 15:32:53 -07:00
samcake	3bd6e35e30	Fixing the broken on hud overlay's render transform	2017-09-27 15:19:21 -07:00
Zach Fox	7ad3a5a1e3	Commerce: Tons of Interface changes (#11463) ... * canRez(Tmp)Certified() * CertifiedItem beginnings * Skeleton of verifyOwnerChallenge() * Controlled failure; updateLocation() skeletion * Controlled failure on checkout page with ctrl+f * Skeleton Purchases first-use tutorial * Initial progress on new setup * Security pic tip * Skeleton Certificate page * Updates to Certificate * General progress; setup is nearly complete * Better buttons; last step almost done * Initial progress on wallet home * Completed recent transactions * Security page * Scrollbar * Fix auth error text * PassphraseSelection * Change security pic * Minor layout changes; beginnings of emulated header * Various layout changes; wallet nav bar * Help screen * Quick onaccepted change * First pass at new purchases * Small style updates * Some error progress * Lightbox in purchases * Collapse other help answers when clicking on another * REZZED notif * Commerce Lightbox * Lots of new interactions in Purchases * Hook up 'view certificate' * Fix errors, fix close button on cert * Purchases timer; much faster filter * Add debugCheckout * Purchase updates * GlyphButton; separator; Checkout Success; Ledger fix; debug modes * Lock glyph below security pic should be white * Various fixes, round 1 * Circular mask * Passphrase change button fix; TextField error edge highlighting * Recent Activity fixes * Various changes * Standard Security Pic location * Color changes * Filter bar changes * Styling for multiple owned items * Minor language change * Header dropdown (harder than expected) * Small fixes * View backup instructions * marketplaces.js onCommerceScreen * Beginnign of new injection * Marketplace injection changes * Purchase button style changes * More button styling * MY PURCHASES button * marketplace onUsernameChanged * New help QA * Help text changes etc * Downscale security image, reducing filesize * Lots of bugfixes * Cleanup before PR * Only open cert during inspection if commerce switch is on * Help text changes * Purchase status incl. change to confirmed; Help text; Open Explorer to hifikey * Quick glyph change * New 'wallet not set up' flow for when entering Purchases or Checkout without set-up wallet	2017-09-27 14:43:51 -07:00
Andrew Meadows	26ea7034d8	prevent zero scale for Line3DOverlay	2017-09-27 14:30:50 -07:00
Andrew Meadows	b602c18475	prevent zero dimensions for Volume3DOverlay	2017-09-27 14:30:50 -07:00
SamGondelman	553829f7ab	make sure FadeEffect dependency is created early	2017-09-27 11:58:35 -07:00
Sam Gateau	88097bb39f	Merge pull request #11447 from AndrewMeadows/lod-auto-adjust ... LODManager uses batchTime and engineRunTime for automatic LOD adjustment	2017-09-27 10:51:46 -07:00
Ryan Huffman	88810d28c1	Add activity logging for uploading_asset	2017-09-27 09:33:11 -07:00
Ryan Huffman	014a7bc9b0	Fix bytes downloaded stat tracking	2017-09-27 09:33:10 -07:00
Sam Gateau	9317ad38aa	Merge pull request #11462 from highfidelity/game-render-interface ... Moving transform evaluation out from render loop to gameplay loop / fixing tablet tearing	2017-09-26 17:40:23 -07:00
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
samcake	f16c552978	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-26 17:18:05 -07:00
SamGondelman	49512c95d7	possibly fix threading crashes, mirror and fade	2017-09-26 16:21:36 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
samcake	328dd9c108	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue	2017-09-26 16:12:27 -07:00
samcake	badb45c921	fixing the web surface now getting scaled when the table t is grabbed is fixed	2017-09-26 15:20:45 -07:00
samcake	510b446409	mergine with master, resolving conflict	2017-09-26 13:13:46 -07:00
beholder	24a12a2f8f	7722 Add onHover Outline to Tablet "X" Button	2017-09-26 22:31:56 +03:00
Seth Alves	7397a123c5	Merge pull request #11345 from SamGondelman/textAA ... Text3D Overlays and Entities fixes and no-AA	2017-09-26 12:26:08 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Dante Ruiz	74f9e07f1a	Merge pull request #11361 from vladest/move_tablet2toolbar_to_developer_menu ... Move Tablet becomes toolbar menu from General to Developer menu	2017-09-26 11:26:42 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
samcake	b5c942f7f6	Merge branch 'master' of https://github.com/highfidelity/hifi into game-render-interface	2017-09-26 10:47:59 -07:00
samcake	669af73a96	Bringing as much as possible out from render to game	2017-09-26 10:47:24 -07:00
Andrew Meadows	ec80846281	Merge pull request #11443 from SamGondelman/sharks ... Laser Pointer fixes and updates	2017-09-26 10:22:55 -07:00
Sam Gateau	953614fe65	More stuff out of render to the gameloop	2017-09-25 23:43:32 -07:00
samcake	157b4f2e13	Moving some of the updates on the camera and the avatar out from render to game loop	2017-09-25 18:28:33 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
Andrew Meadows	cc8e618bc0	remove cruft	2017-09-25 15:52:14 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
Andrew Meadows	a3ac20d961	minor cleanup	2017-09-25 15:10:14 -07:00
Andrew Meadows	37c501b131	LODManager uses renderTime instead of main loop fps	2017-09-25 13:17:21 -07:00
vladest	b190fac4f1	Fix stylus	2017-09-25 19:45:51 +02:00
vladest	1a2d38e31f	Removed sounds for tablet in and out, added sounds for stylus instead. Added logging for testing semi-pressed laser and keyboard sounds	2017-09-25 17:11:44 +02:00
vladest	b5f0c4d940	Added settings controls sounds	2017-09-25 16:46:36 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
Sam Gateau	f90dc64241	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-24 19:32:57 -07:00
Andrew Meadows	cf0dd6f8c3	Merge pull request #11371 from cain-kilgore/21542 ... WL 21542 - Allow Scripts to change Avatar Gravity [Experimental]	2017-09-23 22:20:52 -07:00
samcake	59006411c6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-22 18:00:58 -07:00
Zach Fox	921ebc221e	Merge pull request #11431 from zfox23/contextOverlayInterface_fixEnabled ... Enable Inspection Mode for all; change Commerce setting name	2017-09-22 17:52:27 -07:00
SamGondelman	0e3f1c5149	add setLaserLength, setLockEndUUID doesn't use defaultRenderStates	2017-09-22 16:11:24 -07:00
Zach Fox	702a4e9ade	More tweaking to overlay position	2017-09-22 15:32:38 -07:00
SamGondelman	cbe621f2b7	add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate	2017-09-22 15:15:15 -07:00
Zach Fox	0eafdeab14	Fix hover -> unhover overlay behavior	2017-09-22 13:32:11 -07:00
Zach Fox	e3f2e70bca	No magic numbers	2017-09-22 11:43:56 -07:00
Zach Fox	430d1b22bb	Update angular size and i behavior	2017-09-22 11:41:28 -07:00
Zach Fox	bb9db3ef6d	Updates to behavior and shader appearance	2017-09-22 11:24:30 -07:00
samcake	4ce774ab8e	Merge branch 'blue-bis' of https://github.com/samcake/hifi into blue	2017-09-22 11:02:57 -07:00
samcake	b424505f65	FIxing the case of the Circle3D	2017-09-22 10:48:56 -07:00
samcake	219d63784b	REmoving the extra variables in Linear3D and just use the _renderTRansform	2017-09-22 10:39:51 -07:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
samcake	16fb64afaa	Merging with blue-bis	2017-09-21 18:01:04 -07:00
samcake	4a67e0421f	minimise the changes compared to upstream	2017-09-21 17:33:50 -07:00
samcake	eed099502a	minimise the changes compared to upstream	2017-09-21 17:20:32 -07:00
samcake	510ecbb137	Merging with upstream	2017-09-21 16:59:15 -07:00
samcake	2d369a4586	fixing the image3D updating its renderTransform from it s update() call	2017-09-21 16:20:13 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
samcake	454e167d93	notifying a render transform / bound change when the dimension property change	2017-09-21 12:58:56 -07:00
samcake	7103864b37	Also rendering the line3D overlay with start and end captured in game loop	2017-09-21 12:23:53 -07:00
Zach Fox	57b5a23373	Enable Inspection Mode for all; change Commerce setting name	2017-09-21 11:18:21 -07:00
Zach Fox	81be62b6f7	Check if ContextOverlayInterface is enabled before highlighting	2017-09-21 09:34:15 -07:00
samcake	5dc4e89e4c	Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis	2017-09-21 08:56:02 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake ... Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
samcake	cdf66887ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue-bis	2017-09-20 18:09:28 -07:00
samcake	d112ffd8d6	Moving all the 3D overlay transform evaluation out of the render thread to the game loop, need to do something for the line3d	2017-09-20 18:06:49 -07:00
Sam Gateau	daf18156f9	Merge pull request #11418 from SamGondelman/laserLaser ... Don't let scripts control visibility of laser pointer overlays	2017-09-20 17:54:00 -07:00
Anthony J. Thibault	5e93c13856	warning fix	2017-09-20 16:36:33 -07:00
Anthony J. Thibault	09c61deda8	Fixes for Vive puck calibration	2017-09-20 15:41:49 -07:00
Cain Kilgore	322b7fc060	Cleanup from Merge	2017-09-20 23:37:33 +01:00
Cain Kilgore	796e9e7ab3	Fixed things	2017-09-20 23:23:30 +01:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
Elisa Lupin-Jimenez	1ac0a8224f	removed extraneous printouts again	2017-09-20 14:23:53 -07:00
Elisa Lupin-Jimenez	92550b749c	removed extraneous printouts	2017-09-20 14:23:09 -07:00
Elisa Lupin-Jimenez	02fa7395ac	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-20 14:21:19 -07:00
Elisa Lupin-Jimenez	b8fdb66745	added support for fbx formats	2017-09-20 14:20:43 -07:00
vladest	6e3cfe81ab	Fix crash on second bookmark saving	2017-09-20 21:01:16 +02:00
Anthony J. Thibault	a8a5138c18	remove USE_N_SCALE preprocessor check	2017-09-20 09:23:13 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
vladest	3376786288	Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard	2017-09-20 17:02:54 +02:00
vladest	56e6c8674a	Merge branch 'master' into webbrowser_updates	2017-09-20 14:38:09 +02:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
vladest	6297448e90	Build fix	2017-09-19 19:49:19 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
vladest	5202d024a7	Merge branch 'master' into tablet_extended_sounds	2017-09-19 15:55:37 +02:00
Elisa Lupin-Jimenez	a41aced032	Merge pull request #11390 from elisa-lj11/master ... Fixed blocks download issue with `noDownload=false` tag	2017-09-18 13:23:47 -07:00
Anthony J. Thibault	7e2b2960ed	Fix for lighting as IPD scale changes. ... (cherry picked from commit a260aaaae8)	2017-09-18 12:15:32 -07:00
Elisa Lupin-Jimenez	a45cc88e55	Fixed blocks download issue with noDownload=false tag	2017-09-18 11:41:30 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	1cde504c74	Memleak fix. Cleanup	2017-09-16 22:57:26 +02:00
vladest	a8d24d9161	Cleanup	2017-09-16 22:41:18 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
vladest	5b033e021a	Merge branch 'master' into modal_dialogs_async	2017-09-16 12:30:07 +02:00
Sam Gateau	512e9432ed	Merge pull request #11370 from samcake/blue-bis ... Fixing the web surface of the tablet	2017-09-15 15:36:55 -07:00
samcake	524c94cdd4	Adding more comments for future fixmes	2017-09-15 14:35:45 -07:00
Anthony Thibault	c7fc45e0ae	Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering ... Avatar Attachments now render correctly	2017-09-15 13:28:00 -07:00
samcake	c687932ca7	One more:	2017-09-15 11:44:35 -07:00
samcake	a49b4dc31f	Merge back blue-bis in	2017-09-15 11:40:26 -07:00
Anthony J. Thibault	3f6c88e77f	Avatar Attachments now render correctly ... * moved Avatar::fixupModelsInScene off the newly created render thread back to the main thread. * updated Avatar::postUpdate to take a scene pointer, necessary for Avatar::fixupModelsInScene * updated developer/tests/avatarAttachementTest.js to account for recent changes in avatar attachment scale, commit 712aff7ad. * updated initialization of anim graph to use Model::isLoaded() instead of Model::initWhenReady() to know when the model was completely loaded.	2017-09-15 11:23:09 -07:00
samcake	19cd537e65	addressing review comments	2017-09-15 11:10:25 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Cain Kilgore	67a5c75a0d	Doesn't need to be here anymore	2017-09-15 06:08:22 +01:00
Cain Kilgore	c2e342ddac	Gravity Implementation	2017-09-15 06:03:56 +01:00
Sam Gateau	30bf800963	Cleanup	2017-09-14 20:33:08 -07:00
samcake	ec7536db2c	Brining the changes just to fix the tablet issue	2017-09-14 18:36:20 -07:00
samcake	bff578b283	Working version that fixes the web overlay / tablet	2017-09-14 17:07:50 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
vladest	2f86658308	Move Tablet becomes toolbar menu from General to Developer menu	2017-09-14 16:37:02 +02:00
Sam Gateau	a70f7dfc87	put updateCamera in its function	2017-09-13 22:05:20 -07:00
Sam Gateau	e4a5b7f250	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-13 19:28:56 -07:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
Cain Kilgore	72ca62c4af	Initial Commit - more to do.	2017-09-14 00:25:11 +01:00
Atlante45	7d9daea0f6	Transmit baking errors to interface for display.	2017-09-13 09:54:54 -07:00
David Kelly	bce92a622e	cr feedback	2017-09-13 09:45:02 -07:00
Cain Kilgore	1c05311056	Some code cleanup	2017-09-13 16:48:18 +01:00
SamGondelman	a955381726	Merge remote-tracking branch 'upstream/master' into textAA	2017-09-12 16:50:16 -07:00
SamGondelman	1b85a453ab	working on text3d overlays and entities	2017-09-12 16:49:51 -07:00
samcake	216d74c112	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-12 14:36:12 -07:00
samcake	10b1e3f561	Trying to implement differnet solution to the transform updates problem and debug	2017-09-12 14:35:25 -07:00
David Kelly	187ed71a8a	more cleanup, plus now keyfile associated with user directly	2017-09-12 10:55:27 -07:00
David Kelly	61e8458d13	some cleanup	2017-09-12 08:08:41 -07:00
Sam Gateau	3669e66619	trying to update the transform at the right time in overlays	2017-09-12 00:02:54 -07:00
samcake	01e4bfc53e	Trying to avoid calling getTransform on nestables from render thread	2017-09-11 17:36:10 -07:00
David Kelly	5c12403b7c	first working pass at single file. Cleanup needed	2017-09-11 16:40:21 -07:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
David Kelly	4acbc2bfba	Just write the image file in the format we will use later	2017-09-11 13:03:21 -07:00
Howard Stearns	54deef8f32	Merge pull request #11329 from davidkelly/dk/walletSSLFix ... fix wallet for new openssl	2017-09-11 10:07:12 -07:00
samcake	934364ec59	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-11 09:55:47 -07:00
Chris Collins	47a9337aa7	Merge pull request #11323 from jherico/mac_fixes ... Mac fixes	2017-09-11 09:10:50 -07:00
Cain Kilgore	b69bd0ef49	Removed old Disconnect	2017-09-09 17:23:18 +01:00
Cain Kilgore	f6e22b0733	Changes ... The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.	2017-09-09 17:21:42 +01:00
Cain Kilgore	0820eadc5b	Fixed a thing	2017-09-08 23:52:04 +01:00
Cain Kilgore	387e474889	WIP	2017-09-08 23:48:09 +01:00
Cain Kilgore	f109a86b23	Fixed small crash bug on exit	2017-09-08 23:05:22 +01:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -07:00
David Kelly	c142215935	oops -- this is a windows-only thing (like so many other problems)	2017-09-08 12:52:12 -07:00
David Kelly	3e0b222ec4	fix wallet for new openssl	2017-09-08 11:44:19 -07:00
samcake	6fab8df8d2	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-08 09:13:29 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
Daniela	758f049f30	Correct offset for teleport pad.	2017-09-08 14:02:26 +01:00
Daniela	10e29d1cf0	Decrease offset for teleport pad. Add Bubble orientation and scale correction.	2017-09-08 12:45:29 +01:00
Daniela	fde5e14c04	Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man	2017-09-08 11:54:43 +01:00
Daniela	9eb429b25a	Fix offset for teleport pad.	2017-09-08 11:23:19 +01:00
David Kelly	bb07a586ca	warning, plus salting passphrase now	2017-09-07 19:24:31 -07:00
Cain Kilgore	b953c49461	Commit for Better Logger - WL 21537	2017-09-08 03:20:55 +01:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
samcake	73ec095235	fooling around with communicating the update transform to render thread through a trasnaction, not the solution yet	2017-09-07 17:58:16 -07:00
Anthony J. Thibault	7ca498dc7f	Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.	2017-09-07 16:28:08 -07:00
Anthony J. Thibault	f4f9c29bff	Fix for avatar scale preferences	2017-09-07 15:30:16 -07:00
Anthony J. Thibault	d0f9a20a01	Fix for tablet grabbing at small scales	2017-09-07 15:10:15 -07:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Stephen Birarda	7859b3b11f	remove image compression choices from Interface settings	2017-09-07 12:07:57 -07:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Chris Collins	12d720805c	Merge pull request #11319 from jherico/async_qml_load_crash ... Fix potential crash on asynchronous QML loads	2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Daniela	d11a749365	Refactor 1 line. Pad alignment is correct.	2017-09-07 19:28:36 +01:00
Daniela	94e26a554d	Add 180 degrees rotation so that pad faces the avatar	2017-09-07 18:48:20 +01:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Daniela	4c302b899d	Fix teleport pad alignment	2017-09-07 17:52:09 +01:00
Daniela	3ff707f27e	Add Avatar resize compatible teleport pad alignment	2017-09-07 13:31:41 +01:00
samcake	e48c456d24	Trying to sync the render transform for overlay web at the right time...	2017-09-06 17:57:18 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
Daniela	37f959d749	Add Avatar resize compatible teleport pad alignment	2017-09-06 19:45:58 +01:00
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
Chris Collins	8563a05431	Merge pull request #11255 from misslivirose/feat/tablet-tutorial ... Removing tutorial paths for first run experience	2017-09-06 09:23:45 -07:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
Liv	930243539c	add back first run to false and fix formatting	2017-09-05 17:50:25 -07:00
anshuman64	3a44c6977e	Merge pull request #11300 from ElderOrb/case7196 ... 7196 Mouse pointer no longer visible in HMD mode	2017-09-05 17:42:36 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Thijs Wenker	08baa96dc9	Merge pull request #11296 from misslivirose/fix-content-message ... More detailed domain replacement message	2017-09-06 00:44:48 +02:00
Anthony J. Thibault	23ff1b9ead	Fixes for scaling controller display ... Adds MyAvatar.sensorToWorldScaleChanged signal.	2017-09-05 15:03:41 -07:00
Dante Ruiz	9f2bdce190	Merge pull request #11005 from Armads/WL21424 ... WL21424 hide head attachments when head joint is hidden	2017-09-05 13:04:14 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
Anthony J. Thibault	f0912987a3	Fix ray picks against HUD sphere at different sensor scale factors	2017-09-05 10:03:19 -07:00
vladest	87a5a6a5b9	Merge branch 'master' into webbrowser_updates	2017-09-05 13:12:27 +02:00
vladest	6de00c7969	Implemented suggestions popup. Cleanup	2017-09-05 13:11:52 +02:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode ... The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
Stephen Birarda	55d44a8c8f	Merge pull request #11285 from Atlante45/feat/baking-enabled ... Wire "Use baked" checkbox	2017-09-01 16:25:49 -07:00
David Kelly	47cd47f819	log when no passphrase was set before trying to decrypt	2017-09-01 14:50:45 -07:00
David Kelly	feaa8d3120	Someday, a real rain will come and wash Wallet.cpp ... Till then, this little change will have to do.	2017-09-01 14:06:43 -07:00
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
Liv	7eab80e494	change message when permissions to replace domain content are not present	2017-09-01 13:17:37 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
David Kelly	655dc61ff2	doh	2017-09-01 10:16:45 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
Liv	8d21b286b4	string fix	2017-08-31 19:34:01 -07:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Anthony J. Thibault	a1b94fd9d2	Bug fixes for laser offset and avatar hold action	2017-08-31 17:26:00 -07:00
David Kelly	451936214d	initial stab at changing passphrase	2017-08-31 17:05:55 -07:00
David Kelly	1eb503f526	we are qt5.6 on mac	2017-08-31 16:49:12 -07:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
David Kelly	f8341ce1da	warning	2017-08-31 13:24:07 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
Atlante45	764e5d2e4c	Move constant to central location	2017-08-31 13:08:18 -07:00
Atlante45	da2bede6fe	Hide .baked items from the Asset Browser	2017-08-31 13:08:18 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
Anthony J. Thibault	6e6687c3a6	Change tablet dimensions as sensorToWorldScale changes	2017-08-30 18:21:25 -07:00
Zach Fox	913618ded5	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 16:13:50 -07:00
Anthony J. Thibault	c9cdaadeb5	Better scale support in SpatiallyNestable class. ... Previously avatar used SpatiallyNestable scale to keep track of model rendering scale. It now uses a new member variable _modelScale instead. This is important because the notion of "Avatar" space does NOT include scale, so this is now reflected correctly in the SpatiallyNestable class. Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale field. a new _dimensions member variable is used instead. The SpatiallyNestable scale field for entities should always be one. Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale. This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint. Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions. Added qDebug stream support for Transform class.	2017-08-30 15:46:36 -07:00
Zach Fox	dbb7023fc1	Fix warnings	2017-08-30 15:26:25 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	fdcc149c34	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 13:27:18 -07:00
vladest	903036a709	Merge branch 'master' into tablet_login_button	2017-08-30 22:12:03 +02:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
Zach Fox	e0878e7a3f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2	2017-08-30 11:07:24 -07:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Liv	2f2b406047	Remove unneeded handcontrollertype code from handle first run checks	2017-08-30 09:23:33 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ ... CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
Liv	59deccaeb5	Remove unused skipTutorial code	2017-08-29 14:55:59 -07:00
Zach Fox	91f4e59f61	Misc fixes. Get started.	2017-08-29 12:33:44 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
Atlante45	ca62e7168c	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-28 11:41:23 -07:00
Anthony J. Thibault	5230b03f4f	clang warning fixes	2017-08-28 10:35:03 -07:00
David Kelly	3955624e63	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-28 10:13:21 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Sam Gateau	a98d861600	Merge pull request #11242 from SamGondelman/tabletLayer2 ... Web overlays and entities are always non anti-aliased	2017-08-28 09:10:14 -07:00
vladest	d8fb7300c3	Merge branch 'master' into tablet_login_button	2017-08-28 16:59:35 +02:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
vladest	78aa5820d0	Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings	2017-08-27 11:56:28 +02:00
vladest	7796946343	Merge branch 'master' into audio_devices_split	2017-08-26 20:00:00 +02:00
Anthony J. Thibault	937f400534	Bug fixes for Avatar::getEyeHeight() when no feet joints are present	2017-08-25 18:23:19 -07:00
Liv	59fe5ffdc1	Initial attempt at changing first run behavior	2017-08-25 17:48:35 -07:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
Anthony J. Thibault	3ac09b7716	Fix run blends and removed debug draws	2017-08-25 15:48:53 -07:00
Anthony J. Thibault	4f830cf1dc	Calculate jump speed based on canonical jump height.	2017-08-25 15:34:51 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
David Kelly	b942faa60e	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-25 14:16:31 -07:00
David Kelly	5bbe3c5a94	Merge pull request #11246 from davidkelly/dk/encryptionBug ... security image bug	2017-08-25 14:14:22 -07:00
David Kelly	f015ac3c68	get transaction history into qml	2017-08-25 13:55:38 -07:00
Zach Fox	e606e3dfb3	Squashed commit of the following: ... commit 453897b9e2 Author: Zach Fox <fox@highfidelity.io> Date: Fri Aug 25 10:56:53 2017 -0700 Huge cleanup!	2017-08-25 11:45:37 -07:00
David Kelly	0f722992a5	add delete to client of decryptFile	2017-08-25 11:24:37 -07:00
Elisa Lupin-Jimenez	4c40e3bdf4	fixed weird info box display of filenames	2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez	7cee80f0cf	my own objects (or rather objects with low poly count) download now	2017-08-25 11:09:11 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
Atlante45	28c9aa031c	Setup script model status	2017-08-25 10:54:34 -07:00
Anthony J. Thibault	e0ff7f5f40	Moved speed constants into AvatarConstants.h	2017-08-25 10:47:54 -07:00
David Kelly	c316e50f0f	security image bug	2017-08-25 10:29:40 -07:00
Anthony J. Thibault	dd9ee28b18	Adjust avatar walking and flying speed based on sensor scale factor	2017-08-25 10:10:23 -07:00
Andrew Meadows	4d7700b774	Merge pull request #11243 from SamGondelman/sharks ... Fix ray pick crash on shutdown	2017-08-25 09:01:14 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
Armads	b30562b9ce	Adding checks to hide avatar attachments to other head and facial joints	2017-08-25 10:25:34 -04:00
vladest	be56cab8e1	Merge branch 'master' into tablet_login_button	2017-08-25 15:50:10 +02:00
Sam Gondelman	4e7818180b	Merge branch 'master' into tabletLayer2	2017-08-24 17:56:44 -07:00
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities ... Threaded rendering of Entities	2017-08-24 17:34:49 -07:00
beholder	cbbe03cee7	6788: You can deselect your current view mode	2017-08-25 02:33:11 +03:00
Chris Collins	43b1e67e4a	Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter ... Create home bookmark for new content sets loaded in	2017-08-24 16:25:04 -07:00
SamGondelman	abaccf9edd	crash on shutdown	2017-08-24 16:00:36 -07:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
SamGondelman	4a49801217	web overlays and entities are always nonAA	2017-08-24 14:23:21 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile ... Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
Zach Fox	baad5f195e	I'm locking something wrong	2017-08-24 12:53:48 -07:00
David Kelly	a299aa7e24	initialize ptr!	2017-08-24 11:37:44 -07:00
Zach Fox	d370eeea2f	Just gotta test	2017-08-24 11:07:58 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
Zach Fox	92e8f84dc5	I understood last night at midnight	2017-08-24 09:43:35 -07:00
Sam Gateau	4a18c5c80e	Merge pull request #11214 from SamGondelman/image3DFix ... Fix Image3DOverlays with fractional alpha	2017-08-24 09:04:02 -07:00
David Kelly	d398adc195	warnings	2017-08-24 08:48:26 -07:00
Brad Hefta-Gaub	5c832eae9c	Merge pull request #11226 from SamGondelman/miceWithLasers ... EntityTreeRender uses RayPick API with precision picking	2017-08-24 08:10:21 -07:00
David Kelly	c77dafdf12	fix warnings, prepare a bit for hooking up the passphrase	2017-08-23 17:43:37 -07:00
Zach Fox	657beef70f	I understand again...getting started again	2017-08-23 17:42:02 -07:00
Liv	1050141b11	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
Zach Fox	88c24c16d7	I finally understand - initial progress	2017-08-23 15:02:07 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
SamGondelman	206862a90f	fix flag bits	2017-08-23 12:20:30 -07:00
Zach Fox	f01d9ddbe7	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-23 11:22:28 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Brad Davis	0a5bef22fc	Allow asynchronous editing of non-QML overlays	2017-08-22 17:12:18 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
Zach Fox	edb64b047f	It compiles!	2017-08-22 16:00:44 -07:00
Zach Fox	ec2a27e68c	Progress	2017-08-22 15:02:06 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
SamGondelman	b8a7fce201	boop	2017-08-22 11:54:55 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
SamGondelman	a904ae1a8a	can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API	2017-08-22 11:41:20 -07:00
Anthony J. Thibault	ffdb10681e	Fix for laser rendering and positioning with sensor scale	2017-08-22 11:07:04 -07:00
Anthony J. Thibault	de2262968e	Fix for CAMERA_RELATIVE controllers with sensor scale	2017-08-22 09:44:32 -07:00
SamGondelman	3a80c6cbe2	fix alpha issues, pipeline issue, clamping issue	2017-08-21 18:09:25 -07:00
Anthony J. Thibault	8e56404c40	Fixes for flying and rotation re-centering in wikiplanet	2017-08-21 17:42:25 -07:00
Anthony J. Thibault	963ddce7bc	Use eye-height to match user and avatar scales, follow fixes ... Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.	2017-08-21 17:42:24 -07:00
Anthony J. Thibault	80b660b258	Added userHeight accessors and preference ... Also made Avatar::getHeight thread-safe	2017-08-21 17:42:23 -07:00
Anthony J. Thibault	d196743986	Added Avatar::getHeight() method	2017-08-21 17:42:22 -07:00
Anthony J. Thibault	a0d72f08ac	Fix for incorrectly scaled avatar collision on startup	2017-08-21 17:42:21 -07:00
Zach Fox	ed5445ec51	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-21 13:09:41 -07:00
SamGondelman	8ebaeddbc4	Merge remote-tracking branch 'upstream/master' into image3DFix	2017-08-21 11:05:44 -07:00
Ken Cooke	099723fe4d	Use RAII to avoid deletion of extended argv while in use	2017-08-20 13:49:26 -07:00
vladest	3783b8a57c	Merge branch 'master' into tablet_login_button	2017-08-19 17:27:46 +02:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -07:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks ... Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Chris Collins	2456126bcc	Merge pull request #11157 from SamGondelman/tabletLayer ... Render non-AA overlays correctly	2017-08-18 14:59:20 -07:00
SamGondelman	f56e952253	properly update image3d render item	2017-08-18 14:21:46 -07:00
howard-stearns	29b717e22d	remove dead code	2017-08-18 14:08:04 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez	65f876acf3	enabled version check	2017-08-18 10:49:40 -07:00
howard-stearns	6e34ab45d6	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2	2017-08-18 10:03:33 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
vladest	2e5e0c94f1	Added login button to Tablet	2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez	4c28b9f09a	attempt to check version of interface	2017-08-17 18:16:41 -07:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
vladest	1a32a6fac3	Merge branch 'master' into audio_devices_split	2017-08-17 17:20:11 +02:00
Zach Fox	a4123e3024	Merge pull request #11201 from zfox23/sam_is_cool ... Allow users to take a snapshot from the Secondary Camera!	2017-08-16 17:03:15 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
vladest	2cca584e58	Merge branch 'master' into audio_devices_split	2017-08-16 22:47:06 +02:00
vladest	15f8bc0141	Keep old function names for compatibility	2017-08-16 22:17:34 +02:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
David Kelly	73e943daaf	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-16 10:13:08 -07:00
Zach Fox	c024bd2d83	Merge pull request #11195 from zfox23/commerce_securityImage1 ... Commerce: First pass at security images (NOT FINAL)	2017-08-16 09:57:55 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
vladest	8326600274	Merge branch 'master' into modal_dialogs_async	2017-08-16 13:48:47 +02:00
SamGondelman	a641fb7a7f	rename qvector findRayIntersection to avoid script conflicts	2017-08-15 18:03:52 -07:00
Zach Fox	d376630bde	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1	2017-08-15 15:03:02 -07:00
vladest	273261ee57	Reworked WindowScriptingInterface browse method for async methods	2017-08-15 23:12:35 +02:00
Liv	aea5f170f2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-08-15 13:58:22 -07:00
Liv	49eab847fd	Refactor handleOctreeFileReplacement, style changes, align with handler for other file types	2017-08-15 13:58:02 -07:00
vladest	8afdb27c1b	Reworked WindowScriptingInterface save method for async methods	2017-08-15 22:55:44 +02:00
Liv	c0fa446b75	Remove domain management scripting interface	2017-08-15 13:49:13 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Anthony Thibault	342f8acff5	Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision ... Improve avatar hand vs body collision	2017-08-15 13:43:21 -07:00
SamGondelman	9bb7e66859	separate raypickscriptinginterface, cleanup	2017-08-15 13:36:41 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
Anthony J. Thibault	6e0ddadb29	Fix for array size.	2017-08-15 11:45:22 -07:00
David Kelly	0f7db74ef1	missed a couple warnings	2017-08-15 11:44:15 -07:00
Anthony J. Thibault	04006a9f76	code review feedback	2017-08-15 11:19:41 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
David Kelly	a6390edf46	ugh	2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
Sam Gateau	2a75cde48a	Merge pull request #11185 from samcake/blue ... Fixing the graphics setting for Ambient Occlusion	2017-08-15 09:26:45 -07:00
Sam Gateau	d624413c14	Merge pull request #11189 from SamGondelman/line3DFix ... Fix drawInFront overlays only rendering in left eye	2017-08-15 09:26:18 -07:00
David Kelly	c08fce967f	forgot a warning	2017-08-15 08:58:16 -07:00
vladest	51a5c30353	Reimplement asset browsing for async	2017-08-15 17:05:55 +02:00
vladest	e9ed05c3ba	Reimplement snapshot dir browser for async	2017-08-15 15:55:36 +02:00
vladest	9aace9e67d	Merge branch 'master' into modal_dialogs_async	2017-08-15 14:57:13 +02:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
David Kelly	ef5863d169	warnings squashed	2017-08-14 16:24:50 -07:00
SamGondelman	8163430282	fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds	2017-08-14 15:03:14 -07:00
David Kelly	170d2b186b	url encode the base64 signature/key	2017-08-14 13:48:09 -07:00
Zach Fox	c1d771842d	Remove context overlay (if present) when removing entity	2017-08-14 13:37:50 -07:00
David Kelly	803a5c6690	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-14 13:15:04 -07:00
David Kelly	b4b592cc00	one key file with (for now) both public and private keys in there	2017-08-14 12:53:10 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
samcake	db1536c521	Reactivate watch dog exit	2017-08-14 10:47:58 -07:00
samcake	05b78b0df0	Just fixing the ao combo box field	2017-08-14 10:46:33 -07:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	63e907e7b6	Merge branch 'master' into modal_dialogs_async	2017-08-12 13:04:52 +02:00
samcake	ff98dedbb2	Debugging the graphics fields activation	2017-08-11 18:10:44 -07:00
Anthony J. Thibault	cd57c0706a	more warning fixes	2017-08-11 17:46:50 -07:00
David Kelly	f784bc42de	Initial cut using RSA keys for now	2017-08-11 16:54:04 -07:00
Anthony J. Thibault	9e1218b4a4	Use k-dop collision to prevent hands from entering body.	2017-08-11 14:50:00 -07:00
howard-stearns	8ee54c7b36	Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce	2017-08-11 11:46:20 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
vladest	af39b5660b	Merge branch 'master' into audio_devices_split	2017-08-11 20:42:49 +02:00
vladest	560696e41c	Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2	2017-08-11 20:39:17 +02:00
SamGondelman	f058781f49	just kidding shared_mutexes are c++17	2017-08-11 10:07:20 -07:00
Anthony J. Thibault	49adf04913	Added Developer > Avatar > Show Detailed Collision menu option	2017-08-10 16:36:09 -07:00
SamGondelman	e4c954e862	merge from master	2017-08-10 16:30:33 -07:00
SamGondelman	353a3e8c68	properly fix AA stenciling	2017-08-10 16:07:40 -07:00
SamGondelman	96b179386f	working on fixing non-AA overlays	2017-08-10 16:07:40 -07:00
Seth Alves	972a24fea9	Merge pull request #11169 from anshuman64/new-branch ... High Fidelity Interface Application Rename	2017-08-10 15:57:10 -07:00
Anthony J. Thibault	ae98974d79	improve 14-dop generation for avatar joint collision ... Also added debug rendering functionality.	2017-08-10 15:52:51 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
SamGondelman	d0d5ac8dd1	switch to stl wherever possible, use bitset instead of unsigned ints	2017-08-10 15:33:55 -07:00
Brad Davis	eb143c42d0	Merge pull request #11168 from sethalves/avatar-url-command-line-flag ... cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 15:18:21 -07:00
Seth Alves	1d07bc3b4e	try, try again	2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez	b0c91547b4	Fixed WebGL rendering	2017-08-10 14:14:09 -07:00
Seth Alves	ff83a8158b	cancel effects of --replaceAvatarURL when avatar is changed with preference dialog	2017-08-10 13:49:48 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
Zach Fox	334f71e4fb	Merge pull request #11166 from howard-stearns/commerce-blance-inventory ... balance and inventory stubs	2017-08-10 13:33:56 -07:00
howard-stearns	8f0fd10e2b	fix	2017-08-10 12:51:05 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
Elisa Lupin-Jimenez	af95d7f892	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-10 10:13:27 -07:00
vladest	b780d4bce3	Merge branch 'master' into modal_dialogs_async	2017-08-10 10:52:35 +02:00
vladest	68e9d335cd	Added async information and critical dialogs	2017-08-10 10:46:06 +02:00
Liv	6bde4db0d7	wrap in marketplace check and change landing point	2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Anthony J. Thibault	4d845bd208	Bug fix for HMD roll causing avatar yaw when standing still ... HMD roll should only cause the avatar to yaw when actively driving.	2017-08-09 15:52:27 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Liv	0784686450	small typo fix	2017-08-09 10:17:31 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Liv	bd1619b1b2	update error message wording	2017-08-09 09:14:46 -07:00
vladest	616f15864a	Ported an some currently not used code	2017-08-09 14:49:15 +02:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
SamGondelman	3645bf04b6	possibly fix most annoying crash	2017-08-08 18:10:53 -07:00
Zach Fox	03729bf165	Actually fix context menu	2017-08-08 16:38:12 -07:00
Zach Fox	871a5ff1ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation	2017-08-08 15:53:22 -07:00
Zach Fox	69fc69cffb	Comment fix and overlay click fix	2017-08-08 15:52:59 -07:00
Zach Fox	7d26d2d88b	Switch and fix overlay clicks	2017-08-08 14:29:44 -07:00
Liv	ab8f5c1288	add user logging detail message	2017-08-08 13:55:07 -07:00
SamGondelman	684001a756	workaround deadlock in editRenderState	2017-08-08 11:11:19 -07:00
Liv	3f30162215	Make spawning point not 0,0,0 and change error message	2017-08-08 09:44:36 -07:00
SamGondelman	6d253fcc5f	cleaning up	2017-08-07 18:37:55 -07:00
SamGondelman	42147640e2	remove LaserPointerManager as a dependency	2017-08-07 14:18:56 -07:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support ... Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00
Zach Fox	07a4beac73	Fix the crash	2017-08-07 10:28:36 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
Ken Cooke	1fc050fdef	Fix _devices access via shared_ptr	2017-08-07 08:11:43 -07:00
Seth Alves	c570d483d8	Merge pull request #11113 from elisa-lj11/zip_drag ... Zip drag (needs review)	2017-08-07 03:17:31 -07:00
Seth Alves	8798e47f99	Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes ... Crash fixes for avatars without Hips, and web overlays	2017-08-06 18:48:07 -07:00
Brad Davis	1ecca9fd29	Merge branch 'master' into zzmp-audio/peak-values	2017-08-06 17:21:00 -07:00
vladest	134bad9534	fixed typo leads to lost touch or mouse release events	2017-08-06 19:09:40 +02:00
SamGondelman	8b1c24e636	added setLockEndUUID, update handControllerGrab and grab	2017-08-04 18:26:11 -07:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57:48 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	57f62f59fb	Merge pull request #11110 from Armads/WL21423 ... Camera mode on startup is determined by user settings and HMD status	2017-08-04 13:16:34 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Brad Hefta-Gaub	0d0a1af166	Merge pull request #11085 from jherico/script_console_crash ... Fix for potential crash in JS console	2017-08-04 11:44:20 -07:00
Anthony J. Thibault	9fdc044ae1	Crash fix for web3d overlays that are not the tablet.	2017-08-04 11:19:59 -07:00
Anthony J. Thibault	85500841fb	Crash fix for avatars that are missing "Hips", "Head" and other required joints.	2017-08-04 11:19:09 -07:00
Dante Ruiz	b72ac63662	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-04 17:19:06 +01:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
Armads	dff4e6e32c	WL21423 Changing order of camera setup steps	2017-08-03 15:40:38 -04:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Armads	24718e2424	WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-03 09:03:23 -04:00
Dante Ruiz	90db4aa9c0	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-02 18:18:17 +01:00
David Kelly	588afaaa85	unused variable...	2017-08-01 16:59:42 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout ... fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
David Kelly	762b409814	unused variable	2017-08-01 16:20:33 -07:00
David Kelly	479d6abc58	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 16:18:20 -07:00
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
anshuman64	9bf4977e09	Merge pull request #11096 from humbletim/21487 ... WL 21487: Fix Camera behavior in Mirror mode	2017-08-01 14:59:06 -07:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
anshuman64	97b4fd4032	Merge pull request #11071 from vladest/fix_menu_landscape ... Fix Landscape mode, when menu pushed in Create mode	2017-08-01 11:29:15 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" ... * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
Brad Davis	bea91be521	Fix for potential crash in JS console	2017-07-31 17:50:30 -07:00
David Kelly	43c8079f03	temporary inspectionMode setting to turn ContextOverlays completely off/on	2017-07-31 13:55:43 -07:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Brad Davis	7d18d2e017	Restore corrected touch event simulation	2017-07-29 08:51:51 -07:00
vladest	3c9ab36416	Remove already already implemented fix	2017-07-29 12:00:41 +02:00
vladest	0333849aa8	Merge branch 'master' into fix_menu_landscape	2017-07-29 11:44:58 +02:00
Brad Davis	5946a965da	Disable touch event emulation for tablet until we fix crash	2017-07-28 18:54:16 -07:00
Chris Collins	cfd9f8b64e	Merge pull request #11077 from jherico/overlay_event_crashes ... Fix overlay event handling thread issues	2017-07-28 15:56:09 -07:00
anshuman64	e11388f7f7	Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal ... Add a "dominant hand changed" signal	2017-07-28 15:17:50 -07:00
Brad Davis	d42052a299	Fix overlay event handling thread issues	2017-07-28 14:56:21 -07:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi ... Midi support for Entities	2017-07-28 10:51:43 -07:00
Andrew Meadows	3ec9640ea1	fix calculation of walk motor for HMD	2017-07-28 09:22:47 -07:00
vladest	45934cb53e	Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode	2017-07-28 18:04:29 +02:00
Brad Davis	bb57504498	Prevent deadlocks from Overlays update logic recursing into other Overlays calls	2017-07-27 19:39:22 -07:00
David Rowe	c1d179eba1	Add "dominant hand changed" signal	2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub	d572510770	Merge pull request #11009 from AndrewMeadows/fix-QueryAACube ... update EntityItem bounding cube when on changed dimensions	2017-07-27 18:21:06 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 ... WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
SamGondelman	e3288a9004	fix flicker, scissor warning, and handControllerGrab sphere size	2017-07-27 11:17:30 -07:00
Anthony J. Thibault	bcb4cc32d2	another clang error fix	2017-07-27 10:26:10 -07:00
Anthony J. Thibault	778c8bf9a7	clang build error fix	2017-07-27 10:08:35 -07:00
Anthony J. Thibault	8f5c41af2d	changed _controllerPoseMap from unordered_map to map	2017-07-27 09:44:37 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	5e4a83dad9	defaultRenderStates, handControllerGrab.js, fix teleport.js a little	2017-07-26 17:58:39 -07:00
Zach Fox	8a7561d61b	IT'S WORKING SOB SOB SOB	2017-07-26 16:35:55 -07:00
Zach Fox	39cb0bc357	WHYYYY DOESN'T THIS WORK	2017-07-26 16:14:35 -07:00
Seth Alves	9c9cfad4c4	use ctrl rather than alt to activate camera-mode shortcuts	2017-07-26 15:56:08 -07:00
Seth Alves	71023bcb1b	Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods	2017-07-26 15:54:57 -07:00
Zach Fox	3a05219c59	Closer still	2017-07-26 14:10:41 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Zach Fox	65c28ca821	Bugfixes	2017-07-26 13:17:51 -07:00
Zach Fox	62f6c10b2b	Renaming things; bugfixes; improvements	2017-07-26 12:45:10 -07:00
Zach Fox	24ddbb4b22	Silly bug preventing the whole thing from working	2017-07-26 12:08:55 -07:00
Zach Fox	9147bc21d0	Getting there.	2017-07-26 11:41:27 -07:00
Liv	be860d6c87	small string fix	2017-07-26 10:20:29 -07:00
Liv	63d637c4db	Add line to move user back to origin to be near new content	2017-07-26 10:02:21 -07:00
Liv	57b27a7bb7	change packet type to be sourced, change from packet list to single packet	2017-07-25 20:17:20 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
Zach Fox	7702bfceaa	Big cleanup and preparation; Actually fix desktop tablet	2017-07-25 16:12:32 -07:00
SamGondelman	3a8ad8b631	switch to QUuids	2017-07-25 15:11:44 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
SamGondelman	0117950546	can edit drawHUDLayer property	2017-07-25 12:57:52 -07:00
Liv	9458e4a1eb	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-07-25 11:32:13 -07:00
Liv	2377e4a5db	fix message formatting	2017-07-25 11:32:02 -07:00
Liv	89a1c7a697	code cleanup	2017-07-25 11:24:57 -07:00
Zach Fox	c71dca5b4b	Missed a magic number	2017-07-25 11:15:44 -07:00
Zach Fox	256b7efdd2	Handle the case when the camera is inside the bounding box of an entity	2017-07-25 11:06:54 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
Zach Fox	40038ce54b	Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays	2017-07-25 09:33:07 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands ... WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Liv	32ddffd9c8	Move logic for confirmation into Application.cpp for handling files directly	2017-07-24 18:09:32 -07:00
Cain Kilgore	280a7a7e42	Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning	2017-07-25 01:48:55 +01:00
Seth Alves	766c6f48c3	third person camera is alt+G rather than alt+O	2017-07-24 17:43:01 -07:00
Anthony J. Thibault	33a1d6e225	Merge branch 'master' into feature/secondary-pose-support	2017-07-24 17:27:33 -07:00
Anthony J. Thibault	9f6641ed10	Shoulder puck calibration work in progress ... * AnimInverseKinematics: debug draw for secondary targets * AnimInverseKienmatics: better clean up of ik target debug draw * GeometryUtil: added findPlaneFromPoints() * ViveControllerManager: external dependency on eigen * ViveControllerManager: record history of left/right hand controllers * ViveControllerManager: use history to determine user shoulder location for better calibration * ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions. * CMake: added external depenency to eigen linear algebra library.	2017-07-24 17:22:48 -07:00
Zach Fox	c22798a8e6	Offset tablet position to left of screen per feedback	2017-07-24 17:16:07 -07:00
Seth Alves	97756e6140	accidently deleted a break	2017-07-24 16:12:03 -07:00
Seth Alves	82a787a753	use alt+h for mirror-mode	2017-07-24 16:04:11 -07:00
Andrew Meadows	8c55476c65	fix motor direction when walking upside down ... also maintain worldUp and remove unnecessary cruft	2017-07-24 16:00:13 -07:00
Andrew Meadows	f598b1f1f5	fix spelling typo in comment	2017-07-24 16:00:13 -07:00
Andrew Meadows	29be9aee65	move nextAttitude() from AvatarData to MyAvatar	2017-07-24 16:00:13 -07:00
Andrew Meadows	f0871c6878	avoid unnecessary and expensive gets	2017-07-24 16:00:13 -07:00
Seth Alves	e53badf88b	use alt+f for 1st person camera and alt+o for 3rd	2017-07-24 15:56:37 -07:00
Seth Alves	afc7eaff8d	Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods	2017-07-24 15:21:37 -07:00
Zach Fox	223ed5b59a	Hack to mod tablet orientation when clicking context overlay	2017-07-24 14:29:06 -07:00
Andrew Meadows	a44b33ab11	Merge pull request #11023 from jherico/audio_deadlock ... Fix for audio deadlock & audio device selection	2017-07-24 14:03:29 -07:00
SamGondelman	ee02a0bff4	fix build error	2017-07-24 12:44:54 -07:00
Cain Kilgore	9ff7891c88	Fixed reference error, Gustavo should build now.	2017-07-24 19:56:02 +01:00
Cain Kilgore	64ba159adf	Updating Small Reference	2017-07-24 19:12:14 +01:00
Cain Kilgore	fd2264f7c9	removed duplicate	2017-07-24 19:05:49 +01:00
Cain Kilgore	e6fd85f45a	Some code cleanup	2017-07-24 19:02:40 +01:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub	0ba8d43522	Merge pull request #10994 from vladest/avatar_default_speeds ... Change default mouse speeds for avatar	2017-07-24 10:13:27 -07:00
Chris Collins	ceb218f4cc	Merge pull request #10798 from humbletim/add-persistent-console-history ... Save JS "Console..." history across sessions	2017-07-24 09:24:04 -07:00
Cain Kilgore	a4cf27402d	Tabs and Cleanup of Code	2017-07-24 06:27:14 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit ... Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
humbletim	300b926464	only call QList::constFirst when history list isn't empty	2017-07-23 14:12:52 -04:00
Liv	76cc833747	move domain management into a separate API	2017-07-21 17:44:53 -07:00
Dante Ruiz	06b4c53d28	only desktop mode	2017-07-22 00:15:26 +01:00
Dante Ruiz	7bf3f45e39	finished the locked default scripts	2017-07-21 23:32:25 +01:00
David Kelly	e7c6ba9ae2	unused var	2017-07-21 14:44:45 -07:00
Zach Fox	811be15bbc	Another attmept to fix the tablet	2017-07-21 14:02:19 -07:00