Skip to content

Commit 5fd3ac6

Browse files
XAce1337manXXAce1337manX
committed
Stable (CM 0.10.779) (#541)
2 parents 5167402 + 4c7bff0 commit 5fd3ac6

File tree

112 files changed

+2654
-1452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+2654
-1452
lines changed

‎Assets/Editor/SimpleEditorUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private static void SetBuildNumber()
3131
PlayerSettings.bundleVersion = PlayerSettings.bundleVersion.Replace(".0", "." + buildNumber);
3232
}
3333

34-
private const BuildOptions buildOptions = BuildOptions.CompressWithLz4 | BuildOptions.Development;
34+
private const BuildOptions buildOptions = BuildOptions.CompressWithLz4 /*| BuildOptions.Development*/;
3535

3636
private static void BuildWindows()
3737
{

‎Assets/Input/Master.cs

Lines changed: 313 additions & 31 deletions
Large diffs are not rendered by default.

‎Assets/Input/Master.inputactions

Lines changed: 253 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,15 +1824,6 @@
18241824
"processors": "",
18251825
"interactions": "Press",
18261826
"initialStateCheck": false
1827-
},
1828-
{
1829-
"name": "Color Bookmark Modifier",
1830-
"type": "Button",
1831-
"id": "4439bbde-d3c0-49f8-9005-d710ca8202b0",
1832-
"expectedControlType": "Button",
1833-
"processors": "",
1834-
"interactions": "",
1835-
"initialStateCheck": false
18361827
}
18371828
],
18381829
"bindings": [
@@ -1868,17 +1859,6 @@
18681859
"action": "Previous Bookmark",
18691860
"isComposite": false,
18701861
"isPartOfComposite": false
1871-
},
1872-
{
1873-
"name": "",
1874-
"id": "eaa182da-bc19-4c48-b13e-af966ffe9485",
1875-
"path": "<Keyboard>/shift",
1876-
"interactions": "",
1877-
"processors": "",
1878-
"groups": "",
1879-
"action": "Color Bookmark Modifier",
1880-
"isComposite": false,
1881-
"isPartOfComposite": false
18821862
}
18831863
]
18841864
},
@@ -3577,6 +3557,60 @@
35773557
"processors": "",
35783558
"interactions": "Press",
35793559
"initialStateCheck": false
3560+
},
3561+
{
3562+
"name": "Toggle UI Mode Reverse",
3563+
"type": "Button",
3564+
"id": "20bb8021-4bb8-4be2-94c1-9600fd1a8208",
3565+
"expectedControlType": "Button",
3566+
"processors": "",
3567+
"interactions": "Press",
3568+
"initialStateCheck": false
3569+
},
3570+
{
3571+
"name": "Toggle UI Mode (Normal)",
3572+
"type": "Button",
3573+
"id": "841b053b-6c5e-43d5-8fbd-844a62f7efa5",
3574+
"expectedControlType": "Button",
3575+
"processors": "",
3576+
"interactions": "Press",
3577+
"initialStateCheck": false
3578+
},
3579+
{
3580+
"name": "Toggle UI Mode (Hide UI)",
3581+
"type": "Button",
3582+
"id": "e528aa35-53e4-40b4-b036-215fe4563f87",
3583+
"expectedControlType": "Button",
3584+
"processors": "",
3585+
"interactions": "Press",
3586+
"initialStateCheck": false
3587+
},
3588+
{
3589+
"name": "Toggle UI Mode (Hide Grids)",
3590+
"type": "Button",
3591+
"id": "215e2238-53f3-47d8-8e76-41526ab518cd",
3592+
"expectedControlType": "Button",
3593+
"processors": "",
3594+
"interactions": "Press",
3595+
"initialStateCheck": false
3596+
},
3597+
{
3598+
"name": "Toggle UI Mode (Preview)",
3599+
"type": "Button",
3600+
"id": "26ce21ba-1236-4447-ac87-1c720bb83468",
3601+
"expectedControlType": "Button",
3602+
"processors": "",
3603+
"interactions": "Press",
3604+
"initialStateCheck": false
3605+
},
3606+
{
3607+
"name": "Toggle UI Mode (Playing)",
3608+
"type": "Button",
3609+
"id": "7f2f742b-9cdb-43fc-9283-5750cbbb117b",
3610+
"expectedControlType": "Button",
3611+
"processors": "",
3612+
"interactions": "Press",
3613+
"initialStateCheck": false
35803614
}
35813615
],
35823616
"bindings": [
@@ -3605,13 +3639,211 @@
36053639
{
36063640
"name": "button",
36073641
"id": "aa694fd9-9a8b-47b8-a9ac-682e08347b75",
3608-
"path": "<Keyboard>/h",
3642+
"path": "<Keyboard>/e",
36093643
"interactions": "",
36103644
"processors": "",
36113645
"groups": "ChroMapper Default",
36123646
"action": "Toggle UI Mode",
36133647
"isComposite": false,
36143648
"isPartOfComposite": true
3649+
},
3650+
{
3651+
"name": "Keyboard",
3652+
"id": "c3c30551-3541-4ac6-8ea3-08d7d68eb4d3",
3653+
"path": "ButtonWithOneModifier",
3654+
"interactions": "",
3655+
"processors": "",
3656+
"groups": "",
3657+
"action": "Toggle UI Mode Reverse",
3658+
"isComposite": true,
3659+
"isPartOfComposite": false
3660+
},
3661+
{
3662+
"name": "modifier",
3663+
"id": "26fcd8d4-b726-4baf-9a17-e7e252f55b78",
3664+
"path": "<Keyboard>/ctrl",
3665+
"interactions": "",
3666+
"processors": "",
3667+
"groups": "ChroMapper Default",
3668+
"action": "Toggle UI Mode Reverse",
3669+
"isComposite": false,
3670+
"isPartOfComposite": true
3671+
},
3672+
{
3673+
"name": "button",
3674+
"id": "ecf14d89-2c4a-4cd9-b155-8a320aa874d2",
3675+
"path": "<Keyboard>/q",
3676+
"interactions": "",
3677+
"processors": "",
3678+
"groups": "ChroMapper Default",
3679+
"action": "Toggle UI Mode Reverse",
3680+
"isComposite": false,
3681+
"isPartOfComposite": true
3682+
},
3683+
{
3684+
"name": "Keyboard",
3685+
"id": "fd46ba2c-b4fc-4d0a-85a2-f52e94f1056a",
3686+
"path": "ButtonWithOneModifier",
3687+
"interactions": "",
3688+
"processors": "",
3689+
"groups": "",
3690+
"action": "Toggle UI Mode (Normal)",
3691+
"isComposite": true,
3692+
"isPartOfComposite": false
3693+
},
3694+
{
3695+
"name": "modifier",
3696+
"id": "6eafc3d8-5fd7-4d10-9af1-c866d9e8720f",
3697+
"path": "<Keyboard>/ctrl",
3698+
"interactions": "",
3699+
"processors": "",
3700+
"groups": "ChroMapper Default",
3701+
"action": "Toggle UI Mode (Normal)",
3702+
"isComposite": false,
3703+
"isPartOfComposite": true
3704+
},
3705+
{
3706+
"name": "button",
3707+
"id": "0e4da0ef-b8ff-4490-b12d-744fc9acf8bd",
3708+
"path": "<Keyboard>/1",
3709+
"interactions": "",
3710+
"processors": "",
3711+
"groups": "ChroMapper Default",
3712+
"action": "Toggle UI Mode (Normal)",
3713+
"isComposite": false,
3714+
"isPartOfComposite": true
3715+
},
3716+
{
3717+
"name": "Keyboard",
3718+
"id": "52e63839-c79f-44a5-8d43-bb17531baa6d",
3719+
"path": "ButtonWithOneModifier",
3720+
"interactions": "",
3721+
"processors": "",
3722+
"groups": "",
3723+
"action": "Toggle UI Mode (Hide UI)",
3724+
"isComposite": true,
3725+
"isPartOfComposite": false
3726+
},
3727+
{
3728+
"name": "modifier",
3729+
"id": "62ef11c8-b1fc-4dcf-aa1d-86dc76d1a99a",
3730+
"path": "<Keyboard>/ctrl",
3731+
"interactions": "",
3732+
"processors": "",
3733+
"groups": "ChroMapper Default",
3734+
"action": "Toggle UI Mode (Hide UI)",
3735+
"isComposite": false,
3736+
"isPartOfComposite": true
3737+
},
3738+
{
3739+
"name": "button",
3740+
"id": "f6fcc22e-aa0e-4dd2-ac19-e0b2355f4440",
3741+
"path": "<Keyboard>/2",
3742+
"interactions": "",
3743+
"processors": "",
3744+
"groups": "ChroMapper Default",
3745+
"action": "Toggle UI Mode (Hide UI)",
3746+
"isComposite": false,
3747+
"isPartOfComposite": true
3748+
},
3749+
{
3750+
"name": "Keyboard",
3751+
"id": "4db8ca57-cf15-4f6a-9dca-549213894727",
3752+
"path": "ButtonWithOneModifier",
3753+
"interactions": "",
3754+
"processors": "",
3755+
"groups": "",
3756+
"action": "Toggle UI Mode (Hide Grids)",
3757+
"isComposite": true,
3758+
"isPartOfComposite": false
3759+
},
3760+
{
3761+
"name": "modifier",
3762+
"id": "ac76acc1-8c16-4c50-9076-91fc00a23a60",
3763+
"path": "<Keyboard>/ctrl",
3764+
"interactions": "",
3765+
"processors": "",
3766+
"groups": "ChroMapper Default",
3767+
"action": "Toggle UI Mode (Hide Grids)",
3768+
"isComposite": false,
3769+
"isPartOfComposite": true
3770+
},
3771+
{
3772+
"name": "button",
3773+
"id": "9e0ee0f1-9f8a-409c-863b-b9e3b963a85f",
3774+
"path": "<Keyboard>/3",
3775+
"interactions": "",
3776+
"processors": "",
3777+
"groups": "ChroMapper Default",
3778+
"action": "Toggle UI Mode (Hide Grids)",
3779+
"isComposite": false,
3780+
"isPartOfComposite": true
3781+
},
3782+
{
3783+
"name": "Keyboard",
3784+
"id": "f9536119-57b0-4edd-97ca-7a35cfc63f89",
3785+
"path": "ButtonWithOneModifier",
3786+
"interactions": "",
3787+
"processors": "",
3788+
"groups": "",
3789+
"action": "Toggle UI Mode (Preview)",
3790+
"isComposite": true,
3791+
"isPartOfComposite": false
3792+
},
3793+
{
3794+
"name": "modifier",
3795+
"id": "09a48e38-63db-4009-a79c-4d1694c487f8",
3796+
"path": "<Keyboard>/ctrl",
3797+
"interactions": "",
3798+
"processors": "",
3799+
"groups": "ChroMapper Default",
3800+
"action": "Toggle UI Mode (Preview)",
3801+
"isComposite": false,
3802+
"isPartOfComposite": true
3803+
},
3804+
{
3805+
"name": "button",
3806+
"id": "9c319980-2c8a-4fb5-9f85-f13ef906bde8",
3807+
"path": "<Keyboard>/4",
3808+
"interactions": "",
3809+
"processors": "",
3810+
"groups": "ChroMapper Default",
3811+
"action": "Toggle UI Mode (Preview)",
3812+
"isComposite": false,
3813+
"isPartOfComposite": true
3814+
},
3815+
{
3816+
"name": "Keyboard",
3817+
"id": "135d8a00-5a10-4669-9110-d451639d5fcb",
3818+
"path": "ButtonWithOneModifier",
3819+
"interactions": "",
3820+
"processors": "",
3821+
"groups": "",
3822+
"action": "Toggle UI Mode (Playing)",
3823+
"isComposite": true,
3824+
"isPartOfComposite": false
3825+
},
3826+
{
3827+
"name": "modifier",
3828+
"id": "6b748aa3-67ab-4f21-9465-69ac4b166280",
3829+
"path": "<Keyboard>/ctrl",
3830+
"interactions": "",
3831+
"processors": "",
3832+
"groups": "ChroMapper Default",
3833+
"action": "Toggle UI Mode (Playing)",
3834+
"isComposite": false,
3835+
"isPartOfComposite": true
3836+
},
3837+
{
3838+
"name": "button",
3839+
"id": "fd4396f5-7bfb-4a18-846c-3b0813ab0e25",
3840+
"path": "<Keyboard>/5",
3841+
"interactions": "",
3842+
"processors": "",
3843+
"groups": "ChroMapper Default",
3844+
"action": "Toggle UI Mode (Playing)",
3845+
"isComposite": false,
3846+
"isPartOfComposite": true
36153847
}
36163848
]
36173849
},

‎Assets/Locales/FirstBoot_ko.asset

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ MonoBehaviour:
7979
m_Metadata:
8080
m_Items: []
8181
- m_Id: 300762994845290496
82-
m_Localized: Tweak ChroMapper's lighting to match other map editors.
82+
m_Localized: "ChroMapper\uC758 \uB77C\uC774\uD2B8\uB97C \uB2E4\uB978 \uB9F5 \uC5D0\uB514\uD130\uC640
83+
\uC77C\uCE58\uD558\uB3C4\uB85D \uC870\uC815\uD569\uB2C8\uB2E4."
8384
m_Metadata:
8485
m_Items: []
8586
references:

0 commit comments

Comments
 (0)