Skip to content

Commit bd32ece

Browse files
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents 5b31999 + 6c18a82 commit bd32ece

6 files changed

Lines changed: 594 additions & 205 deletions

File tree

Lines changed: 145 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
{
1+
{
22
"ARENA": {
33
"HOST": "arenaxr.org",
44
"NAMESPACE": "johnchoi",
55
"SCENE": "arena"
66
},
7-
87
"NODE": {
98
"ENTER": "Enter",
109
"EXIT": "Exit"
1110
},
12-
1311
"NPC": {
1412
"NAME": "NPC_RobotBuddy",
1513
"GLTF_URL": "https://arenaxr.org/store/users/johnchoi/Characters/RobotBuddy/RobotBuddyBlue.glb",
1614
"ICON_URL": "https://arenaxr.org/store/users/johnchoi/Characters/RobotBuddy/RobotBuddyBlue.png"
1715
},
18-
1916
"USE_DEFAULTS": {
2017
"ANIMATIONS": true,
2118
"MORPHS": true,
2219
"SOUNDS": true
2320
},
24-
2521
"TIMERS": {
2622
"RESET": {
2723
"INTERVAL": 100,
@@ -32,11 +28,9 @@
3228
"TIMER": 3000
3329
},
3430
"SPEECH": {
35-
"INTERVAL" : 100,
36-
"SPEED" : 3
31+
"INTERVAL": 250
3732
}
3833
},
39-
4034
"UI": {
4135
"USE_NAME_AS_TITLE": false,
4236
"THEME": "light",
@@ -46,70 +40,172 @@
4640
"ICON_WIDTH": 0.5,
4741
"ICON_FILL": "cover"
4842
},
49-
5043
"ROOT": {
5144
"PARENT": "",
52-
"SCALE": {"x":0.8,"y":0.8,"z":0.8},
45+
"SCALE": {
46+
"x": 0.8,
47+
"y": 0.8,
48+
"z": 0.8
49+
},
5350
"SIZE": 0.2,
54-
"POSITION": {"x":7.2,"y":0.0,"z":-2.8},
55-
"ROTATION": {"x":0,"y":0,"z":0},
56-
"COLOR": {"r":255,"g":100,"b":16},
57-
"OPACITY": 0.5
51+
"POSITION": {
52+
"x": 7.2,
53+
"y": 0.0,
54+
"z": -2.8
55+
},
56+
"ROTATION": {
57+
"x": 0,
58+
"y": 0,
59+
"z": 0
60+
},
61+
"COLOR": {
62+
"r": 255,
63+
"g": 100,
64+
"b": 16
65+
},
66+
"OPACITY": 0.5
5867
},
59-
6068
"GLTF": {
61-
"SCALE": {"x":1,"y":1,"z":1},
62-
"POSITION": {"x":0,"y":0,"z":0},
63-
"ROTATION": {"x":0,"y":180,"z":0}
69+
"SCALE": {
70+
"x": 1,
71+
"y": 1,
72+
"z": 1
73+
},
74+
"POSITION": {
75+
"x": 0,
76+
"y": 0,
77+
"z": 0
78+
},
79+
"ROTATION": {
80+
"x": 0,
81+
"y": 180,
82+
"z": 0
83+
}
6484
},
65-
6685
"PLANE": {
6786
"SIZE": 1.2,
6887
"SIZE_DURATION": 500,
69-
"POSITION": {"x":1.5,"y":0.8,"z":0},
70-
"ROTATION": {"x":0,"y":-15,"z":0},
88+
"POSITION": {
89+
"x": 1.5,
90+
"y": 0.8,
91+
"z": 0
92+
},
93+
"ROTATION": {
94+
"x": 0,
95+
"y": -15,
96+
"z": 0
97+
},
7198
"OPACITY": 0.9
7299
},
73-
74100
"SPEECH": {
75101
"TEXT": {
76-
"COLOR" : {"r":250,"g":100,"b":250},
77-
"POSITION" : {"x":0,"y":1.6,"z":0},
78-
"SCALE" : {"x":0.6,"y":0.7,"z":0.7}
102+
"COLOR": {
103+
"r": 250,
104+
"g": 100,
105+
"b": 250
106+
},
107+
"POSITION": {
108+
"x": 0,
109+
"y": 1.6,
110+
"z": 0
111+
},
112+
"SCALE": {
113+
"x": 0.6,
114+
"y": 0.7,
115+
"z": 0.7
116+
}
79117
},
80118
"BUBBLE": {
81-
"POSITION" : {"x":0,"y":1.7,"z":0},
82-
"ROTATION" : {"x":0,"y":5,"z":0},
83-
"SCALE" : {"x":1,"y":1,"z":1}
119+
"POSITION": {
120+
"x": 0,
121+
"y": 1.7,
122+
"z": 0
123+
},
124+
"ROTATION": {
125+
"x": 0,
126+
"y": 5,
127+
"z": 0
128+
},
129+
"SCALE": {
130+
"x": 1,
131+
"y": 1,
132+
"z": 1
133+
}
84134
}
85135
},
86-
87136
"CHOICE": {
88-
"TEXT":{
89-
"COLOR" : {"r":255,"g":255,"b":255},
90-
"SCALE" : {"x":0.4, "y":2, "z":0.5}
137+
"TEXT": {
138+
"COLOR": {
139+
"r": 255,
140+
"g": 255,
141+
"b": 255
142+
},
143+
"SCALE": {
144+
"x": 0.4,
145+
"y": 2,
146+
"z": 0.5
147+
}
91148
},
92-
"BUBBLE":{
93-
"COLOR" : {"r":0,"g":0,"b":200},
94-
"OPACITY" : 0.5,
95-
"POSITION" : {"x":-0.95,"y":0.6,"z":0.4},
96-
"ROTATION" : {"x":0,"y":15,"z":0},
97-
"OFFSET_Y" : 0.25,
98-
"SCALE" : {"x":0.8, "y":0.8, "z":0.8}
99-
}
149+
"BUBBLE": {
150+
"COLOR": {
151+
"r": 0,
152+
"g": 0,
153+
"b": 200
154+
},
155+
"OPACITY": 0.5,
156+
"POSITION": {
157+
"x": -0.95,
158+
"y": 0.6,
159+
"z": 0.4
160+
},
161+
"ROTATION": {
162+
"x": 0,
163+
"y": 15,
164+
"z": 0
165+
},
166+
"OFFSET_Y": 0.25,
167+
"SCALE": {
168+
"x": 0.8,
169+
"y": 0.8,
170+
"z": 0.8
171+
}
172+
}
100173
},
101-
102174
"LINK": {
103175
"TEXT": {
104-
"COLOR" : {"r":255,"g":255,"b":255},
105-
"SCALE" : {"x":0.2, "y":2, "z":0.5}
176+
"COLOR": {
177+
"r": 255,
178+
"g": 255,
179+
"b": 255
180+
},
181+
"SCALE": {
182+
"x": 0.2,
183+
"y": 2,
184+
"z": 0.5
185+
}
106186
},
107187
"BUBBLE": {
108-
"COLOR" : {"r":0,"g":200,"b":100},
109-
"OPACITY" : 0.8,
110-
"POSITION" : {"x":0,"y":0.8,"z":0.7},
111-
"ROTATION" : {"x":0,"y":0,"z":0},
112-
"SCALE" : {"x":1.5, "y":0.2, "z":0.08}
188+
"COLOR": {
189+
"r": 0,
190+
"g": 200,
191+
"b": 100
192+
},
193+
"OPACITY": 0.8,
194+
"POSITION": {
195+
"x": 0,
196+
"y": 0.8,
197+
"z": 0.7
198+
},
199+
"ROTATION": {
200+
"x": 0,
201+
"y": 0,
202+
"z": 0
203+
},
204+
"SCALE": {
205+
"x": 1.5,
206+
"y": 0.2,
207+
"z": 0.08
208+
}
113209
}
114210
}
115-
}
211+
}

0 commit comments

Comments
 (0)