Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion assets/scripts/core/game-scene.js
Original file line number Diff line number Diff line change
Expand Up @@ -5918,7 +5918,8 @@ _buildSettingsPopup() {
{ text: "Editor placing offsets", scale: 0.75, },
{ text: "Pulsing rods reworked a lil", scale: 0.75, },
{ text: "Breakable blocks break now.", scale: 0.75, },
{ text: "I call it, the QOD update.", scale: 0.65, color: 0x708090},
{ text: "Fixed objects not showing in editor", scale: 0.65, },
{ text: "I call it, the QOD update.", scale: 0.6, color: 0x708090},
{ text: "quality of dash", scale: 0.5, color: 0x708090},
{ text: "im like, 90% sure at least ONE feature broke", scale: 0.4, color: 0x708090},
{ text: "Slopes (very buggy)", scale: 0.75, color: 0xff9944 },
Expand Down
7 changes: 4 additions & 3 deletions assets/scripts/core/level-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -1543,9 +1543,10 @@ class LevelEditor {
"GJ_GameSheet02",
"GJ_GameSheet03",
"GJ_GameSheet04",
"FireSheet_01-hd",
"PixelSheet_01-hd",
"GJ_GameSheetEditor",
"GJ_ParticleSheet-uhd",
"GJ_ParticleSheet"
"GJ_ParticleSheet-uhd"
];
for (const key of sheets) {
if (this.textures.exists(key) && this.textures.get(key).has(frameName)) {
Expand All @@ -1556,7 +1557,7 @@ class LevelEditor {


_getTextureRefForFrameThingy(frameName) { // getSheetForFrameThingy: the sequel
const sheets = ["GJ_WebSheet", "GJ_GameSheet", "GJ_GameSheet02", "GJ_GameSheet03", "GJ_GameSheet04", "GJ_GameSheetEditor"];
const sheets = ["GJ_WebSheet", "GJ_GameSheet", "GJ_GameSheet02", "GJ_GameSheet03", "GJ_GameSheet04", "GJ_GameSheetEditor", "PixelSheet_01-hd", "GJ_ParticleSheet-uhd", "FireSheet_01-hd"];
for (const key of sheets) {
if (this.textures.exists(key) && this.textures.get(key).has(frameName)) {
return {
Expand Down