Commit graph

9 commits

Author SHA1 Message Date
ZappoMan
5dddca37ca fix default shape of zones 2015-04-23 13:44:39 -07:00
Atlante45
0b1d4fb1d6 Merge branch 'master' of https://github.com/highfidelity/hifi into zones 2015-04-23 21:16:11 +02:00
Ryan Huffman
e0d4a0b1e1 Add functionality to turn zone picking off 2015-04-23 09:36:41 -07:00
Atlante45
fb4d1d3557 Fix compoundShapeURL reseting shapeType 2015-04-23 14:24:20 +02:00
Atlante45
f117941c8d Macro fixing 2015-04-23 13:25:14 +02:00
Atlante45
3ebe72f025 Fix read macro 2015-04-23 12:12:42 +02:00
Atlante45
7f3be9c89b Add shapeType/compoundShapeURL to ZoneEntities 2015-04-22 21:14:10 +02:00
ZappoMan
e436c95212 first cut at reworking zones 2015-04-21 14:36:13 -07:00
ZappoMan
8ce4cb628a another attempt at zones starting from box 2015-04-20 18:18:01 -07:00