flutter/flame
1
0
Fork 0
mirror of https://github.com/flame-engine/flame.git synced 2025-11-01 01:18:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update flame_3d CHANGELOG.md to match main + changes [flame_3d] (#3380)

Browse Source 
Update flame_3d CHANGELOG.md to match main + changes.

This is the second step in merging flame_3d into main. Before we do a
final rebase of main back, the last "conflict" is the changelog file (as
can be seen [on the temporary PR
diff](https://github.com/flame-engine/flame/pull/3377)).

In order to solve this conflict, this does the following steps:
* Collect the changes from flame_3d compared to the current base branch
version of main (i.e.: everything that was added to the changelog; this
turns out to be two entries for the same day, `2024-09-16`).
* Replace the CHANGELOG.md file with the latest from current main
* Add back the missing entries, but I have doctored the days to be today
(`2024-12-10`), in order to not "alter the past". I am happy with
keeping the original date, though. No strong preference either way.

Once this is merged, the diff PR should show no conflict, and we should
be able to finally rebase it with current main to get rid of all the
extraneous files. Finally, we can create a new merge PR and the diff
should be exactly what we want.
This commit is contained in:
Luan Nico
2024-12-11 05:57:26 -05:00
parent 06f5a4b4a8
commit d0e11b9e65
1 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGELOG.md
View File

@ -31,28 +31,6 @@ Packages with other changes:
---
Packages with breaking changes:
- There are no breaking changes in this release.
Packages with other changes:
- [`flame_3d` - `v0.1.0-dev.3`](#flame_3d---v010-dev3)
---
#### `flame_3d` - `v0.1.0-dev.3`
- **FIX**: Improve behavior of Quaternion.slerp function [flame_3d] ([#3306](https://github.com/flame-engine/flame/issues/3306)). ([b9d6a0f1](https://github.com/flame-engine/flame/commit/b9d6a0f1d34e009cd91ae9d2ab0eed09b546d110))
- **DOCS**: Update README.md docs to reflect current state of affairs ([#3305](https://github.com/flame-engine/flame/issues/3305)). ([be72daee](https://github.com/flame-engine/flame/commit/be72daee6b92bcef2af3af78c1f64abe94c49d18))
## 2024-09-16
### Changes
---
Packages with breaking changes:
- There are no breaking changes in this release.