Skip to content

Commit a877d3f

Browse files
committed
Merge remote-tracking branch 'upstream/develop' into merge-from-dev
2 parents cd4247c + 68107ee commit a877d3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1561
-298
lines changed

.github/workflows/main.yml

Lines changed: 886 additions & 0 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,24 @@ You may consider creating a branch specific to the fix or improvement you wish t
1616

1717
It is our goal to help Lime evolve as a clean, easy-to-use (but powerful) layer for cross-platform development. Thanks for being a part of making this possible!
1818

19+
## Versioning and Branching Guidelines
20+
21+
We follow Semantic Versioning (semver): MAJOR.MINOR.PATCH.
22+
23+
### Patch Updates (x.x.x)
24+
25+
All bug fixes should be submitted to the current stable development branch (e.g., develop).
26+
27+
These changes are released as patch versions (e.g., 8.2.3 → 8.2.4).
28+
29+
### Minor Updates (x.x.0)
30+
31+
All new features (non-breaking) should be submitted to the next minor development branch, named x.x.x-dev.
32+
33+
For example, if the current version is 8.2.2, features targeting 8.3.0 should go into 8.3.0-dev.
34+
35+
### Major Updates (x.0.0)
36+
37+
Any breaking changes or major version updates must be submitted to the next major development branch, named x.0.0-dev.
38+
39+
For example, breaking changes intended for 9.0.0 go into 9.0.0-dev.

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22
===========
33

4-
Copyright (c) 2013-2024 Joshua Granick and other Lime contributors
4+
Copyright (c) 2013-2025 Joshua Granick and other Lime contributors
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

MAINTAINERS.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Maintainer Collaboration Guidelines
2+
3+
## Ownership Boundaries
4+
Core ownership includes final authority on major project direction, branding, external representation (e.g., website, GitHub org settings), and financial decisions. Project leadership roles should support this structure, not compete with it.
5+
Joshua Granick remains the primary owner of OpenFL and related projects under its umbrella, including all copyrights, branding, and rights to external representations.
6+
7+
## Commit Transparency
8+
All commits — especially those involving the website or project structure — should be clearly described. Avoid vague or misleading commit messages.
9+
10+
## No Unilateral Decisions
11+
Significant changes to the public-facing site, GitHub structure, or future policies (including donation links) must be discussed with the core team before being merged.
12+
High contribution volume does not entitle anyone to override team consensus or operate outside the established process. We value impact, but we expect humility and collaboration in return.
13+
14+
## Respect Other Maintainers’ Work
15+
Reverting, overwriting, or contradicting another maintainer’s contribution must go through discussion first — ideally via PR, not direct commit.
16+
17+
## Escalation Policy
18+
If collaboration issues persist after a discussion, core owners may revoke elevated roles or privileges to protect the health of the project. This isn’t personal — it’s structural.
19+
20+
## Donations & Monetization
21+
Any personal monetization links (Patreon, Ko-fi, etc.) require approval by the core **owners**. We want to keep funding equitable and transparent.
22+
23+
## Communication First
24+
If you disagree with a decision or direction, bring it up in team chat or discussion threads — not by taking action in silence.
25+
26+
## We Are a Team
27+
Leadership means contributing to both the codebase and the culture. If you’re not supporting both, you’re not fulfilling the role.

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Notices
22
=======
33

44
### Lime
5-
Copyright (c) 2013-2024 Joshua Granick and other Lime contributors
5+
Copyright (c) 2013-2025 Joshua Granick and other Lime contributors
66

77
This product bundles cairo 1.15.2, which is available under an
88
"MPL 1.1" license. For details, see [project/lib/cairo/](project/lib).

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,12 @@ Lime currently supports the following targets:
107107
lime test hl
108108

109109
Desktop builds are currently designed to be built on the same host OS
110+
111+
112+
Join the Community
113+
==================
114+
115+
Have a question? Want a new place to hang out?
116+
117+
* [Forums](https://community.openfl.org/c/lime/19)
118+
* [Discord](https://discordapp.com/invite/tDgq8EE)

docs/ImportAll.hx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ import lime.net.HTTPRequest;
112112
import lime.net.HTTPRequestHeader;
113113
import lime.net.HTTPRequestMethod;
114114
import lime.net.URIParser;
115+
import lime.system.BackgroundWorker;
115116
import lime.system.CFFI;
116117
import lime.system.CFFIPointer;
117118
import lime.system.Clipboard;
@@ -125,6 +126,7 @@ import lime.system.Sensor;
125126
import lime.system.SensorType;
126127
import lime.system.System;
127128
import lime.system.ThreadPool;
129+
import lime.system.WorkOutput;
128130
import lime.text.harfbuzz.HB;
129131
import lime.text.harfbuzz.HBBlob;
130132
import lime.text.harfbuzz.HBBuffer;
@@ -169,6 +171,7 @@ import lime.ui.Window;
169171
import lime.ui.WindowAttributes;
170172
import lime.utils.ArrayBuffer;
171173
import lime.utils.ArrayBufferView;
174+
import lime.utils.AssetBundle;
172175
import lime.utils.AssetCache;
173176
import lime.utils.AssetLibrary;
174177
import lime.utils.AssetManifest;

project/Build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
<files id="native-toolkit-harfbuzz" if="LIME_HARFBUZZ" />
390390
<files id="native-toolkit-jpeg" if="LIME_JPEG" />
391391
<files id="native-toolkit-lzma" if="LIME_LZMA" />
392-
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" />
392+
<files id="native-toolkit-mbedtls" if="LIME_MBEDTLS" unless="static_link" />
393393
<files id="native-toolkit-mojoal" if="LIME_MOJOAL" />
394394
<files id="native-toolkit-neko" if="LIME_NEKO" />
395395
<files id="native-toolkit-ogg" if="LIME_OGG" />

project/lib/cairo

Submodule cairo updated from b43e7c6 to 200441e

project/lib/curl

Submodule curl updated 2226 files

0 commit comments

Comments
 (0)