Skip to content

Commit c9057e5

Browse files
Ozone31Ozone31
authored
Merge pull request #3 from miketrethewey/emotracker
Make locations show up on maps
2 parents 22e805e + bc8ccc7 commit c9057e5

File tree

5 files changed

+4417
-1530
lines changed

5 files changed

+4417
-1530
lines changed

‎layouts/broadcast.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//sets the layout for the broadcast view
21
{
2+
//sets the layout for the broadcast view
33
"tracker_broadcast": {
44
"type": "array",
55
"orientation": "vertical",

‎layouts/tracker.json‎

Lines changed: 72 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,75 @@
11
{
2-
"tracker_default": {
3-
"type": "container",
4-
"background": "#000000",
5-
"content": {
6-
"type": "dock",
7-
"dropshadow": true,
8-
"content": [
9-
{
10-
"type": "dock",
11-
"dock": "bottom",
12-
"content": [
13-
{
14-
"type": "group",
15-
"header": "Weapons",
16-
"dock": "left",
17-
"margin": "0,0,3,0",
18-
"content": {
19-
"type": "layout",
20-
"h_alignment": "center",
21-
"v_alignment": "center",
22-
"key": "weapons_grid"
23-
}
24-
},
25-
{
26-
"type": "group",
27-
"header": "Level Access",
28-
"dock": "left",
29-
"margin": "0,0,3,0",
30-
"content": {
31-
"type": "layout",
32-
"h_alignment": "center",
33-
"v_alignment": "center",
34-
"key": "levels_grid"
35-
}
36-
},
37-
{
38-
"type": "group",
39-
"header": "Keys",
40-
"dock": "left",
41-
"margin": "0,0,3,0",
42-
"content": {
43-
"type": "layout",
44-
"h_alignment": "center",
45-
"v_alignment": "center",
46-
"key": "keys_grid"
47-
}
48-
},
49-
{
50-
"type": "group",
51-
"header": "Settings",
52-
"dock": "left",
53-
"margin": "0,0,3,0",
54-
"content": {
55-
"type": "layout",
56-
"h_alignment": "center",
57-
"v_alignment": "center",
58-
"key": "setting_grid"
59-
}
60-
}
61-
]
62-
},
63-
{
64-
"type": "dock",
65-
"content": {
66-
"type": "layout",
67-
"key": "tabbed_maps"
68-
}
69-
}
70-
]
2+
"tracker_default": {
3+
"type": "container",
4+
"background": "#000000",
5+
"content": {
6+
"type": "dock",
7+
"dropshadow": true,
8+
"content": [
9+
{
10+
"type": "dock",
11+
"dock": "bottom",
12+
"content": [
13+
{
14+
"type": "group",
15+
"header": "Weapons",
16+
"dock": "left",
17+
"margin": "0,0,3,0",
18+
"content": {
19+
"type": "layout",
20+
"h_alignment": "center",
21+
"v_alignment": "center",
22+
"key": "weapons_grid"
23+
}
24+
},
25+
{
26+
"type": "group",
27+
"header": "Level Access",
28+
"dock": "left",
29+
"margin": "0,0,3,0",
30+
"content": {
31+
"type": "layout",
32+
"h_alignment": "center",
33+
"v_alignment": "center",
34+
"key": "levels_grid"
35+
}
36+
},
37+
{
38+
"type": "group",
39+
"header": "Keys",
40+
"dock": "left",
41+
"margin": "0,0,3,0",
42+
"content": {
43+
"type": "layout",
44+
"h_alignment": "center",
45+
"v_alignment": "center",
46+
"key": "keys_grid"
47+
}
48+
},
49+
{
50+
"type": "group",
51+
"header": "Settings",
52+
"dock": "left",
53+
"margin": "0,0,3,0",
54+
"content": {
55+
"type": "layout",
56+
"h_alignment": "center",
57+
"v_alignment": "center",
58+
"key": "setting_grid"
59+
}
60+
}
61+
]
62+
},
63+
{
64+
"type": "dock",
65+
"content": [
66+
{
67+
"type": "layout",
68+
"key": "tabbed_maps"
69+
}
70+
]
7171
}
72+
]
7273
}
73-
}
74+
}
75+
}

0 commit comments

Comments
 (0)