Skip to content

Commit a95bdb7

Browse files
deepnightdeepnight
committed
Merge commit '93a380fd41ca5dbe4ddb20dd8b7fa3c83dff412a'
2 parents 6c2aadc + 93a380f commit a95bdb7

Some content is hidden

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

44 files changed

+1709
-851
lines changed

‎.vscode/commandbar.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@
2121
"skipTerminateQuickPick": false,
2222
"priority": -23
2323
},
24+
{
25+
"text": "⚡ Main rel",
26+
"color": "yellow",
27+
"commandType":"palette",
28+
"command": "workbench.action.tasks.runTask|Electron Main release",
29+
"alignment": "right",
30+
"skipTerminateQuickPick": false,
31+
"priority": -24
32+
},
2433
{
2534
"text": "🖥️ Term",
2635
"color": "white",

‎app/assets/css/app.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/assets/css/app.scss

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3415,6 +3415,7 @@ textarea {
34153415
width: 200px;
34163416
height: 200px;
34173417
pointer-events: none;
3418+
z-index: 1;
34183419

34193420
span {
34203421
display: block;
@@ -5542,48 +5543,41 @@ canvas#webgl {
55425543

55435544
.version {
55445545
display: grid;
5545-
width: 500px;
5546+
padding-left: 16px;
5547+
padding-right: 16px;
55465548
grid-auto-flow: column;
55475549
grid-auto-columns: min-content;
55485550
text-align: center;
55495551
margin-top: 8px;
5552+
55505553
white-space: nowrap;
5551-
font-size: 0;
5554+
color: $bgDark;
5555+
font-size: 128px;
5556+
font-family: Roboto;
5557+
letter-spacing: -0.06em;
5558+
5559+
background-color: $orange;
5560+
border-radius: 4px;
55525561

55535562
* {
55545563
display: inline-block;
5555-
// letter-spacing: -0.15em;
5556-
font-size: 132px;
55575564
}
55585565

55595566
strong {
5560-
padding-left: 8px;
5561-
padding-right: 16px;
55625567
color: $bgDark;
55635568
font-weight: bold;
55645569
text-shadow: 0px 0px 32px transparentize($orange, 0.7);
5565-
background-color: $orange;
5566-
border-radius: 4px;
55675570
}
55685571

55695572
em {
55705573
display: none;
55715574
}
55725575

55735576
&.patchRelease {
5574-
strong {
5575-
border-top-right-radius: 0;
5576-
border-bottom-right-radius: 0;
5577-
}
55785577
em {
5579-
display: inline-block;
5580-
padding-right: 16px;
5581-
color: $bgLighter;
5578+
display: block;
5579+
padding-left: 10px;
55825580
font-style: normal;
5583-
border-radius: 4px;
5584-
border-top-left-radius: 0;
5585-
border-bottom-left-radius: 0;
5586-
background-color: $bgMed;
55875581
}
55885582
}
55895583
}
@@ -8498,7 +8492,7 @@ body.sorting ul.collapsedSortTarget {
84988492
font-weight: bold;
84998493
font-size: 12pt;
85008494
}
8501-
&.ruleActive:hover{
8495+
&.groupActive:hover{
85028496
background-color: transparentize($color: white, $amount: 0.66) !important;
85038497
}
85048498

@@ -8507,7 +8501,7 @@ body.sorting ul.collapsedSortTarget {
85078501
background-color: $red;
85088502
}
85098503

8510-
&.ruleActive .icon {
8504+
&.groupActive .icon {
85118505
width: 100%;
85128506
}
85138507
}

‎app/assets/splash.html

Lines changed: 83 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,111 @@
11
<html>
22
<head>
33
<meta charset="utf-8"/>
4-
<!-- Stylesheets -->
5-
<!-- <link rel="stylesheet" href="css/app.min.css"/> -->
64
<style type="text/css">
75
body {
86
margin: 0;
9-
padding: 0;
7+
padding: 16px;
108
overflow: hidden;
119
color: #737f9d;
10+
font-family: Roboto, Arial;
11+
/* border: 1px solid blue; */
12+
}
13+
14+
@font-face {
15+
font-family: Roboto;
16+
src: url("fonts/RobotoCondensed-Light.ttf");
17+
}
18+
19+
@font-face {
20+
font-family: Roboto Bold;
21+
src: url("fonts/RobotoCondensed-Bold.ttf");
22+
}
23+
24+
25+
.wrapper {
26+
display: grid;
27+
align-items: center;
28+
justify-content: center;
29+
width: 100%;
30+
height: 100%;
1231
}
1332

1433
.splash {
15-
position: absolute;
1634
display: grid;
17-
grid-template-rows: auto min-content;
18-
gap: 16px;
35+
grid-template-columns: 300px min-content;
1936
box-sizing: border-box;
20-
width: 90%;
21-
height: 90%;
22-
margin: 5%;
23-
padding: 32px;
24-
2537
border-radius: 8px;
26-
background-color: #1e2229;
27-
box-shadow: 0px 0px 16px rgba(0,0,0, 0.5);
38+
overflow: hidden;
39+
box-shadow: 0px 4px 8px rgba(0,0,0, 0.3),
40+
0px 0px 32px rgba(0,0,0, 0.4);
2841
}
2942

30-
.splash img {
43+
.splash .logo {
44+
padding: 16px;
45+
background: #1e2229d3;
46+
border-top: 1px solid #545d7352;
47+
box-shadow: 0px 0px 32px #2c3546a4 inset;
48+
}
49+
50+
.splash .logo img {
3151
width: 100%;
3252
}
3353

34-
.splash .sub {
35-
font-size: 14pt;
36-
font-family: Roboto, Arial;
37-
text-align: center;
54+
.splash .version {
55+
display: grid;
56+
grid-template-columns: min-content min-content;
57+
justify-content: center;
58+
59+
color: #1e2229;
60+
white-space: nowrap;
61+
font-size: 110px;
62+
line-height: 1em;
63+
letter-spacing: -3px;
64+
padding-left: 8px;
65+
padding-right: 16px;
66+
67+
background: #fc0;
68+
}
69+
70+
.splash .version #mainVersion,
71+
.splash .version #patchVersion {
72+
display: flex;
73+
align-items: center;
74+
}
75+
.splash .version #mainVersion {
76+
font-weight: bold;
3877
}
3978
</style>
4079
</head>
4180

4281

4382
<body>
44-
<div class="splash">
45-
<img src="img/LDtk.svg"/>
46-
<div class="sub">Loading...</div>
83+
<div class="wrapper">
84+
<div class="splash">
85+
86+
<div class="logo">
87+
<img src="img/LDtk-simple.svg"/>
88+
</div>
89+
90+
<div class="version">
91+
<span id="mainVersion">???</span>
92+
<span id="patchVersion">???</span>
93+
</div>
94+
95+
</div>
4796
</div>
97+
98+
<script type="text/javascript">
99+
// Write version from args
100+
window.location.search
101+
.substr(1)
102+
.split("&")
103+
.forEach(function (item) {
104+
if( item.split("=")[0]=="patchVersion" )
105+
document.getElementById("patchVersion").innerHTML = item.split("=")[1];
106+
if( item.split("=")[0]=="mainVersion" )
107+
document.getElementById("mainVersion").innerHTML = item.split("=")[1];
108+
});
109+
</script>
48110
</body>
49111
</html>

‎app/assets/tpl/editAllAutoLayerRules.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2><span class="icon rule"></span> Rules: ::layer::</h2>
2424
<div class="text"></div>
2525
</div>
2626
<input type="text" class="name"/>
27-
<button class="ruleActive transparent"> <span class="icon"></span> </button>
27+
<button class="groupActive transparent"> <span class="icon"></span> </button>
2828
<button class="useWizard">EDIT</button>
2929
<button class="addRule"><span class="icon add"></span></button>
3030
</header>

‎app/extraFiles/samples/AutoLayers_1_basic.ldtk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"doc": "https://ldtk.io/json",
66
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
77
"appAuthor": "Sebastien 'deepnight' Benard",
8-
"appVersion": "1.4.0",
8+
"appVersion": "1.4.1",
99
"url": "https://ldtk.io"
1010
},
1111
"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
12-
"jsonVersion": "1.4.0",
13-
"appBuildId": 470941,
12+
"jsonVersion": "1.4.1",
13+
"appBuildId": 471014,
1414
"nextUid": 108,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],

‎app/extraFiles/samples/AutoLayers_2_stamps.ldtk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"doc": "https://ldtk.io/json",
66
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
77
"appAuthor": "Sebastien 'deepnight' Benard",
8-
"appVersion": "1.4.0",
8+
"appVersion": "1.4.1",
99
"url": "https://ldtk.io"
1010
},
1111
"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
12-
"jsonVersion": "1.4.0",
13-
"appBuildId": 470941,
12+
"jsonVersion": "1.4.1",
13+
"appBuildId": 471014,
1414
"nextUid": 40,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],

