Martín Lucas Golini 66d22ea5bb Add integrated Git conflict resolution workflow ...

Introduce a three-pane UIMergeView with an editable shared result
document, conflict navigation and acceptance actions, live diff
highlighting, synchronized scrolling, and contextual pane labels.

Read conflict stages directly from Git's index, detect paused merge
operations, restore conflict sessions, and support resolving, staging,
recreating, continuing, committing, and aborting operations.

Add repository-aware conflict state handling, safe asynchronous
lifetimes, merge operation UI, configurable key modifiers, i18n
strings, and focused merge-view and Git conflict tests.

2026-08-27 22:18:58 -03:00

..

atlases

Texture packer fixes and new version (this breaks older ETA files). Now the MD5 hash is saved into the texture region info, in order to verify on the texture atlas update if the file changed (instead of relying on the file modification date that's local).

2020-03-02 13:31:00 -03:00

colorschemes

Added documentation to Node, UINode, UIWidget, SceneNode and UISceneNode with the help of AI + human supervision (hopefully I didn't miss any important detail). I chose these classes given that they are core classes of the UI framework.

2026-02-27 00:22:58 -03:00

cursors

Moved binaries to bin.

2013-12-22 23:58:17 -03:00

fontrendering

Handle downscaled LCD glyphs with a dedicated resize path before atlas upload. This preserves row stride and RGB coverage, fixing corrupted icon-font glyphs at small sizes.

2026-07-26 00:23:24 -03:00

fonts

Add resource_link support.

2026-03-22 22:47:58 -03:00

i18n

Add integrated Git conflict resolution workflow

2026-08-27 22:18:58 -03:00

icon

Added eterm icons.

2023-03-31 00:59:07 -03:00

layouts

Deprecate TextInputPassword and its aliases.

2026-04-04 22:03:03 -03:00

maps

Fixed a null deferencing in cUIControl.

2014-06-01 21:34:04 -03:00

plugins

Add dynamic AI model catalog and reasoning controls

2026-08-19 01:30:56 -03:00

shaders

Changed BlendMode pre-loaded modes. Now they are a function, since they could be used before the memory initialization provoking errors in emscripten.

2022-06-09 20:22:48 -03:00

sounds

Moved binaries to bin.

2013-12-22 23:58:17 -03:00

sprites

Minor changes.

2017-03-03 18:04:06 -03:00

tiles

Moved binaries to bin.

2013-12-22 23:58:17 -03:00

ui

SubPixel hinting support.

2026-07-25 18:59:20 -03:00

ca-bundle.pem

Implemented horizontal scrolling with shift + mouse wheel (SpartanJ/ecode#181).

2024-03-05 20:41:28 -03:00

ee.ini

Minor refactor:

2022-08-28 01:05:25 -03:00

test.zip

Moved binaries to bin.

2013-12-22 23:58:17 -03:00