Skip to content

Commit

Permalink
Merge branch 'deepnight:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Lojemiru authored Oct 17, 2023
2 parents d5b3b4e + dc348af commit 1c54c5c
Show file tree
Hide file tree
Showing 58 changed files with 22,385 additions and 864 deletions.
9 changes: 9 additions & 0 deletions .vscode/commandbar.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
"skipTerminateQuickPick": false,
"priority": -23
},
{
"text": "⚡ Main rel",
"color": "yellow",
"commandType":"palette",
"command": "workbench.action.tasks.runTask|Electron Main release",
"alignment": "right",
"skipTerminateQuickPick": false,
"priority": -24
},
{
"text": "🖥️ Term",
"color": "white",
Expand Down
2 changes: 1 addition & 1 deletion app/assets/css/app.min.css

Large diffs are not rendered by default.

36 changes: 15 additions & 21 deletions app/assets/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3415,6 +3415,7 @@ textarea {
width: 200px;
height: 200px;
pointer-events: none;
z-index: 1;

span {
display: block;
Expand Down Expand Up @@ -5542,48 +5543,41 @@ canvas#webgl {

.version {
display: grid;
width: 500px;
padding-left: 16px;
padding-right: 16px;
grid-auto-flow: column;
grid-auto-columns: min-content;
text-align: center;
margin-top: 8px;

white-space: nowrap;
font-size: 0;
color: $bgDark;
font-size: 128px;
font-family: Roboto;
letter-spacing: -0.06em;

background-color: $orange;
border-radius: 4px;

* {
display: inline-block;
// letter-spacing: -0.15em;
font-size: 132px;
}

strong {
padding-left: 8px;
padding-right: 16px;
color: $bgDark;
font-weight: bold;
text-shadow: 0px 0px 32px transparentize($orange, 0.7);
background-color: $orange;
border-radius: 4px;
}

em {
display: none;
}

&.patchRelease {
strong {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
em {
display: inline-block;
padding-right: 16px;
color: $bgLighter;
display: block;
padding-left: 10px;
font-style: normal;
border-radius: 4px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
background-color: $bgMed;
}
}
}
Expand Down Expand Up @@ -8498,7 +8492,7 @@ body.sorting ul.collapsedSortTarget {
font-weight: bold;
font-size: 12pt;
}
&.ruleActive:hover{
&.groupActive:hover{
background-color: transparentize($color: white, $amount: 0.66) !important;
}

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

&.ruleActive .icon {
&.groupActive .icon {
width: 100%;
}
}
Expand Down
104 changes: 83 additions & 21 deletions app/assets/splash.html
Original file line number Diff line number Diff line change
@@ -1,49 +1,111 @@
<html>
<head>
<meta charset="utf-8"/>
<!-- Stylesheets -->
<!-- <link rel="stylesheet" href="css/app.min.css"/> -->
<style type="text/css">
body {
margin: 0;
padding: 0;
padding: 16px;
overflow: hidden;
color: #737f9d;
font-family: Roboto, Arial;
/* border: 1px solid blue; */
}

@font-face {
font-family: Roboto;
src: url("fonts/RobotoCondensed-Light.ttf");
}

@font-face {
font-family: Roboto Bold;
src: url("fonts/RobotoCondensed-Bold.ttf");
}


.wrapper {
display: grid;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
}

.splash {
position: absolute;
display: grid;
grid-template-rows: auto min-content;
gap: 16px;
grid-template-columns: 300px min-content;
box-sizing: border-box;
width: 90%;
height: 90%;
margin: 5%;
padding: 32px;

border-radius: 8px;
background-color: #1e2229;
box-shadow: 0px 0px 16px rgba(0,0,0, 0.5);
overflow: hidden;
box-shadow: 0px 4px 8px rgba(0,0,0, 0.3),
0px 0px 32px rgba(0,0,0, 0.4);
}

.splash img {
.splash .logo {
padding: 16px;
background: #1e2229d3;
border-top: 1px solid #545d7352;
box-shadow: 0px 0px 32px #2c3546a4 inset;
}

.splash .logo img {
width: 100%;
}

.splash .sub {
font-size: 14pt;
font-family: Roboto, Arial;
text-align: center;
.splash .version {
display: grid;
grid-template-columns: min-content min-content;
justify-content: center;

color: #1e2229;
white-space: nowrap;
font-size: 110px;
line-height: 1em;
letter-spacing: -3px;
padding-left: 8px;
padding-right: 16px;

background: #fc0;
}

.splash .version #mainVersion,
.splash .version #patchVersion {
display: flex;
align-items: center;
}
.splash .version #mainVersion {
font-weight: bold;
}
</style>
</head>


<body>
<div class="splash">
<img src="img/LDtk.svg"/>
<div class="sub">Loading...</div>
<div class="wrapper">
<div class="splash">

<div class="logo">
<img src="img/LDtk-simple.svg"/>
</div>

<div class="version">
<span id="mainVersion">???</span>
<span id="patchVersion">???</span>
</div>

</div>
</div>

<script type="text/javascript">
// Write version from args
window.location.search
.substr(1)
.split("&")
.forEach(function (item) {
if( item.split("=")[0]=="patchVersion" )
document.getElementById("patchVersion").innerHTML = item.split("=")[1];
if( item.split("=")[0]=="mainVersion" )
document.getElementById("mainVersion").innerHTML = item.split("=")[1];
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion app/assets/tpl/editAllAutoLayerRules.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2><span class="icon rule"></span> Rules: ::layer::</h2>
<div class="text"></div>
</div>
<input type="text" class="name"/>
<button class="ruleActive transparent"> <span class="icon"></span> </button>
<button class="groupActive transparent"> <span class="icon"></span> </button>
<button class="useWizard">EDIT</button>
<button class="addRule"><span class="icon add"></span></button>
</header>
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_1_basic.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a22d35f0-7820-11ed-b6fd-213e885f30da",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 108,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_2_stamps.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a243f240-7820-11ed-b6fd-f550906acdc3",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 40,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_3_Mosaic.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 64,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_4_Assistant.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a2533480-7820-11ed-b6fd-e9108160ae94",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 531,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_5_Advanced.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a26276c0-7820-11ed-b6fd-ed05d55c9a75",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 106,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/AutoLayers_6_OptionalRules.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a27ed860-7820-11ed-b6fd-7fbe30dcfa27",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 167,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
8 changes: 4 additions & 4 deletions app/extraFiles/samples/Entities.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a2a4fe00-7820-11ed-b6fd-9b53622ece75",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 198,
"identifierStyle": "Capitalize",
"toc": [{
Expand Down Expand Up @@ -563,7 +563,7 @@
"uid": 1,
"tags": ["actor"],
"exportToToc": true,
"doc": "Player start positgion in current level",
"doc": "Player start position in current level",
"width": 20,
"height": 20,
"resizableX": false,
Expand Down
6 changes: 3 additions & 3 deletions app/extraFiles/samples/SeparateLevelFiles.ldtk
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"iid": "a2d9f0b0-7820-11ed-b6fd-010ddaafa733",
"jsonVersion": "1.4.0",
"appBuildId": 470941,
"jsonVersion": "1.4.1",
"appBuildId": 471014,
"nextUid": 10,
"identifierStyle": "Capitalize",
"toc": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"doc": "https://ldtk.io/json",
"schema": "https://ldtk.io/files/JSON_SCHEMA.json",
"appAuthor": "Sebastien 'deepnight' Benard",
"appVersion": "1.4.0",
"appVersion": "1.4.1",
"url": "https://ldtk.io"
},
"identifier": "World_Level_0",
Expand Down
Loading

0 comments on commit 1c54c5c

Please sign in to comment.