‎app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"doc": "https://ldtk.io/json",
66
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
77
"appAuthor": "Sebastien 'deepnight' Benard",
8-
"appVersion": "1.4.0",
8+
"appVersion": "1.4.1",
99
"url": "https://ldtk.io"
1010
},
1111
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
12-
"jsonVersion": "1.4.0",
13-
"appBuildId": 470941,
12+
"jsonVersion": "1.4.1",
13+
"appBuildId": 471014,
1414
"nextUid": 64,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],

‎app/extraFiles/samples/AutoLayers_4_Assistant.ldtk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"doc": "https://ldtk.io/json",
66
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
77
"appAuthor": "Sebastien 'deepnight' Benard",
8-
"appVersion": "1.4.0",
8+
"appVersion": "1.4.1",
99
"url": "https://ldtk.io"
1010
},
1111
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
12-
"jsonVersion": "1.4.0",
13-
"appBuildId": 470941,
12+
"jsonVersion": "1.4.1",
13+
"appBuildId": 471014,
1414
"nextUid": 531,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],

‎app/extraFiles/samples/AutoLayers_5_Advanced.ldtk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
"doc": "https://ldtk.io/json",
66
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
77
"appAuthor": "Sebastien 'deepnight' Benard",
8-
"appVersion": "1.4.0",
8+
"appVersion": "1.4.1",
99
"url": "https://ldtk.io"
1010
},
1111
"iid": "a26276c0-7820-11ed-b6fd-ed05d55c9a75",
12-
"jsonVersion": "1.4.0",
13-
"appBuildId": 470941,
12+
"jsonVersion": "1.4.1",
13+
"appBuildId": 471014,
1414
"nextUid": 106,
1515
"identifierStyle": "Capitalize",
1616
"toc": [],

0 commit comments

Comments
 (0)