80428 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
dante ruiz	9265e9da3e	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-09-17 12:30:11 -07:00
dante ruiz	975fc47572	fix qml urls and text fields	2019-09-17 12:29:48 -07:00
Ryan Huffman	e03e21c0b4	Add support for symlinks and correct file permissions in qt launcher	2019-09-17 11:13:57 -07:00
dante ruiz	da807e9b29	fixing some ui elements	2019-09-13 15:41:14 -07:00
dante ruiz	54a827c67f	fixing merge conflicts	2019-09-13 15:23:40 -07:00
dante ruiz	7538e100f8	do not recompile qml	2019-09-13 15:04:28 -07:00
Ryan Huffman	a78be7a451	Add passing of tokens to hifi in qt launcher, and remove dead code	2019-09-13 14:57:22 -07:00
Ryan Huffman	21e3e08679	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-09-13 14:10:55 -07:00
Ryan Huffman	93c443abc8	Add qt launcher states, download, and install	2019-09-13 13:57:26 -07:00
Ryan Huffman	93367ce8a4	Add unzipper to qt launcher	2019-09-13 13:56:38 -07:00
dante ruiz	97460c27cf	adding new UI screens	2019-09-09 15:52:42 -07:00
Dante Ruiz	59f490c97e	trying to build resources	2019-09-05 15:19:35 -07:00
dante ruiz	9d62e37a46	fix jekins mac builds	2019-09-05 14:08:36 -07:00
dante ruiz	1583db9463	disable bitcode	2019-09-04 15:09:32 -07:00
dante ruiz	954e5c986a	down grade cmake required version	2019-09-04 10:10:35 -07:00
dante ruiz	4c5de120b7	enable post build script for qt launcher	2019-09-04 09:13:22 -07:00
danteruiz	058343fecc	fix window cmake	2019-09-03 18:05:13 -07:00
dante ruiz	8473acacee	plugin fix	2019-09-03 15:50:59 -07:00
dante ruiz	37db15b5a3	getting mac cmake to work	2019-09-03 14:50:45 -07:00
Ryan Huffman	1f1115f983	Add ApplicationState to qt launcher	2019-08-30 13:41:46 -07:00
danteruiz	3f865a430b	splash screen to login page transititon	2019-08-30 09:10:47 -07:00
danteruiz	255c3e4334	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-08-30 09:00:46 -07:00
Ryan Huffman	44bbe1ea36	Add qt+ssl to qt launcher	2019-08-30 08:51:45 -07:00
danteruiz	1f4e15314c	enable dragging the window	2019-08-30 08:48:25 -07:00
danteruiz	9c062e3228	progrss bar touch up	2019-08-29 15:48:53 -07:00
danteruiz	a7e1efc763	UI Pages	2019-08-29 15:46:58 -07:00
danteruiz	476b7605d5	working on ui pages	2019-08-28 20:18:51 -07:00
danteruiz	1689096967	working on launcher app	2019-08-28 14:24:13 -07:00
danteruiz	2a6252584f	starting HFControls	2019-08-28 13:10:55 -07:00
danteruiz	bb5e62dafd	update gitignore	2019-08-27 16:17:11 -07:00
danteruiz	6d62613888	fixing root.qml	2019-08-27 16:15:10 -07:00
danteruiz	96e0b0cf21	fixing up resources	2019-08-27 16:11:34 -07:00
danteruiz	d5bfe49cd0	get windows qt cmake working	2019-08-27 12:05:14 -07:00
danteruiz	0a2b546017	working on windows cmake version	2019-08-26 16:26:23 -07:00
danteruiz	06d3bb2a34	start qt launcher work	2019-08-26 15:19:23 -07:00
Zach Fox	83ef260941	Merge pull request #16093 from zfox23/emoteTweaks ... BUGZ-1346: Tons of changes to Emote/Emoji system	2019-08-26 10:15:03 -07:00
Zach Fox	497edf6068	Add a comment	2019-08-26 09:03:10 -07:00
Zach Fox	701dd679c7	Change the icons'	2019-08-23 15:18:45 -07:00
Zach Fox	27574dd3f3	Prepare for new emote indicator icon	2019-08-23 14:48:49 -07:00
Zach Fox	860b5d0970	Merge pull request #16092 from RebeccaStankus/MuteIssues ... Fix for PTT not working	2019-08-23 14:47:59 -07:00
Zach Fox	98626b564c	Couple more changes	2019-08-23 14:40:39 -07:00
Zach Fox	dfcf70b9b5	Tons of Emote/Emoji changes	2019-08-23 14:14:53 -07:00
RebeccaStankus	f6a32b9318	Fix for PTT not working comments	2019-08-23 13:46:46 -07:00
RebeccaStankus	f109edbd48	Fix for PTT not working comments	2019-08-23 13:45:32 -07:00
RebeccaStankus	63038d12c2	Fix for PTT not working comments	2019-08-23 13:43:15 -07:00
Shannon Romano	264abe7d0c	Merge pull request #16046 from huffman/feat/mac-launcher-tags ... DEV-316: Add build tags to Mac launcher	2019-08-23 13:41:52 -07:00
Shannon Romano	c31d463b6a	Merge pull request #16038 from huffman/feat/win-launcher-tags ... DEV-256: Add build tags to Windows launcher	2019-08-23 13:40:38 -07:00
RebeccaStankus	85ee61af9d	Fix for PTT not working	2019-08-23 13:35:58 -07:00
Andrew Meadows	b33e5a60c2	Merge pull request #16086 from AndrewMeadows/opaque-polylines ... BUGZ-1170: improved render bounding box for PolyLines; use opaque pipeline when possible	2019-08-23 11:41:19 -07:00
Shannon Romano	af46a180ab	Merge pull request #16091 from luiscuenca/reactionsRefCountFix ... BUGZ-1265: Don't allow reactions refcount go bellow 0	2019-08-23 10:57:56 -07:00