Commit Graph

12 Commits

Author SHA1 Message Date
GPayne 40bf64fe70 Added exponential zoom for faster zoom with increased distance from focus node 2018-02-17 19:56:36 -07:00
GPayne 9b8aaef1fb Merge master into touch study branch 2018-01-18 15:52:48 -07:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -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 16efa28470 Guard against accessing outside bounds 2017-11-03 15:48:00 +01:00
Emil Axelsson aa63ec68b0 Add debug properties to touch GUI with a compile time flag 2017-11-03 11:28:39 +01:00
Alexander Bock ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Alexander Bock e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock d571970487 Touch module capitalization compile fix 2017-07-19 19:01:10 -04:00
Alexander Bock d246f8fb58 Renaming touch include files 2017-07-19 11:01:02 -04:00