738 commits

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	66b6be1302	fixed weird merge conflicts	2017-12-06 17:37:44 -08:00
Elisa Lupin-Jimenez	4ed689672e	can fetch poly asset list synchronously	2017-12-06 16:07:29 -08:00
Elisa Lupin-Jimenez	d6e1a9defe	Created poly scripting interface template	2017-12-05 09:43:01 -08:00
Elisa Lupin-Jimenez	7bb44f4139	Created poly scripting interface template	2017-12-04 16:46:58 -08:00
Olivier Prat	e9743d4c95	Added jsdoc to SelectionScriptingInterface	2017-11-02 10:00:30 +01:00
Olivier Prat	f2444f9a30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-02 09:25:07 +01:00
Ryan Downe Karpf	28a99fe685	Merge pull request #11655 from dback2/tabletcontextualmode ... add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-30 08:56:26 -07:00
David Back	08a6eb4dd3	reset tablet contextual mode back to false when toggling tablet show/hide	2017-10-24 15:50:09 -07:00
Zach Fox	48c8d52c09	Cleanup	2017-10-24 13:30:27 -07:00
David Back	b5f1793863	add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place	2017-10-23 14:21:18 -07:00
Olivier Prat	732fe3b8db	Improved outline debugging script for easier test plan	2017-10-20 11:32:43 +02: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
SamGondelman	403b18977b	remove unused HFMetaEvents	2017-10-11 14:37:23 -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	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -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
Ryan Huffman	9c120f1194	Update AssetMappingsScriptingInterface to not open file for activity event	2017-10-10 09:44:13 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -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	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
druiz17	68780f56b7	Merge branch 'master' of github.com:highfidelity/hifi into fix-hud-module	2017-10-02 14:06:26 -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
druiz17	20918641f4	saving work	2017-09-29 16:48:25 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -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
Ryan Huffman	ff019d6195	Fix extension detection when tracking asset uploads	2017-09-28 13:56:49 -07:00
Ryan Huffman	97bf093cab	Fix ambiguous conversion in AssetMappingScriptingInterface	2017-09-28 08:16:54 -07:00
Atlante45	eb06c33187	Naming coding standard fix	2017-09-27 15:32:53 -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
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
beholder	24a12a2f8f	7722 Add onHover Outline to Tablet "X" Button	2017-09-26 22:31:56 +03:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
Atlante45	8583be41ce	Don't refresh if not connected to the Asset Server	2017-09-21 18:57:09 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -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
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	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	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Atlante45	7d9daea0f6	Transmit baking errors to interface for display.	2017-09-13 09:54:54 -07:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -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