Skip to content

Commit 6fa30b3

Browse files
authored
Merge pull request #1 from FunkinCrew/merge-from-upstream
2 parents df575b0 + a54bb20 commit 6fa30b3

Some content is hidden

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

47 files changed

+1190
-906
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
strategy:
1212
matrix:
13-
haxe-version: ["4.2.5", "4.3.3"]
13+
haxe-version: ["4.2.5", "4.3.4"]
1414
target: [html5, hl, neko, flash, cpp]
1515
fail-fast: false
1616
runs-on: ubuntu-latest
@@ -29,9 +29,8 @@ jobs:
2929
haxelib install haxelib 4.0.3
3030
haxelib dev flixel-addons .
3131
32-
- uses: HaxeFlixel/setup-flixel@v1
32+
- uses: HaxeFlixel/setup-flixel@master
3333
with:
34-
haxe-version: current
3534
flixel-versions: dev
3635
target: ${{matrix.target}}
3736
run-tests: true

CHANGELOG.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
# 4.0.0 (TBD)
2+
Removed deprecated classes
3+
- `FlxRayCastTilemap`: `FlxBaseTilemap` has an all-around better `ray()` method ([#455](https://github.com/HaxeFlixel/flixel-addons/pull/455))
4+
- `FlxMouseControl`: Use `FlxMouseEvent`, instead ([#455](https://github.com/HaxeFlixel/flixel-addons/pull/455))
5+
6+
## 3.3.2 (January 31, 2025)
7+
------------------------------
8+
- Fix dox, attempt 2
9+
10+
3.3.1 (January 31, 2025)
11+
------------------------------
12+
- Fix dox
13+
14+
3.3.0 (December 10, 2024)
15+
------------------------------
16+
#### New Features:
17+
- `FlxRadialGauge`: Refactor `FlxPieDial` add replacement ([444](https://github.com/HaxeFlixel/flixel-addons/pull/444))
18+
- `FlxRadialWipeShader`: Shader that masks sprite radially, can be applied to of any static sprite (doesn't work with animations, yet, but neither did FlxPieDial). Shaders only work on non-Flash targets
19+
- `FlxRadialGauge`: Same as `FlxPieDial` but uses less memory, shows more percentages, and performs better
20+
- `FlxPieDialUtils`: Moved all logic from `FlxPieDial` to a shared util
21+
22+
#### Changes and improvements:
23+
- Compatibility with Flixel 5.9.0 ([431](https://github.com/HaxeFlixel/flixel-addons/pull/431))([432](https://github.com/HaxeFlixel/flixel-addons/pull/432))([433](https://github.com/HaxeFlixel/flixel-addons/pull/433))([436](https://github.com/HaxeFlixel/flixel-addons/pull/436))([437](https://github.com/HaxeFlixel/flixel-addons/pull/437))([440](https://github.com/HaxeFlixel/flixel-addons/pull/440))([441](https://github.com/HaxeFlixel/flixel-addons/pull/441))
24+
- Deprecated `FlxRayCastTilemap`
25+
- Minor upkeep for `FlxTilemapExt`, `FlxOgmo3Loader`, `FlxOgmo3Loader`, `FlxWeapon`, `FlxNapeTilemap`, `FlxTrail`, `FlxExtendedMouseSprite`, `FlxSlider`, `FlxTransitionSprite`
26+
- `FlxTiledSprite`: Honor `clipRect` ([435](https://github.com/HaxeFlixel/flixel-addons/pull/435))
27+
- `FlxRuntimeShader`: Refactor and improve readibility ([442](https://github.com/HaxeFlixel/flixel-addons/pull/442))
28+
- Assets: Ran oxipng on all images ([445](https://github.com/HaxeFlixel/flixel-addons/pull/445))
29+
- `FlxTrail`: Organize logic into various methods to allow overriding particular behavior ([447](https://github.com/HaxeFlixel/flixel-addons/pull/447))
30+
- `TiledObject`: Add `POINT` type ([448](https://github.com/HaxeFlixel/flixel-addons/pull/448))
31+
- `TiledLayer`: Add `parallaxX` and `parallaxY` ([449](https://github.com/HaxeFlixel/flixel-addons/pull/449))
32+
- Remove all implicit `Int` casts from/to `FlxDirectionFlags` ([451](https://github.com/HaxeFlixel/flixel-addons/pull/451))
33+
34+
#### Bugfixes:
35+
- `FlxTypeText`: Honors `prefix` on `reset` calls ([395](https://github.com/HaxeFlixel/flixel-addons/pull/395))
36+
137
3.2.3 (May 15, 2024)
238
------------------------------
339

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)
1+
![](https://github.com/HaxeFlixel/haxeflixel.com/blob/dev/content/_static/images/flixel-logos/flixel-addons.png?raw=true)
22

3-
[flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com)
3+
[flixel](https://github.com/HaxeFlixel/flixel) | [addons](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demos](https://github.com/HaxeFlixel/flixel-demos) | [tools](https://github.com/HaxeFlixel/flixel-tools) | [templates](https://github.com/HaxeFlixel/flixel-templates) | [docs](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) | [türkçe](/README_TR.md)
44

55
[![CI](https://img.shields.io/github/actions/workflow/status/HaxeFlixel/flixel-addons/main.yml?branch=dev&logo=github)](https://github.com/HaxeFlixel/flixel/actions?query=workflow%3ACI)
66
[![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)

README_TR.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)
2+
3+
[flixel](https://github.com/HaxeFlixel/flixel) | [uzantılar](https://github.com/HaxeFlixel/flixel-addons) | [ui](https://github.com/HaxeFlixel/flixel-ui) | [demolar](https://github.com/HaxeFlixel/flixel-demos) | [araçlar](https://github.com/HaxeFlixel/flixel-tools) | [şablonlar](https://github.com/HaxeFlixel/flixel-templates) | [dökümanlar](https://github.com/HaxeFlixel/flixel-docs) | [haxeflixel.com](https://github.com/HaxeFlixel/haxeflixel.com) | [english](/README.md)
4+
5+
[![CI](https://img.shields.io/github/actions/workflow/status/HaxeFlixel/flixel-addons/main.yml?branch=dev&logo=github)](https://github.com/HaxeFlixel/flixel/actions?query=workflow%3ACI)
6+
[![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)
7+
[![Haxelib Version](https://badgen.net/haxelib/v/flixel-addons)](https://lib.haxe.org/p/flixel-addons)
8+
[![Haxelib Downloads](https://badgen.net/haxelib/d/flixel-addons?color=blue)](https://lib.haxe.org/p/flixel-addons)
9+
[![Haxelib License](https://badgen.net/haxelib/license/flixel-addons)](LICENSE.md)
10+
[![Patreon](https://img.shields.io/badge/donate-patreon-blue.svg)](https://www.patreon.com/haxeflixel)
11+
12+
13+
14+
## Hakkında
15+
16+
[HaxeFlixel](https://github.com/HaxeFlixel/flixel) | [HaxeFlixel](https://github.com/HaxeFlixel/flixel) için kullanışlı ancak isteğe bağlı, topluluk tarafından oluşturulan bir takım sınıf seti. [Flixel Power Tools](https://github.com/photonstorm/Flixel-Power-Tools)'tan bazı sınıflar dahildir.
17+
18+
## Geliştiriciler için
19+
20+
Eğer katkıda bulunmak isterseniz, aşağıdaki dökümanları inceleyin (İngilizce):
21+
22+
- [Kod katkıları](http://haxeflixel.com/documentation/code-contributions)
23+
- [Kod Tarzı](http://haxeflixel.com/documentation/code-style)
24+
- [Geliştirici flixel'i indirin](http://haxeflixel.com/documentation/install-development-flixel/)
25+
26+
Eğer bir sorunuz varsa veya daha önce hiç Github'dan katkıda bulunmadıysanız, toplulukta [forumlarda](http://haxeflixel.com/documentation/community/) yardım edecek arkadaş canlısı insanlar var.
27+
28+
Git'i Github ile kullanmak için, değişikliklerinizi yönetebileceğiniz [SourceTree](http://www.sourcetreeapp.com/) gibi bir GUI kullanmanızı öneririz.

assets/images/napeDebug.png

-137 Bytes
Loading
-525 Bytes
Loading
-3.01 KB
Loading
-552 Bytes
Loading
-174 Bytes
Loading

flixel/addons/display/FlxBackdrop.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class FlxBackdrop extends FlxSprite
115115
drawToLargestCamera();
116116
}
117117

118-
#if (flixel >= "5.7.0")
118+
#if (flixel >= version("5.7.0"))
119119
final cameras = getCamerasLegacy();
120120
#end
121121
for (camera in cameras)
@@ -161,7 +161,7 @@ class FlxBackdrop extends FlxSprite
161161
{
162162
var largest:FlxCamera = null;
163163
var largestArea = 0.0;
164-
#if (flixel >= "5.7.0")
164+
#if (flixel >= version("5.7.0"))
165165
final cameras = getCamerasLegacy(); // else use this.cameras
166166
#end
167167
for (camera in cameras)

0 commit comments

Comments
 (0)