Line endings: LF everywhere
.gitattributes forces LF (CRLF only for .bat/.cmd), core.autocrlf is off; files that differed only by CRLF are normalized.
This commit is contained in:
1 parent
c77c8ec960
commit
ba237ec7dd
7 files changed
+504
-474
No files matched your search
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"Items": [{
|
||||
"id": "kitchen_lamp",
|
||||
"texture": "lamp",
|
||||
"layer": "foreground",
|
||||
"zIndex": 10,
|
||||
"hitArea": {
|
||||
"type": "rect",
|
||||
"x": 0.68,
|
||||
"y": 0.40,
|
||||
"width": 0.08,
|
||||
"height": 0.08
|
||||
},
|
||||
"highlight": {
|
||||
"color": "#FFFF0033",
|
||||
"scale": 1.1,
|
||||
"duration": 0.12
|
||||
},
|
||||
"cursor": "PointingHand",
|
||||
"actions": {
|
||||
"onClick": {
|
||||
"scenario": "scenarios/kitchen_clicked.scenario"
|
||||
},
|
||||
"onHoverEnter": "set cursor_hint Кликни_лампу",
|
||||
"onHoverLeave": "set cursor_hint \"\""
|
||||
}
|
||||
}]
|
||||
}
|
||||
{
|
||||
"Items": [{
|
||||
"id": "kitchen_lamp",
|
||||
"texture": "lamp",
|
||||
"layer": "foreground",
|
||||
"zIndex": 10,
|
||||
"hitArea": {
|
||||
"type": "rect",
|
||||
"x": 0.68,
|
||||
"y": 0.40,
|
||||
"width": 0.08,
|
||||
"height": 0.08
|
||||
},
|
||||
"highlight": {
|
||||
"color": "#FFFF0033",
|
||||
"scale": 1.1,
|
||||
"duration": 0.12
|
||||
},
|
||||
"cursor": "PointingHand",
|
||||
"actions": {
|
||||
"onClick": {
|
||||
"scenario": "scenarios/kitchen_clicked.scenario"
|
||||
},
|
||||
"onHoverEnter": "set cursor_hint Кликни_лампу",
|
||||
"onHoverLeave": "set cursor_hint \"\""
|
||||
}
|
||||
}]
|
||||
}
|
||||
@@ -1 +1 @@
|
||||
test_interactive/click = You clicked the lamp! The interactive object works.
|
||||
test_interactive/click = You clicked the lamp! The interactive object works.
|
||||
@@ -1 +1 @@
|
||||
test_interactive/click = Вы кликнули по лампе! Интерактивный объект работает.
|
||||
test_interactive/click = Вы кликнули по лампе! Интерактивный объект работает.
|
||||
Reference in new issue
Block a user