10 Commits

Author	SHA1	Message	Date
GPayne	9b8aaef1fb	Merge master into touch study branch	2018-01-18 15:52:48 -07:00
Alexander Bock	47233b8e6f	Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases	2017-12-31 17:31:10 -05:00
Alexander Bock	dcfef3557f	Update copyright header	2017-12-29 20:11:22 +01:00
Alexander Bock	0b0ad54028	Reenable digital universe on default ... Fix refresh rate setting in configuration_helper	2017-12-18 11:58:22 -05:00
Alexander Bock	fc048cd455	Merge branch 'master' into touch-user-study ... # Conflicts: # modules/touch/include/touchmarker.h # modules/touch/src/touchinteraction.cpp # modules/touch/src/touchmarker.cpp	2017-11-09 10:30:45 -05:00
Alexander Bock	b50b52d351	Cleanup for coding style ... Add strict mode to check_style_guide script	2017-11-08 10:35:39 -06:00
Emil Axelsson	2c486ac38b	Fix stack corruption bug in TouchMarker	2017-11-02 20:50:56 +01:00
Alexander Bock	e661324002	Remove style guide errors ... Add missing newline errors	2017-07-21 11:52:25 -04:00
Alexander Bock	669af35b6b	Fix capitalization of includes	2017-07-19 16:42:26 -04:00
Alexander Bock	d246f8fb58	Renaming touch include files	2017-07-19 11:01:02 -04:00