241 commits

Author	SHA1	Message	Date
Brad Davis	9893273d33	Trying to fix AMD crash in QML rendering	2018-01-31 08:36:52 -08:00
Brad Davis	d2fe9e2710	PR feedback	2018-01-19 20:24:34 -08:00
Bradley Austin Davis	537db9acb3	Fixing OSX build	2018-01-15 09:07:20 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	55bfdc105b	Switch android to GLAD	2018-01-14 10:22:18 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	24b83aa0f1	Merge remote-tracking branch 'sam/android-gles' into windows_gles	2018-01-13 11:36:31 -08:00
Brad Davis	6313e3ea69	Allow building on Android with GLAD disabled	2018-01-13 11:31:50 -08:00
Sam Gateau	df0660f823	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -08:00
Brad Davis	51a0131414	Fix linkage	2018-01-12 19:37:28 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Brad Davis	ffbb5442c7	Last GL config fix	2018-01-12 08:58:13 -08:00
Brad Davis	8b2e8706ff	Fixing android GLES config	2018-01-12 00:42:46 -08:00
Brad Davis	22d133c71f	Allow GLES client on desktop builds	2018-01-11 23:31:34 -08:00
Anthony J. Thibault	59b843781e	Merge branch 'master' into feature/dual-quat	2018-01-08 13:18:42 -08:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Anthony J. Thibault	3896b31a72	Line numbers for shader when there are compilation errors	2018-01-04 16:13:46 -08:00
Gabriel Calero	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
Brad Davis	26291e0a75	PR feedback	2017-12-21 07:29:29 -08:00
Bradley Austin Davis	282ae7b6f9	Small fixes	2017-12-11 14:42:37 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Bradley Austin Davis	eb8b892571	Various Mac fixes	2017-09-07 14:45:35 -07:00
Sam Gateau	98cc8c0683	Refining the custom shader pipeline design and registration mechanism	2017-07-12 14:13:58 +02:00
Brad Davis	4439de240a	Trying to fix QtQml/QtScript crashes	2017-06-22 16:39:57 -07:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Sam Cake	2b97171061	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 01:06:01 -07:00
Sam Cake	038d01ce04	Avoiding temp variable reference to appease mac and fixing a warning	2017-04-15 00:45:50 -07:00
Sam Cake	29545f0918	FInally bringing all the shader compilation related fuinctions in the Backend in the same cpp, making specialized version based on the Backend	2017-04-13 23:53:56 -07:00
Seth Alves	36940b4dfe	revert commit that broke sendToScript	2017-04-10 09:11:23 -07:00
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -07:00
samcake	8b4696f4ec	Merge and solve conflicts	2017-04-04 13:28:03 -07:00
Seth Alves	b0b214012c	Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts ... Fix broken eventBridge on tablet after Reload All Scripts.	2017-04-04 10:45:08 -07:00
samcake	a882beb2fd	Trying to fix the overlay Image3D shading pipeline used	2017-04-03 17:35:28 -07:00
Anthony J. Thibault	8ff457a1b6	Fix broken eventBridge on tablet after Reload All Scripts. ... The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object. For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.	2017-04-03 16:03:55 -07:00
samcake	c3c73b209a	Fixing the bad rendering of the instanced primitives on 4.1	2017-04-03 11:49:00 -07:00
Vladyslav Stelmakhovskyi	990e1379e3	Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task ... (cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	7318ec468b	Fixed warning QObject::connect: No such signal Desktop_QMLTYPE_217::sendToScript(QVariant) ... (cherry picked from commit ef4bea2cd4811364e65baec2c48ce2205a0e2cb3)	2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi	e27ccab2f4	Eliminate pathToFonts not found errors at startup. Change TableFiledialog folder on click	2017-03-10 19:53:20 +01:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
Seth Alves	208c4686c4	merge from upstream	2017-01-12 15:44:27 -08:00
Brad Davis	f235a52a6d	Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet	2017-01-11 14:21:29 -08:00
Anthony J. Thibault	00980366d6	Merge branch 'master' into tablet-ui	2017-01-03 09:45:23 -08:00
Brad Hefta-Gaub	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
Seth Alves	dc996bee95	merge from upstream	2016-12-20 08:06:01 -08:00
Brad Davis	9b0d0b3e7a	Updates to tracing, removing log spam	2016-12-19 15:12:48 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00