Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
cee960b
remove build-engine-windows script
hobbsythe6th Jul 4, 2026
ddd3416
Merge branch 'Candlestickers:development' into development
hobbsythe6th Jul 5, 2026
cec78b7
Merge branch 'Candlestickers:development' into development
hobbsythe6th Jul 6, 2026
c1680f3
remove vscode deprecation warning, update package-lock and fix export…
hobbsythe6th Jul 6, 2026
6cad53b
Merge branch 'development' of https://github.com/hobbsythe6th/Candles…
hobbsythe6th Jul 6, 2026
e186674
package-lock.json updates
hobbsythe6th Jul 6, 2026
a37b4b4
QoL update: added engine-quickrun script to run build-engine and npm …
hobbsythe6th Jul 6, 2026
622402b
refresher commit
hobbsythe6th Jul 7, 2026
a8aaee9
revert
hobbsythe6th Jul 7, 2026
0f1546d
ran npm audit
hobbsythe6th Jul 7, 2026
24ec394
Merge branch 'Candlestickers:development' into development
hobbsythe6th Jul 8, 2026
1f4387e
remove stuff
hobbsythe6th Jul 8, 2026
0759627
Merge branch 'development' of https://github.com/hobbsythe6th/Candles…
hobbsythe6th Jul 8, 2026
84b5dad
packagelock for my local repo
hobbsythe6th Jul 8, 2026
396dfb4
Added add to asset library button, fixed param mismatch in wickobj ex…
hobbsythe6th Jul 9, 2026
71edc13
Merge branch 'development' into add-to-assets-as-wickobj
hobbsythe6th Jul 23, 2026
7e84a09
less overheads, some checks, numbering
hobbsythe6th Sep 6, 2026
5169e8a
TODO: make clip.asseted false on editing it
hobbsythe6th Sep 6, 2026
10c129b
Made button disappear on adding to asset library, TODO: make clip.ass…
hobbsythe6th Sep 6, 2026
8bf9ce0
Merge branch 'add-to-assets-as-wickobj' of https://github.com/hobbsyt…
hobbsythe6th Sep 6, 2026
acc642c
make leaving focus cause current focus to be marked as 'edited'
hobbsythe6th Sep 6, 2026
99b4437
Merge branch 'development' into add-to-assets-as-wickobj
hobbsythe6th Sep 6, 2026
bd38a4c
make duplicate asset imports rename the import
hobbsythe6th Sep 6, 2026
1a9f8e1
Merge branch 'add-to-assets-as-wickobj' of
hobbsythe6th Sep 6, 2026
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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,12 @@ Then create a production build of the project:
```
npm run build
```
<sup>^ This command is not always needed while testing, you'll need it most prior to deploying your code</sup>
<sup>^ This command is not always needed while testing, you'll need it most prior to deploying your code because it's basically just an optimisation command you don't need to use much</sup>

And lastly, to run your project in development:
```
npm start
<sup>^ Instead of the usual procedure of running build-engine and then running npm start you can just type npm run engine-quickrun instead :)</sup>
```

If it worked, you should see something like this in the terminal.
Expand Down
3 changes: 3 additions & 0 deletions engine/src/base/Clip.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ Wick.Clip = class extends Wick.Tickable {
this._sourceClipUUID = null;

this._assetSourceUUID = null;
this.asseted = false;

/* If objects are passed in, add them to the clip and reposition them */
if (args.objects) {
Expand All @@ -81,6 +82,7 @@ Wick.Clip = class extends Wick.Tickable {
data.singleFrameNumber = this._singleFrameNumber;
data.assetSourceUUID = this._assetSourceUUID;
data.isSynced = this._isSynced;
data.asseted = this.asseted;

return data;
}
Expand All @@ -95,6 +97,7 @@ Wick.Clip = class extends Wick.Tickable {
this._singleFrameNumber = data.singleFrameNumber || 1;
this._assetSourceUUID = data.assetSourceUUID;
this._isSynced = data.isSynced;
this.asseted = data.asseted || false;

this._playedOnce = false;

Expand Down
4 changes: 2 additions & 2 deletions engine/src/export/wickobj/WickObjectFile.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Wick.WickObjectFile = class {

/**
* Create a wick file from the project.
* @param {Wick.Project} clip - the clip to create a wickobject file from
* @param {Wick.Clip} clip - the clip to create a wickobject file from
* @param {string} format - Can be 'blob' or 'dataurl'.
*/
static toWickObjectFile (clip, format, callback) {
Expand All @@ -53,7 +53,7 @@ Wick.WickObjectFile = class {
var data = clip.export();
var json = JSON.stringify(data);
var blob = new Blob([json], {type: "application/json"});

if(format === 'blob') {
callback(blob);
} else if (format === 'dataurl') {
Expand Down
1 change: 1 addition & 0 deletions engine/src/gui/BreadcrumbsButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Wick.GUIElement.BreadcrumbsButton = class extends Wick.GUIElement.Button {
constructor (model) {
super(model, {
clickFn: () => {
this.model.project.focus.asseted = false;
this.model.project.focus = model;
this.projectWasModified();
}
Expand Down
Loading