8 commits

Author	SHA1	Message	Date
SamGondelman	3b877db992	fix hud sphere	2018-03-13 14:58:29 -07:00
Olivier Prat	9cfe53be3e	Merged from orgin taa	2018-02-19 17:50:10 +01:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Olivier Prat	5af4337b0e	Merged with master	2018-01-25 10:11:53 +01:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	3d69ceea71	Re-enable HUD compositing	2018-01-13 11:34:56 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00