61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony J. Thibault	5042b90052	Rig: Fix for debug mode assert	2017-08-24 10:47:48 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
David Kelly	698644c3b4	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-24 10:37:58 -07:00
Zach Fox	3d0fd76997	Temp fix for inventory and buy	2017-08-24 10:24:06 -07:00
Ken Cooke	4a253023ee	float constants	2017-08-24 10:15:54 -07:00
Ken Cooke	c3ff505b73	More aggressive noise gate threshold	2017-08-24 10:06:41 -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
Chris Collins	93457c0e42	Merge pull request #11237 from birarda/feat/ip-check ... add sender sock addr check to DS packet filter operator	2017-08-24 07:51:23 -07:00
David Rowe	9858c05bdb	Pressing header in Tools options takes user back to Tools menu	2017-08-24 21:22:05 +12:00
Chris Collins	751440388a	Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix ... Bug fix for deadlock between EntitySimulation and EntityItem locks.	2017-08-23 20:50:41 -07:00
David Rowe	24202b7fa5	Simplify deleting overlays	2017-08-24 15:26:26 +12:00
David Rowe	a33dbfe9b3	Change Tools menu header content per current tool	2017-08-24 14:30:05 +12: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
Dante Ruiz	dbe8aa77d7	working on laser v tablet	2017-08-23 17:32:41 -07:00
Stephen Birarda	133b7e66b7	adjust a comment and remove some debug	2017-08-23 16:38:23 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
David Rowe	e8a1614499	Remove setting tool icon color	2017-08-24 11:10:41 +12:00
Elisa Lupin-Jimenez	20b6cddc56	attempt to add active tablet button	2017-08-23 15:38:11 -07:00
Stephen Birarda	c122b22dfc	add additional IP check to DS packet filter operator	2017-08-23 15:32:25 -07:00
David Kelly	57d973851e	accidentally left in I guess	2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub	afce8b547a	Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda ... Rig: Use a registry to prevent use after free crashes/corruption	2017-08-23 15:09:28 -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
David Kelly	f655bf2713	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-23 14:53:05 -07:00
Zach Fox	e815946744	Merge pull request #11231 from ElderOrb/Case5830 ... 5830: Go-To menu shows up blank except for address bar	2017-08-23 14:33:04 -07:00
David Rowe	5a1b2babde	Add further items to Create palette	2017-08-24 09:21:54 +12:00
Andrew Meadows	45f194f6bc	use SKIP_TIME again instead of 0.0	2017-08-23 14:05:05 -07:00
Andrew Meadows	4be119b729	make SKIP_TIME work as intended	2017-08-23 14:04:30 -07:00
beholder	9cd784990c	5830: Go-To menu shows up blank except for address bar	2017-08-23 23:27:02 +03: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
Zach Fox	a489267cec	Hide behind switch and remove dead code	2017-08-23 10:48:47 -07:00
druiz17	80eac56c4d	Merge pull request #11233 from jherico/threaded_overlay_edits ... Allow asynchronous editing of non-QML overlays	2017-08-23 09:45:01 -07:00
vladest	34c091114d	Merge branch 'master' into flickable_web_pages	2017-08-23 15:28:57 +02:00
David Rowe	2a2f058898	Fix Tools menu header underline color	2017-08-23 21:59:55 +12:00
David Rowe	be45f600d4	Style Create palette items	2017-08-23 21:56:59 +12:00
David Rowe	1aba95ecb8	Style Tools menu buttons	2017-08-23 18:20:51 +12: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
Dante Ruiz	dc8d0c9604	disable far grab when on hud	2017-08-22 16:51:13 -07:00
Anthony Thibault	bb49bcdcfd	Merge pull request #11223 from ElderOrb/bigobj ... fix for 'C1128: number of sections exceeded object file format limit'	2017-08-22 16:36:49 -07:00
David Kelly	591c031e7b	first pass still broken...	2017-08-22 16:24:25 -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