60257 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	66191a5419	Merge pull request #11291 from ElderOrb/optional-build-tools ... make building tools (besides 'scribe') optional	2017-10-08 10:02:28 -07:00
Seth Alves	e6d0ab5343	Merge pull request #11545 from jherico/fix/text3d_overlay ... Fix rendering transform for text3d overlays	2017-10-08 06:33:12 -07:00
Brad Davis	7aeeaeb4e7	Fix rendering transform for text3d overlays	2017-10-07 19:41:43 -07:00
Brad Hefta-Gaub	06743a1cd9	Merge pull request #11544 from highfidelity/revert-11532-import-av-entities ... Revert "fix importing of avatar entities"	2017-10-07 16:58:22 -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
Brad Hefta-Gaub	80f0bd3b79	Merge pull request #11494 from humbletim/add-console-output-basenames ... [experiment/feedback] Include script name with all JS/QML debug output	2017-10-06 17:58:19 -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
David Rowe	3fbaf250a4	Increase delay in kicking off physics	2017-10-07 11:50:31 +13:00
Seth Alves	f6ff7b3888	Merge pull request #11540 from sethalves/fix-hasCompoundShapeURL ... fix mistaken logic-flip in recent PR	2017-10-06 13:03:18 -07:00
Seth Alves	9064114ce5	fix mistaken logic-flip in recent PR	2017-10-06 11:03:48 -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
Seth Alves	f4dedf05bb	move variables into block that needs them	2017-10-06 11:02:26 -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
David Rowe	105457b388	Don't unbusubscribe from possibly shared channel	2017-10-06 13:27:08 +13:00
Zach Fox	525e0d8f61	Make SettingsScriptingInterface accessible to tablet	2017-10-05 16:51:13 -07:00
Seth Alves	76d5d13914	Merge pull request #11535 from druiz17/mouse-disapears ... Fix mouse disappearing when switching to desktop mode from HMD	2017-10-05 16:03:20 -07:00
Chris Collins	c8301890e6	Merge pull request #11530 from kencooke/audio-mac-bugfix ... Fix microphone audio on the Mac	2017-10-05 15:57:56 -07:00
David Rowe	28c7ef2e97	Merge branch 'master' into vr-edit-a	2017-10-06 11:54:08 +13:00
David Rowe	5c72a41163	Delete some redundant code	2017-10-06 11:14:07 +13:00
David Rowe	5587a2fdf8	Fix creating an entity while a tool is active	2017-10-06 11:13:53 +13:00
druiz17	3139f5ef2a	improve mouseHMD exit logic	2017-10-05 15:12:58 -07:00
druiz17	ba50fcc509	fix mouse dissapearing in desktop mode	2017-10-05 15:07:49 -07:00
David Rowe	1673c08353	Update undo for grouping	2017-10-06 10:42:23 +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
David Rowe	21d286b422	Fix undo not coping with cloning with both hands simultaneously	2017-10-06 10:04:14 +13: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
Cain Kilgore	b3c3b2d34f	Switched Time & Session ID Over	2017-10-05 19:42:31 +01:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
Brad Hefta-Gaub	faa06e78eb	Merge pull request #11472 from huffman/fix/baking-tmp-files ... Add removal of temporary files in FBXBaker	2017-10-05 10:06:39 -07:00
Ken Cooke	8822b1bfa4	Minor cleanup	2017-10-05 09:49:38 -07:00
Ken Cooke	82d13090f9	Better comments	2017-10-05 09:28:30 -07:00
Ken Cooke	d8341a0929	Work around compiler optimization bug	2017-10-05 09:27:07 -07:00
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00
Ryan Huffman	a6d148475b	Add removal of temporary baked files in AssetServer	2017-10-05 09:08:42 -07:00
Ryan Huffman	de2c1aabac	Add removal of temporary files in FBXBaker	2017-10-05 09:08:42 -07:00
Brad Hefta-Gaub	218d58df81	Merge pull request #11528 from Atlante45/fix/macos-build-guide ... Update macOS build guide	2017-10-05 08:32:16 -07:00
Ken Cooke	218de29356	disable compiler optimization as temporary fix	2017-10-05 07:39:21 -07:00
vladest	193dc83b99	Fix alignment of audio devices input header	2017-10-05 13:59:42 +02:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13: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