58197 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
vladest	a87a93d991	Implemented input dialog async functions	2017-08-16 15:35:51 +02:00
vladest	8326600274	Merge branch 'master' into modal_dialogs_async	2017-08-16 13:48:47 +02:00
Liv	36ff82db6b	Merge pull request #11056 from misslivirose/feat/domain-setup ... [Protocol Change] Allow specified users/groups to replace domain content from within Interface	2017-08-15 20:29:25 -07:00
Liv	1ae4a5c019	remove class from function call	2017-08-15 15:30:43 -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
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
Anthony J. Thibault	6e0ddadb29	Fix for array size.	2017-08-15 11:45:22 -07:00
Anthony J. Thibault	04006a9f76	code review feedback	2017-08-15 11:19:41 -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
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
Seth Alves	21cef482a5	Merge pull request #11190 from druiz17/fix-table-dialog ... Fixed unable to select items in a TreeView	2017-08-14 17:05:42 -07:00
SamGondelman	194b7d6655	warning	2017-08-14 16:08:07 -07:00
Dante Ruiz	459f2c5cdc	fixed tab issue	2017-08-14 16:03:12 -07:00
Dante Ruiz	99617600c4	fix selection issue for TreeView.qml	2017-08-14 15:58:28 -07:00
Zach Fox	823f2fb252	Merge pull request #11181 from cain-kilgore/skybox-changer ... WL 21447 - Create a Skybox Changer	2017-08-14 15:08:03 -07:00
Zach Fox	ee4a07b10d	Merge pull request #11187 from zfox23/context_removeWhenDeleting ... Remove context overlay (if present) when removing entity	2017-08-14 15:06:20 -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
Cain Kilgore	e7a4bff705	Made Changes per Review, added js	2017-08-14 22:47:18 +01:00
Anthony Thibault	9af6f2683a	Merge pull request #11083 from Menithal/experimental-face-expressions ... Opened up setForceFaceTrackerConnected	2017-08-14 14:19:08 -07:00
druiz17	97aa92bc44	Merge pull request #11170 from cain-kilgore/web-browser-assets ... Added Assets for Web Browser MP Script	2017-08-14 13:50:11 -07:00
Zach Fox	c1d771842d	Remove context overlay (if present) when removing entity	2017-08-14 13:37:50 -07:00
Zach Fox	a5fc47fc4d	Merge pull request #11186 from zfox23/commerce_jsonInventory ... Commerce: Use new JSON inventory format	2017-08-14 11:59:01 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
samcake	f86f22309b	fix render.json	2017-08-14 11:31:40 -07:00
samcake	465e390f7b	Redisable spectator cam from desktop	2017-08-14 10:49:08 -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
Zach Fox	b3b118c5f7	Merge pull request #11180 from zfox23/commerce_useAsynchronous ... Commerce frontend now uses asynchronous API	2017-08-14 09:58:51 -07:00
druiz17	d5644885fa	Merge pull request #11177 from anshuman64/icon-rename ... Correct desktop icon name	2017-08-14 08:55:17 -07:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
Cain Kilgore	619da8c415	Merge branch 'skybox-changer' of https://github.com/CainFoool/hifi into skybox-changer	2017-08-14 05:12:26 +01:00
Cain Kilgore	28c81534c4	Updated Text at Top	2017-08-14 05:11:53 +01:00
vladest	b604b1bbac	Async file dialogs #1	2017-08-13 11:02:29 +02:00
Cain Kilgore	185c8da491	Changed 6 to six, cause wording. No functionality changes.	2017-08-12 18:52:54 +01: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
Cain Kilgore	8c9f3ae977	Skybox Changer PR	2017-08-12 01:35:48 +01:00
Anthony J. Thibault	f72a94e195	warning fixes	2017-08-11 17:28:50 -07:00
Zach Fox	0835b7b8e6	Bugfix	2017-08-11 16:36:26 -07:00