61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
SamGondelman	601b30f062	fix flash when switching display modes	2017-10-05 15:31:45 -07: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
Nissim Hadar	e15699192d	Added blend angle and altitude reference base.	2017-10-05 14:18:03 -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
Nissim Hadar	414cae8df7	Implemented haze colours.	2017-10-05 13:29:32 -07:00
Nissim Hadar	2e2364e03f	WIP - adding haze blend out colour	2017-10-05 13:20:21 -07:00
SamGondelman	6b02cbb911	move locking inside laserpointer and raypick	2017-10-05 13:17:57 -07:00
Nissim Hadar	cbaae2c79b	WIP - haze colour.	2017-10-05 12:59:56 -07:00
Zach Fox	8e82095135	Number sold and limited run	2017-10-05 12:46:20 -07:00
SamGondelman	a6b7578c3c	start fixing asynch issue, fixes model loading!	2017-10-05 12:30:00 -07:00
Nissim Hadar	395d9cbd6b	WIP - haze colour.	2017-10-05 12:13:37 -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
Nissim Hadar	512b469dc6	Added haze colour selector.	2017-10-05 11:31:49 -07:00
Nissim Hadar	1e2bd23c0b	Fixed typo in variable name.	2017-10-05 11:31:08 -07:00
Zach Fox	d605bd9ef4	Preprocess inventory endpoint result	2017-10-05 11:01:15 -07:00
John Conklin II	a63c7c70a2	Merge pull request #11527 from sethalves/rebase-pr-11526 ... allow farGrab module to run when stylus is visible	2017-10-05 10:18:24 -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
Nissim Hadar	595530161a	WIP - adding background blend. ... Haze altitude works.	2017-10-05 09:28:55 -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
Seth Alves	c4de99ac85	Merge pull request #11 from druiz17/rebase-pr-11526 ... fixing laser staying on in edit mode	2017-10-05 09:17:08 -07:00
Nissim Hadar	b7af6a58a6	WIP - adding background blend	2017-10-05 09:16:14 -07:00
druiz17	347645329e	fixing laser staying on in edit mode	2017-10-05 09:11:02 -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
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
Nissim Hadar	ad03301df8	WIP - implementing range+altitude mode.	2017-10-04 23:03:21 -07:00
Nissim Hadar	8b72e3044a	WIP - implementing range+altitude mode.	2017-10-04 22:26:53 -07:00
David Rowe	b526ec0d93	Code review	2017-10-05 18:21:04 +13:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Nissim Hadar	97f775f6f1	Clean-up.	2017-10-04 21:36:42 -07:00