Skip to content

Commit 3ca4b6d

Browse files
Merge branch 'release/2.0.0' into templates/phaser3
# Conflicts: # CHANGELOG.md # package-lock.json # package.json
2 parents 6af52e3 + 4c6ea07 commit 3ca4b6d

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

CHANGELOG.md

+25
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,43 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
<<<<<<< HEAD
89
## [1.4.0] - TBD
910

1011
### Changed
1112

1213
- Updated Phaser to 3.80.1
1314
- Fixed warning with SpringRoll listeners
15+
=======
16+
## [2.0.0] - 2024-05-09
17+
18+
### Changed
19+
20+
- Pixi: Updated pixi.js to 8.1.0
21+
- Pixi: Updated @pixi/sound to 6.0.0
22+
- Pixi: Updated SpringRoll to 2.6.0
23+
- Pixi: Updated feature list and state listeners to follow a standardized set
24+
25+
- Phaser: Updated Phaser to 3.80.1
26+
- Phaser: Fixed warning with SpringRoll listeners
27+
- Phaser: Updated SpringRoll to 2.6.0
28+
- Phaser: Updated feature list and state listeners to follow a standardized set
29+
30+
>>>>>>> release/2.0.0
1431
1532
## [1.3.1] - 2023-03-28
1633

1734
### Fixed
1835

36+
<<<<<<< HEAD
1937
- Removed incorrect references to non-NPM registry in package lock
38+
=======
39+
- Removed incorrect references to non-NPM registry in package-lock
40+
41+
### Changed
42+
43+
- Updated package-lock file to most recent versions
44+
>>>>>>> release/2.0.0
2045
2146
## [1.3.0] - 2023-03-13
2247

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "springroll-seed",
3-
"version": "1.3.1",
3+
"version": "2.0.0",
44
"description": "",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)