Zach Fox 9ae5eba12a Remove reliance on QML timer - still need to fix non-circular emoji mask		2019-08-15 13:04:50 -07:00
..
+android_interface	Merge remote-tracking branch 'hifi/master' into android_handshake	2019-02-07 14:44:22 -03:00
+android_questInterface
developer	An afternounwatchign code	2019-08-05 17:54:46 -07:00
modules	CR	2019-08-08 13:49:15 -07:00
simplifiedUI	Remove reliance on QML timer - still need to fix non-circular emoji mask	2019-08-15 13:04:50 -07:00
system	Fix create duplication key conflicting with camera orbit	2019-08-06 17:23:13 -07:00
tutorials
defaultScripts.js	Merge pull request #15856 from PrestonB1123/defaultShortcuts	2019-06-28 15:29:53 -07:00
simplifiedUIBootstrapper.js	Better logic in bootstrapper to not load alread running scripts	2019-07-10 13:23:50 -07:00