Skip to content

Update main to reflect live Multiplayer Bitsy version #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JazzTap merged 14 commits into from
Jun 23, 2026
Merged

Update main to reflect live Multiplayer Bitsy version #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1f9ad7a
point to public server
JazzTap Oct 30, 2025
6c4eddc
update from main
JazzTap Mar 13, 2026
0c6d2c1
Merge branch 'public-demo' of github.com:JazzTap/bitsy into public-demo
JazzTap Mar 13, 2026
c8966d4
hotfix bad room_markers merge
JazzTap Mar 13, 2026
f4ce249
Feature: everyone's mouse pointer is shared (but not panel layout)
JazzTap Apr 30, 2026
75351c1
update new game / save game / save data
JazzTap May 1, 2026
d1f7287
button to copy readable instance URL
JazzTap May 1, 2026
b2e1f71
show where peers click
JazzTap May 1, 2026
44be21e
fix branching dialogs and nondeterministic icon loading
JazzTap May 1, 2026
0794ffc
fix scripted games
JazzTap May 1, 2026
2a9a51d
hotfix graphics cache overflow
JazzTap May 27, 2026
f024618
fontmanager fixes
JazzTap Jun 8, 2026
7f86d95
clean animation frames
JazzTap Jun 9, 2026
7bd3d02
fix transient tile renderer confusion
JazzTap Jun 23, 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
10 changes: 8 additions & 2 deletions editor/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,14 @@
<div class="titleWidgetContainer"></div>
</div>

<div id="titleFlexItem" class="bitsy-playmode-disable">
<div style="width: 400px;" id="instanceFlexItem">
<div class="instanceNameContainer"></div>
</div>
<button style="height: 25px;" id="instanceNameCopy">
<label title="copy instance URL" for="instanceNameCopy" id="instanceNameCopyLabel" class="bitsy-menu-label">
<span class="bitsy_icon">open_tool</span>
</label>
</button>

<!-- show tools -->
<input type="checkbox" value="toolsPanel" id="toolsCheck" autocomplete="off" />
Expand Down Expand Up @@ -125,7 +130,7 @@
</div>
</div>

<div id="editorWindow" > <!-- FIXME: onmousewheel="blockScrollBackpage(event);" -->
<div id="editorWindow" >
<div id="editorContent">

<div id="aboutPanel" class="bitsy-card bitsy-card-m bitsy-workbench-item">
Expand Down Expand Up @@ -833,6 +838,7 @@
</div> <!-- Editor Content -->
</div> <!-- Editor Window -->

<canvas id="pointerOverlay" class="overlay"></canvas>
</div>

</body>
Expand Down
10 changes: 7 additions & 3 deletions editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@ import {start,
openFindToolWithCurrentPaintCategory, togglePaintGrid, on_paint_frame1, on_paint_frame2, prevPalette, nextPalette, newPalette,
duplicatePalette, deletePalette, changeColorPickerIndex, prevDialog, nextDialog, addNewDialog, duplicateDialog, deleteDialog, openFindTool,
toggleAlwaysShowDrawingDialog, showInventoryItem, showInventoryVariable, startRecordingGif, stopRecordingGif, takeSnapshotGif, toggleSnapshotMode,
toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect,
on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change
toggleExitOptions, grabCard, onDialogNameChange, onChangeExitTransitionEffect, blockScrollBackpage, copyInstanceURL,
on_drawing_name_change, on_toggle_wall, on_toggle_animated, on_palette_name_change
} from "./script/editor.js"
import {aboutOpenTab} from "./script/tools/about.js"
import {showPanel, hidePanel} from "./script/editor_state.js"
import {showPanel, hidePanel, loadIcons} from "./script/editor_state.js"

loadIcons()
start()

export function testShim (gameTool) {
Expand All @@ -23,6 +24,7 @@ export function bindToolDialogs () {
// I get called during editor initialization by start()

document.querySelectorAll(".bitsy-card-title").forEach(u => u.addEventListener("onmousedown", grabCard))
document.querySelector("#editorWindow").addEventListener("onmousewheel", blockScrollBackpage)

document.querySelector("#dialogShowCodeCheck").addEventListener("click", toggleDialogCode)
document.querySelector("#toolsCheck").addEventListener("click", toggleToolBar)
Expand Down Expand Up @@ -118,4 +120,6 @@ export function bindToolDialogs () {
document.querySelector("#wallCheckbox").addEventListener("change", on_toggle_wall)
document.querySelector("#animatedCheckbox").addEventListener("change", on_toggle_animated)
document.querySelector("#paletteName").addEventListener("change", on_palette_name_change)

document.querySelector("#instanceNameCopy").addEventListener("click", copyInstanceURL)
}
4 changes: 3 additions & 1 deletion editor/script/dialog_editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { rgbToHex } from "./util.js"
import { scriptInterpreter, scriptUtils, titleDialogId } from "./engine/world.js"
import { getTitle, getPal, curDefaultPal, sprite, tile, room, item, dialog, palette, setTitle } from "./engine/bitsy.js"
import { getTitle, getPal, curDefaultPal, sprite, tile, room, item, dialog, palette, blip, tune,
setTitle } from "./engine/bitsy.js"
import { tilesize } from "./system/system.js"

import { ThumbnailRenderer } from "./thumbnail.js"
import { iconUtils, events } from "./editor_state.js"
Expand Down
Loading
Loading