705 commits

Author	SHA1	Message	Date
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07: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
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
Stephen Birarda	55d44a8c8f	Merge pull request #11285 from Atlante45/feat/baking-enabled ... Wire "Use baked" checkbox	2017-09-01 16:25:49 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -07:00
Atlante45	764e5d2e4c	Move constant to central location	2017-08-31 13:08:18 -07:00
Atlante45	da2bede6fe	Hide .baked items from the Asset Browser	2017-08-31 13:08:18 -07:00
Zach Fox	dbb7023fc1	Fix warnings	2017-08-30 15:26:25 -07:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
vladest	78aa5820d0	Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings	2017-08-27 11:56:28 +02:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
Atlante45	28c9aa031c	Setup script model status	2017-08-25 10:54:34 -07:00
vladest	26026cb2b5	Added logout. Truncate username to 8 characters	2017-08-25 17:37:10 +02:00
Zach Fox	3c7fadb1ce	Final touch	2017-08-24 14:30:42 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Zach Fox	baad5f195e	I'm locking something wrong	2017-08-24 12:53:48 -07:00
Zach Fox	d370eeea2f	Just gotta test	2017-08-24 11:07:58 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
Zach Fox	92e8f84dc5	I understood last night at midnight	2017-08-24 09:43:35 -07:00
Zach Fox	657beef70f	I understand again...getting started again	2017-08-23 17:42:02 -07:00
Zach Fox	52ef0f2037	More progress	2017-08-23 16:37:13 -07:00
Zach Fox	88c24c16d7	I finally understand - initial progress	2017-08-23 15:02:07 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
Zach Fox	edb64b047f	It compiles!	2017-08-22 16:00:44 -07:00
Zach Fox	ec2a27e68c	Progress	2017-08-22 15:02:06 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
vladest	e403f7266a	Merge branch 'master' into audio_devices_split	2017-08-22 20:46:03 +02:00