diff --git a/Makefile b/Makefile index 0ed8d71f..d54c387e 100755 --- a/Makefile +++ b/Makefile @@ -67,4 +67,13 @@ build-emscripten-image: run-emc: @mkdir -p $(ARTIFACTS_DIR)/emscripten - docker run --rm -v $(PWD):/src -w /src $(IMAGE_EMSCRIPTEN) bash -lc 'meson setup build-emscripten --cross-file emscripten.cross -Dbuildtype=release -Db_ndebug=true -Ddefault_library=static -Dcpp_std=c++11 && meson compile -C build-emscripten && cp build-emscripten/cell.wasm build-emscripten/cell.js $(ARTIFACTS_DIR)/emscripten/' \ No newline at end of file + docker run --rm -v $(PWD):/src -w /src $(IMAGE_EMSCRIPTEN) bash -lc 'meson setup build-emscripten --cross-file emscripten.cross -Dbuildtype=release -Db_ndebug=true -Ddefault_library=static -Dcpp_std=c++11 && meson compile -C build-emscripten && cp build-emscripten/cell.wasm build-emscripten/cell.js $(ARTIFACTS_DIR)/emscripten/' + +WINFILES = cell.exe steam_api64.dll steam_appid.txt tangletart.bat +WINDIRS = scripts .cell accio prosperon + +win_release: FORCE + make dockerwin + cp build-win/cell.exe . + cp sdk/redistributable_bin/win64/steam_api64.dll . + zip -r $@ $(WINFILES) $(WINDIRS) --exclude=*.git* --exclude=*_doc* --exclude=*_concepts* \ No newline at end of file diff --git a/prosperon/tween.cm b/prosperon/tween.cm index 87e0ff7d..535d1cde 100644 --- a/prosperon/tween.cm +++ b/prosperon/tween.cm @@ -120,6 +120,12 @@ Tween.prototype.seek = function(global_time) { } } +Tween.prototype.cancel = function() { + if (this.engine) { + this.engine.remove(this) + } +} + Tween.prototype.toJSON = function() { return { startVals: this.startVals, diff --git a/tangletart.bat b/tangletart.bat index b2593aa3..9f38e8e7 100644 --- a/tangletart.bat +++ b/tangletart.bat @@ -1,3 +1,3 @@ @echo off -"%~dp0cell.exe" prosperon accio +"%~dp0cell.exe" accio pause