Skip to content

0.14.0 — The diff & merge release

Choose a tag to compare

View all tags
@cfarrier cfarrier released this 02 Aug 16:02
0.14.0
7252e5b

The diff & merge release: a first-class comparison tool, windows and games that survive compiles, and a Git panel that grew up.

Highlights

  • Diff / Merge tool (Tools → Diff / Merge…): side-by-side diffs of files, folders, or open tabs in framed, splitter-resizable columns — exact changed-span highlighting, change navigation, and merge buttons in the gutter: copy any change (or everything) left or right and Save, so a diff doubles as a merge editor (selective revert on git diffs included).
  • Three-way merge: left/base/right with automatic merging of one-sided changes, per-conflict Take Left/Base/Right/Both, a live editable result, and git-style markers for anything left unresolved.
  • ATE as Unity's diff/merge tool: one Settings click registers ATE in Preferences → External Tools — Unity's version-control diffs and merges open right in ATE. Double-click any file in the Git panel to diff it against its previous version.
  • Everything survives domain reloads: every ATE window (Git panel, Find/Replace with your typed query, History, diff windows mid-merge), your undo history, and the games — running Z-Machine adventures snapshot and resume across compiles and restarts, and Snake and Rogue persist via the new stateful addon lifecycle (AteApi 1.2). Snake gained a pause (Space) and starts paused.
  • Git panel: per-branch colors in the history graph, a draggable splitter, commit inspection with in-place message Amend on HEAD, a clickable HEAD node, and a commit-message draft that survives reloads.
  • Squiggly underlines for errors/warnings/spelling; read-only rendered Markdown that selects and copies like one continuous document; Hidden Characters view; Games menu; Help → Documentation shelf with six new reference docs; status messages flash to catch the eye.

Fixes: the "Approve Anyway" consent loop, dead Git → File History, security-report links, console undo spam, the disappearing update icon, and more — see the full notes.

Install (Unity 6000.0+, via Package Manager → Add package from git URL):

https://github.com/adkom-games/ADKOM_TextEditor.git#0.14.0

Full details: RELEASE-NOTES.md

Assets 2
Loading