Commit Graph

7 Commits

Author SHA1 Message Date
deal a813aac10e Merge: 6639f55c0f bec2e07a00
Merge pull request #561 from adxeproject/dev

Merge Crash Fix #559 from dev
2021-12-28 21:27:32 +08:00
halx99 13927aa1bc Fix #559, match number type for get CURLINFO_RESPONSE_CODE
a. On linux x64, will crash with stack protector

Reported by @rh101

Signed-off-by: halx99 <halx99@live.com>
2021-12-28 21:00:45 +08:00
halx99 75e810108b string_view for cpp-tests 2021-12-28 17:20:17 +08:00
halx99 b0aee13b7f Committing clang-format changes 2021-12-28 08:06:23 +00:00
halx99 b4af01b592 string_view for tests 2021-12-28 15:58:56 +08:00
RH 2c0f04c99b Support custom texture atlas formats (#284)
* Allow support for custom texture atlas formats other than PLIST.

* Revert usage of emplace_back to push_back to ensure support for older compilers.

* Update test to support SpriteFrameCache::addSpriteFramesWithFile

* Re-add SpriteFrameCache::addSpriteFramesWithFileContent

* Change order of SpriteFramesFromFileContent test back to what it previously was

* Remove sprite sheet and all frames associated with it correctly

* Move sprite loader classes into their own files to clean up CCSpriteFrameCache

* Remove redundant line and update comment

* Fix formatting to match adxe code style

* Fix typo

* Add custom sprite sheet loader test using JSON-array sprite atlas format.
Simplify sprite sheet loader interface by adding identifier to the custom sprite sheet loader implementation.

* Add newline at the end of the file
2021-08-13 14:52:58 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00