7 commits

Author	SHA1	Message	Date
howard-stearns	542cfb2e11	Merge branch 'vive-ui' of https://github.com/highfidelity/hifi into fix-paused-interactions-with-mouse	2016-06-10 13:02:49 -07:00
howard-stearns	74c5ddd49f	fix paused interactions with mouse	2016-06-07 09:50:10 -07:00
SamGondelman	1994eabc98	grip buttons on vive and touch will make you active in away.js	2016-06-06 16:22:02 -07:00
howard-stearns	41dc9a23a8	More buttons to get out of away/pause.	2016-05-12 15:41:15 -07:00
Zach Pomerantz	bc8a171fde	Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch	2016-04-27 11:55:24 -07:00
James B. Pollack	afb2342781	Merge remote-tracking branch 'upstream/master' into defaultScripts	2016-04-26 16:16:56 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00

Renamed from scripts/default/away.js (Browse further)