Skip to content

Commit

Permalink
Merge branch 'dev' into hxformat
Browse files Browse the repository at this point in the history
  • Loading branch information
Geokureli committed Dec 10, 2024
2 parents d2feb03 + b350553 commit 9c85121
Show file tree
Hide file tree
Showing 90 changed files with 4,017 additions and 2,708 deletions.
26 changes: 20 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,36 @@
name: CI

on: [push, pull_request, workflow_dispatch, repository_dispatch]
on:
push:
pull_request:
workflow_dispatch:
repository_dispatch:

jobs:
build:
strategy:
matrix:
haxe-version: ["4.0.5", stable, nightly]
haxe-version: ["4.2.5", "4.3.4"]
target: [html5, hl, neko, flash, cpp]
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: lix-pm/setup-lix@master
- uses: actions/checkout@v2
- run: haxelib dev flixel-addons .
- uses: HaxeFlixel/setup-flixel@master
- run: sudo apt-get update

- uses: actions/checkout@v3

- uses: krdlab/setup-haxe@v1
with:
haxe-version: ${{matrix.haxe-version}}

- name: "Configure Haxelib"
run: |
haxelib setup /home/runner/haxe/haxelib/
haxelib install haxelib 4.0.3
haxelib dev flixel-addons .
- uses: HaxeFlixel/setup-flixel@master
with:
flixel-versions: dev
target: ${{matrix.target}}
run-tests: true
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"editor.formatOnSaveMode":"modifications",
"editor.formatOnPaste": false,
"editor.codeActionsOnSave": {
"source.sortImports": true
"source.sortImports":"explicit"
}
},
"haxe.enableExtendedIndentation": true
}
}
263 changes: 182 additions & 81 deletions CHANGELOG.md

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)

[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)
[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)

[![CI](https://img.shields.io/github/workflow/status/HaxeFlixel/flixel-addons/CI.svg?logo=github)](https://github.com/HaxeFlixel/flixel-addons/actions?query=workflow%3ACI)
[![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)
[![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)
[![Haxelib Version](https://badgen.net/haxelib/v/flixel-addons)](https://lib.haxe.org/p/flixel-addons)
[![Haxelib Downloads](https://badgen.net/haxelib/d/flixel-addons?color=blue)](https://lib.haxe.org/p/flixel-addons)
[![Haxelib License](https://badgen.net/haxelib/license/flixel-addons)](LICENSE.md)
[![Patreon](https://img.shields.io/badge/donate-patreon-blue.svg)](https://www.patreon.com/haxeflixel)



## About

Expand Down
28 changes: 28 additions & 0 deletions README_TR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
![](https://raw.github.com/HaxeFlixel/haxeflixel.com/master/src/files/images/flixel-logos/flixel-addons.png)

[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)

[![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)
[![Discord](https://img.shields.io/discord/162395145352904705.svg?logo=discord)](https://discordapp.com/invite/rqEBAgF)
[![Haxelib Version](https://badgen.net/haxelib/v/flixel-addons)](https://lib.haxe.org/p/flixel-addons)
[![Haxelib Downloads](https://badgen.net/haxelib/d/flixel-addons?color=blue)](https://lib.haxe.org/p/flixel-addons)
[![Haxelib License](https://badgen.net/haxelib/license/flixel-addons)](LICENSE.md)
[![Patreon](https://img.shields.io/badge/donate-patreon-blue.svg)](https://www.patreon.com/haxeflixel)



## Hakkında

[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.

## Geliştiriciler için

Eğer katkıda bulunmak isterseniz, aşağıdaki dökümanları inceleyin (İngilizce):

- [Kod katkıları](http://haxeflixel.com/documentation/code-contributions)
- [Kod Tarzı](http://haxeflixel.com/documentation/code-style)
- [Geliştirici flixel'i indirin](http://haxeflixel.com/documentation/install-development-flixel/)

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.

Git'i Github ile kullanmak için, değişikliklerinizi yönetebileceğiniz [SourceTree](http://www.sourcetreeapp.com/) gibi bir GUI kullanmanızı öneririz.
Binary file modified assets/images/napeDebug.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/diagonal_gradient.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/diamond.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/images/transitions/square.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 10 additions & 10 deletions flixel/addons/api/FlxGameJolt.hx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package flixel.addons.api;

import flash.display.Loader;
import flash.display.BitmapData;
import flash.events.Event;
import flash.events.IOErrorEvent;
import flash.net.URLLoader;
import flash.net.URLRequest;
import flash.net.URLRequestMethod;
import openfl.display.Loader;
import openfl.display.BitmapData;
import openfl.events.Event;
import openfl.events.IOErrorEvent;
import openfl.net.URLLoader;
import openfl.net.URLRequest;
import openfl.net.URLRequestMethod;
import haxe.crypto.Md5;
import haxe.crypto.Sha1;
import flixel.FlxG;
Expand Down Expand Up @@ -166,7 +166,7 @@ class FlxGameJolt

/**
* A string map that contains what is returned from GameJolt servers.
*/
*/
static var returnMap:Map<String, String> = new Map<String, String>();

/**
Expand Down Expand Up @@ -431,7 +431,7 @@ class FlxGameJolt
* @see https://gamejolt.com/api/doc/game/scores/fetch/
* @param Limit The maximum number of scores to retrieve. If blank to retrieve only this user's scores.
* @param TableID The ID of the table you want to pull data from. Leave blank to fetch from the primary score table.
* @param CallBack An optional callback function. Will return a Map<String:String> whose keys and values are equivalent to the key-value pairs returned by GameJolt.
* @param Callback An optional callback function. Will return a Map<String:String> whose keys and values are equivalent to the key-value pairs returned by GameJolt.
*/
public static function fetchScore(?Limit:Int, ?TableID:Int, ?Callback:Dynamic):Void
{
Expand Down Expand Up @@ -714,7 +714,7 @@ class FlxGameJolt
* However, if we're getting an image, a second URLRequest is called, and that will be done first.
* Or, if we're authenticating the user, the verifyAuthentication function will be called instead.
*
* @param The URLLoader complete event.
* @param e The URLLoader complete event.
*/
static function parseData(e:Event):Void
{
Expand Down
Loading

0 comments on commit 9c85121

Please sign in to comment.