forked from HaxeFlixel/flixel
-
Notifications
You must be signed in to change notification settings - Fork 7
Merge the latest changes from upstream #8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AbnormalPoof
wants to merge
79
commits into
mobile/main
Choose a base branch
from
merge-from-dev
base: mobile/main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* add mod function * add mod test * update mod docs * update mod docs 2
* Fix FlxSpriteGroup origin (HaxeFlixel#2981) * update children origins relative to their positions * add originTransform unit test * Better framerate independant camera lerping (HaxeFlixel#2922) * adjust lerp based on the current frame rate * better framerate independant camera lerping * fix error * remove setter * docs * fix default lerp in follow() * fix typo * add HaxeFlixel#2981 and HaxeFlixel#2922 * Flxstate new (HaxeFlixel#2733) * take FlxState constructor instead of FlxState * add NextState type * 4.0.5 fixes * more 4.0.5 fixes * fix deprecation warnings in unit tests * take nextState in VCRFrontEnd * remove @from Instance in InitialState * use is operator * improve docs * rename method * more docs * more modular FlxSplash, set _gameJustStarted in FlxGame * allow splash to be skipped by a switchState call * touch-ups for HaxeFlixel#2733 (HaxeFlixel#3003) * take FlxState constructor instead of FlxState * add NextState type * 4.0.5 fixes * more 4.0.5 fixes * fix deprecation warnings in unit tests * take nextState in VCRFrontEnd * remove @from Instance in InitialState * use is operator * improve docs * rename method * more docs * more modular FlxSplash, set _gameJustStarted in FlxGame * allow splash to be skipped by a switchState call * touch-ups * add HaxeFlixel#2733 * Remove deprecated features (HaxeFlixel#3048) * remove deprecated features * more removals * Update FlxCamera.hx * remove defaultCameras * Default zoom (HaxeFlixel#2907) * add bindScrollPos * improve SCREEN_BY_SCREEN follow mode * make cameras suck less when using FlxCamera.defaultZoom <> 1.0 * Replace references to FlxG.camera with this.getDefaultCamera (HaxeFlixel#3072) * add getDefaultCamera, stop using FlxG.camera for everything * more uses of getDefaultCamera * fix flxpath * changelog * Calculate adjustedLerp only when necessary (HaxeFlixel#3106) * Calculate adjustedLerp only when necessary * Skip updateLerp on followLerp <= 0 * replace boundLerp with gt/lt checks --------- Co-authored-by: George Kurelic <Gkurelic@gmail.com> * style * 1 line patch? (HaxeFlixel#3254) * update haxelib after merge * Log pos (HaxeFlixel#3338) * change logs to include posInfos * fix flash errors * D'oh * update Changelog * Add analog directional input to FlxVirtualPad (HaxeFlixel#3340) * add overloaded scale * add FlxReadOnlyPoint * deprecate statusAnimations * fix drawCircle centering * Add analog stick to FlxVirtualPad * fix code climate * D'oh * fix coverage * fix flash * add distance overloads * add FlxMath.getFrameLerp * honor camera in checkInput * add FlxVirtualStick deprecate FlxAnalog * rename to getElapsedLerp * fix multi-touch * D'oh! * doc * add FlxAnalogState helpers * rename signals, add statuses * add deadzone * remove lerp constructor arg * fix unit test warning * overload more shit * 5.10.0 * change 5.10->6 * Remove unused legacy code & defines (HaxeFlixel#3059) * Remove legacy code & defines - Removed `FLX_POST_PROCESS` define & related code - Removed references to `openfl_next`, `lime_legacy` & `next` defines - Removed Lime & OpenFL version checks that are always true/false due to the current minimum versions * Removed `legacy` define being set in include.xml * Re-added `#if !flash` check in `initRenderMethod` I mistakenly removed the entire code due to it including `lime_legacy`. * Brought back `undump()` & `canBeDumped` as `refreshBitmap()` & `canBeRefreshed` respectively (old ones are now deprecated) - Also brought back `onAssetsReload()` & `getBitmapFromSystem()` * Added missing line breaks * remove old import * Remove another deprecated define * Restored mistakenly-removed define check * Rename `refreshBitmap()` to `refresh()` --------- Co-authored-by: George FunBook <gkurelic@gmail.com> * FlxSave: Replace `FlxSaveStatus.ERROR` with SAVE_ERROR (HaxeFlixel#3294) * replace `FlxSaveStatus.ERROR` with SAVE_ERROR * update changelog * add link * Add deprecated ERROR back * remove implicit int casts to/from directions (HaxeFlixel#3308) * remove implicit int casts to/from directions * D'oh * D'oh! * deprecate operators and fix haxe 4.2.5 * order imports * remove casts, add explicit cast functions * fix not() and add tests * Doc * doc + tests * update changelog * finalize(?) changelog * enable glsl3 (when openfl does) (HaxeFlixel#3347) * update Changelog * prepare for release --------- Co-authored-by: 47rooks <47rooks@gmail.com> Co-authored-by: rich <87835336+richTrash21@users.noreply.github.com> Co-authored-by: DetectiveBaldi <86160807+DetectiveBaldi@users.noreply.github.com> Co-authored-by: Flainn <starmapo@proton.me>
Fix regression and add tests
* use UV rect for better clarity * fix code climate
…axeFlixel#3369) * Query max texture size only once. * use local static, cleanup and fix cuddled brackets * remove local static --------- Co-authored-by: George Kurelic <Gkurelic@gmail.com>
* improve btimap tracking * add capitalizeFirstLetters and isRomanNumeral * fix window resizing * add FlxGraphicSource.resolveBitmapData * improve pointer selection * prevent debug cursors from blocking clicks * improve debug cursor hotspot * centralize debug icons
* improve btimap tracking * add capitalizeFirstLetters and isRomanNumeral * fix window resizing * add FlxGraphicSource.resolveBitmapData * improve pointer selection * prevent debug cursors from blocking clicks * improve debug cursor hotspot * centralize debug icons * add shortcuts for tools and windows * handle FlxColors in watch window * add scroll bars to watch/tracker * add Tools to TrackObject and LogBitmap
* improve btimap tracking * add capitalizeFirstLetters and isRomanNumeral * fix window resizing * add FlxGraphicSource.resolveBitmapData * improve pointer selection * prevent debug cursors from blocking clicks * improve debug cursor hotspot * centralize debug icons * add shortcuts for tools and windows * handle FlxColors in watch window * add scroll bars to watch/tracker * add Tools to TrackObject and LogBitmap * refactor Pointer * refactor Transform * testCI bitmapLog * tewst CI bitmap log-2 * testCI-bitmaplog-3 * refactor BitmapLog * testCI-bitmapLog-4 * testCI-bitmapLog-5 * testCI-bitmapLog-6 * testCI-bitmapLog-6 * testCI-bitmapLog-8 * testCI-bitmapLog-9 * testCI-bitmapLog-10 * testCI-bitmapLog-11 * testCI-bitmapLog-12 * test new cpp segfault flag * revert
…axeFlixel#3381) allow changes to cliprect to take effect without setter
* add setBounds setAbs setBoundsAbs * add FlxReadOnlyRect
* Add custom text option to FlxSoundTray * Use newVolume param * fix newvolume * add showAnim() _bg and _label * change text with label --------- Co-authored-by: GeoKureli-BlackbookPro <GKurelic@gmail.com>
* check cliprect changes earlier * trigger CI again
* fix cliprect on scaled members in FlxSpriteGroup * revert scale change and make clipRectTransform non-inline
* check cliprect changes earlier * trigger CI again
* add autoBounds * doc * add unit test
* add debug scale * add to coverage
…axeFlixel#3395) * check cliprect changes earlier * trigger CI again * optional alpha arg * add various colorTransform helpers * add FlxFrame.overlaps * make FlxFrame constructor public * add CharList and cleanup text rendering/iteration * add forEachBorder helper * add rect.contains, frame.contains and frame.isContained * improve draw perf by avoiding unnecessary frame clipping * doc plus optional alpha * unit tests * doc * use MatrixVector to cache draw matrices * resuse a frame instance for tile drawing * test more optional args * remove rgb optional args
* FlxText: allow better pixel fonts by modifying textField properties * regen graphic
The comment describing FlxMath.wrap says it wraps the value between 0 and max, when it doesn't do that.
* fix typos in FlxUVRect * Add toString() from richTrash21 * move func * add unit test
* Remove references to unused "blending" variable * FlxDrawBaseItem: deprecate fields instead of removing
This reverts commit 5b12ed2.
* invert bool * fix mouse quirk when showing/hiding debugger * fix CI
* Update FlxObject.hx * Small margin expansion Had to do this because of the current antialiasing problems with openfl issue, similarly to the problem resolved in HaxeFlixel#3397 * fix non-flash blit targets + simplify --------- Co-authored-by: GeoKureli-BlackbookPro <GKurelic@gmail.com>
* fix bitmapfilter mem leak Co-Authored-By: data5 <99661153+fixeddata@users.noreply.github.com> * move filter check * remove alpha check --------- Co-authored-by: data5 <99661153+fixeddata@users.noreply.github.com>
…enderBlit` (HaxeFlixel#3503) * fix strip color transform on blit render * remove unnecessary `#if !flash` conditionals
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just to make sure everything's all up to date!
I had to do some merge conflict resolution so please test this a bit more thoroughly, especially on mobile.