661 commits

Author	SHA1	Message	Date
Brad Davis	288e753eea	Fix font loading from non-QRC html	2018-01-22 16:48:00 -08:00
Brad Davis	d2fe9e2710	PR feedback	2018-01-19 20:24:34 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Brad Davis	c126e4fa1c	Fix automatic binary resources rebuilding	2018-01-14 10:51:16 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Brad Davis	7a7aee770c	Switching to binary resources	2018-01-10 13:39:56 -08:00
Brad Davis	d6dd29b952	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-09 11:43:03 -08:00
Sam Gondelman	02100a405d	Merge pull request #12100 from samcake/blue ... Restore packing of QRC qml and resources to interface.exe in DEV_BUILD	2018-01-08 17:41:34 -08:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
samcake	5a5d475c6c	Reinstall the packing of the qrc in the executable in DEV_build	2018-01-05 14:03:52 -08:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Gabriel Calero	8cac98545a	Fixes for Android	2018-01-04 17:36:10 -03:00
Gabriel Calero	32494a8e24	Set QMLEngine base path for android	2018-01-03 22:13:31 -03:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	829e521320	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:37:33 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
Brad Hefta-Gaub	26ea8bea6a	Merge pull request #11612 from highfidelity/pointers ... Fix tablet intersection bug and start of Pointer migration work (WIP)	2017-10-20 13:53:52 -07:00
Bradley Austin Davis	3f99e70af0	C++ cleanup for pointers / picking	2017-10-16 14:20:31 -07:00
Brad Davis	2ae61cb96b	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
Seth Alves	aa08053a28	fix osx build	2017-10-09 17:34:43 -07:00
Seth Alves	4d2f16efc3	allow project to be built with clang on Linux	2017-10-08 18:01:41 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
beholder	a1e0f31cd8	fix for 'C1128: number of sections exceeded object file format limit'	2017-08-23 00:24:09 +03:00
David Kelly	f784bc42de	Initial cut using RSA keys for now	2017-08-11 16:54:04 -07:00
Brad Davis	5a7a6bab70	Remove PDB files, eliminate sixense	2017-08-02 14:08:46 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Seth Alves	5af07dfb62	more memory-debugger	2017-06-23 08:16:48 -07:00
Seth Alves	7ff576ef18	add memory-debugging macro to some cmake files	2017-06-22 10:07:39 -07:00
Burt Sloane	7022c4009f	midi in and out	2017-06-15 15:18:06 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Brad Davis	2b43a1989f	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Brad Davis	a8de6eab8c	Organize the files in the JS and QML projects to appear in a folder hierarchy	2017-04-20 14:39:06 -07:00
Bradley Austin Davis	0ca0874c52	Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 10:55:04 -07:00
Zach Fox	a231b57472	Merge pull request #9962 from birarda/cmake-with-space ... Fix failing POST_BUILD steps on Windows with spaces in build path	2017-03-23 11:41:38 -07:00
Stephen Birarda	c9d1916eea	fix for build with win path with spaces	2017-03-20 18:24:19 -07:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
sam	d56f982dec	Maybe saving the first ktx textures, testing the save pipeline	2017-02-17 07:54:17 -08:00
Atlante45	588fdd6efa	Add steamworks to interface externals	2016-12-14 16:07:33 -08:00
Atlante45	0dec97fc03	Make Steamworks a plugin	2016-12-14 15:37:49 -08:00
Zach Fox	5e8afb04c7	Potentially fix OSX and Linux build errors?	2016-11-18 14:39:30 -08:00
Zach Fox	fc21cae904	More stable than ever! Uses external GifCreator lib. Still frame timing issues.	2016-11-18 14:39:29 -08:00
Ryan Huffman	5f8cee787f	Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename	2016-11-01 09:07:56 -07:00
Ryan Huffman	0cc98d4501	Add VersionInfo.rc to interface	2016-11-01 09:00:08 -07:00
Stephen Birarda	89a4bc8434	add custom QWebEngine request interceptor	2016-10-17 11:34:10 -07:00