overte-JulianGro/scripts
Thijs Wenker dc9f8895f8 Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties
# Conflicts:
#	scripts/system/html/js/entityProperties.js
2019-04-18 00:21:11 +02:00
..
+android_interface
+android_questInterface
developer wip for getting AvatarInputsBar to switch accordingly 2019-03-22 15:34:06 -07:00
modules Case 20499 - Scripts that use AppUI don't call that.onClosed() if the 2019-03-28 16:05:24 -07:00
system Merge branch 'master' of github.com:highfidelity/hifi into feat/create/editMultipleProperties 2019-04-18 00:21:11 +02:00
tutorials Eliminated some JavaScript warnings due to missing commas 2019-03-28 16:06:31 +02:00
defaultScripts.js adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00