Skip to content

Commit

Permalink
Stable (CM 0.10.779) (#541)
Browse files Browse the repository at this point in the history
  • Loading branch information
@XAce1337manX
XAce1337manX committed Jul 27, 2024
2 parents 5167402 + 4c7bff0 commit 5fd3ac6
Show file tree
Hide file tree
Showing 112 changed files with 2,654 additions and 1,452 deletions.
2 changes: 1 addition & 1 deletion Assets/Editor/SimpleEditorUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ private static void SetBuildNumber()
PlayerSettings.bundleVersion = PlayerSettings.bundleVersion.Replace(".0", "." + buildNumber);
}

private const BuildOptions buildOptions = BuildOptions.CompressWithLz4 | BuildOptions.Development;
private const BuildOptions buildOptions = BuildOptions.CompressWithLz4 /*| BuildOptions.Development*/;

private static void BuildWindows()
{
Expand Down
344 changes: 313 additions & 31 deletions Assets/Input/Master.cs
View file

Large diffs are not rendered by default.

274 changes: 253 additions & 21 deletions Assets/Input/Master.inputactions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1824,15 +1824,6 @@
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Color Bookmark Modifier",
"type": "Button",
"id": "4439bbde-d3c0-49f8-9005-d710ca8202b0",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -1868,17 +1859,6 @@
"action": "Previous Bookmark",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "eaa182da-bc19-4c48-b13e-af966ffe9485",
"path": "<Keyboard>/shift",
"interactions": "",
"processors": "",
"groups": "",
"action": "Color Bookmark Modifier",
"isComposite": false,
"isPartOfComposite": false
}
]
},
Expand Down Expand Up @@ -3577,6 +3557,60 @@
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode Reverse",
"type": "Button",
"id": "20bb8021-4bb8-4be2-94c1-9600fd1a8208",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode (Normal)",
"type": "Button",
"id": "841b053b-6c5e-43d5-8fbd-844a62f7efa5",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode (Hide UI)",
"type": "Button",
"id": "e528aa35-53e4-40b4-b036-215fe4563f87",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode (Hide Grids)",
"type": "Button",
"id": "215e2238-53f3-47d8-8e76-41526ab518cd",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode (Preview)",
"type": "Button",
"id": "26ce21ba-1236-4447-ac87-1c720bb83468",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
},
{
"name": "Toggle UI Mode (Playing)",
"type": "Button",
"id": "7f2f742b-9cdb-43fc-9283-5750cbbb117b",
"expectedControlType": "Button",
"processors": "",
"interactions": "Press",
"initialStateCheck": false
}
],
"bindings": [
Expand Down Expand Up @@ -3605,13 +3639,211 @@
{
"name": "button",
"id": "aa694fd9-9a8b-47b8-a9ac-682e08347b75",
"path": "<Keyboard>/h",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "c3c30551-3541-4ac6-8ea3-08d7d68eb4d3",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode Reverse",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "26fcd8d4-b726-4baf-9a17-e7e252f55b78",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode Reverse",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "ecf14d89-2c4a-4cd9-b155-8a320aa874d2",
"path": "<Keyboard>/q",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode Reverse",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "fd46ba2c-b4fc-4d0a-85a2-f52e94f1056a",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode (Normal)",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "6eafc3d8-5fd7-4d10-9af1-c866d9e8720f",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Normal)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "0e4da0ef-b8ff-4490-b12d-744fc9acf8bd",
"path": "<Keyboard>/1",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Normal)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "52e63839-c79f-44a5-8d43-bb17531baa6d",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode (Hide UI)",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "62ef11c8-b1fc-4dcf-aa1d-86dc76d1a99a",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Hide UI)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "f6fcc22e-aa0e-4dd2-ac19-e0b2355f4440",
"path": "<Keyboard>/2",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Hide UI)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "4db8ca57-cf15-4f6a-9dca-549213894727",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode (Hide Grids)",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "ac76acc1-8c16-4c50-9076-91fc00a23a60",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Hide Grids)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "9e0ee0f1-9f8a-409c-863b-b9e3b963a85f",
"path": "<Keyboard>/3",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Hide Grids)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "f9536119-57b0-4edd-97ca-7a35cfc63f89",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode (Preview)",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "09a48e38-63db-4009-a79c-4d1694c487f8",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Preview)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "9c319980-2c8a-4fb5-9f85-f13ef906bde8",
"path": "<Keyboard>/4",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Preview)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Keyboard",
"id": "135d8a00-5a10-4669-9110-d451639d5fcb",
"path": "ButtonWithOneModifier",
"interactions": "",
"processors": "",
"groups": "",
"action": "Toggle UI Mode (Playing)",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "modifier",
"id": "6b748aa3-67ab-4f21-9465-69ac4b166280",
"path": "<Keyboard>/ctrl",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Playing)",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "button",
"id": "fd4396f5-7bfb-4a18-846c-3b0813ab0e25",
"path": "<Keyboard>/5",
"interactions": "",
"processors": "",
"groups": "ChroMapper Default",
"action": "Toggle UI Mode (Playing)",
"isComposite": false,
"isPartOfComposite": true
}
]
},
Expand Down
3 changes: 2 additions & 1 deletion Assets/Locales/FirstBoot_ko.asset
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ MonoBehaviour:
m_Metadata:
m_Items: []
- m_Id: 300762994845290496
m_Localized: Tweak ChroMapper's lighting to match other map editors.
m_Localized: "ChroMapper\uC758 \uB77C\uC774\uD2B8\uB97C \uB2E4\uB978 \uB9F5 \uC5D0\uB514\uD130\uC640
\uC77C\uCE58\uD558\uB3C4\uB85D \uC870\uC815\uD569\uB2C8\uB2E4."
m_Metadata:
m_Items: []
references:
Expand Down
Loading

0 comments on commit 5fd3ac6

Please sign in to comment.