Commit graph

110 commits

Author SHA1 Message Date
SamGondelman
24ce09f914 generalized pointer, laserpointermanager -> pointermanager 2017-10-20 11:28:48 -07:00
SamGondelman
d7745efc8e one global pickmanager 2017-10-19 16:55:24 -07:00
SamGondelman
3572f7f5db non-templated pickresult wip 2017-10-19 13:41:16 -07:00
SamGondelman
6d6ede075f resolve conflicts 2017-10-17 15:26:32 -07:00
SamGondelman
975a3e5bbb Merge branch 'pointers' of https://github.com/highfidelity/hifi into pointers 2017-10-17 13:23:08 -07:00
SamGondelman
315baeae1f threading fix 2017-10-17 13:22:40 -07:00
SamGondelman
596be8ec27 pickmanager wip 2017-10-17 13:16:37 -07:00
Bradley Austin Davis
50929b780d Add constructor to suppress warning 2017-10-17 12:59:41 -07:00
SamGondelman
429905de51 update scripts to use ignoreItems, fix caching bug 2017-10-16 15:52:17 -07:00
Bradley Austin Davis
3f99e70af0 C++ cleanup for pointers / picking 2017-10-16 14:20:31 -07:00