8 commits

Author	SHA1	Message	Date
David Rowe	504516b627	Merge branch 'master' into 20917	2016-05-24 08:03:54 +12:00
Brad Hefta-Gaub	18613908df	Merge pull request #7800 from sethalves/no-fly-zones ... No fly zones	2016-05-20 16:59:55 -07:00
Atlante45	0353e562e4	entityProperties.html handles non object userData	2016-05-20 10:18:32 -07:00
David Rowe	e1d885004f	Fix carat in drop-down boxes	2016-05-18 13:59:13 +12:00
David Rowe	17d41dd7b9	HiFi glyphs font file update with fixed up/down carats ... Update QML and HTML spinboxes accordingly.	2016-05-18 13:25:11 +12:00
Seth Alves	0fe4e42511	added zone properties to allow flying/ghosting or not	2016-05-01 13:53:44 -07:00
James B. Pollack	795d866da9	re add locking/visibility tools to edit.js	2016-04-28 13:29:54 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00