Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,401 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

156 Commits

Author SHA1 Message Date
halx99 241414fe3f Better spread for freetype sdf 2021-09-26 13:03:40 +08:00
halx99 e83c8b1c08 Merge: b5e1e78417 53272c6532 
Merge pull request #504 from adxeproject/freetype-sdf

Replace SDF implementation with freetype
 2021-09-20 18:24:11 +08:00
halx99 01f34d1e74 Fix mac build [skip ci] 2021-09-20 18:18:52 +08:00
halx99 19eacf2238 Update linux-ci.yml 2021-09-20 16:17:34 +08:00
halx99 3580070f62 Update linux-ci.yml 2021-09-20 16:16:41 +08:00
halx99 9fcc71d985 Fixup 2021-09-20 14:49:00 +08:00
halx99 23668aa0b5 Fixup 2021-09-20 12:24:54 +08:00
halx99 5f3a2de780 Replace SDF implementation with freetype 2021-09-20 12:08:37 +08:00
halx99 d4beff7eac Refine code 2021-09-18 14:06:52 +08:00
halx99 ec753d6915 Fix #502, avoid vector iterator damaged when remove child 2021-09-18 11:55:42 +08:00
姒嗘煶鏉? 35b658c90e Merge: f5663f279c d73d937894 
Merge remote-tracking branch 'upstream/dev' into dev
 2021-09-05 20:45:32 +08:00
姒嗘煶鏉? 0aff165959 [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 764c17e86e LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
halx99 ec6cd65917 Update some copyright notice 2021-09-03 10:59:08 +08:00
halx99 895a19701a Merge: 96e83c9cf6 ea4b212d1f 
Merge pull request #488 from rh101/long-changes

Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate.
 2021-09-02 23:12:25 +08:00
rh101 4e7db23d38 Remove getLong() method 
Change %du to %u, and %lx to %x
Use "stdint.h" instead of <cstdint> for TGAlib.h
 2021-09-02 20:30:20 +10:00
姒嗘煶鏉? 64e2cdd8d9 [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 1922cf5490 FT_StreamRec expects specific method signature with `unsigned long` 2021-09-02 15:55:57 +10:00
rh101 d8fd94db8a Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate. 2021-09-02 15:39:28 +10:00
halx99 1f15fbe192 Remove deprecated stubs 2021-09-02 11:16:36 +08:00
halx99 2178ac49b1 Make override function default parameter same with parent 2021-09-01 11:13:17 +08:00
halx99 3e4d8dd3ac Revert unexpected layer changes 2021-09-01 11:11:32 +08:00
halx99 0a4d3ee73d Merge: cb81a61530 a762c94904 
Merge branch 'dev' of https://github.com/adxeproject/adxe into dev
 2021-09-01 10:10:46 +08:00
halx99 756ff065c8 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 be5eff1d5a Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 5cc2b14697 Merge: 858d46ae65 8e1d7bd85d 
Merge commit 'refs/pull/483/head' of https://github.com/adxeproject/adxe into dev
 2021-08-30 19:32:05 +08:00
halx99 48a1164168 Update bug_report.md 2021-08-30 10:47:07 +08:00
halx99 eef61007bf Reimplement LayerColor and LayerGradient for auto batch draw 2021-08-29 18:59:09 +08:00
halx99 d72c948937 Revert last commit 2021-08-29 08:06:38 +08:00
halx99 65cd67e64c Set Sprite rect properly when create with empty texture. 2021-08-28 22:11:25 +08:00
halx99 b8d27c0715 Fix comment typo and do clang-format [skip ci] 2021-08-28 20:22:01 +08:00
halx99 481daa0e73 Fix crash problem when load a non-truetype .ttf file. 2021-08-28 18:24:17 +08:00
halx99 fc1c901209 Macro compatible 2021-08-27 13:54:05 +08:00
halx99 73c5f887b5 Merge: 30625f2330 f5af50debd 
Merge pull request #475 from adxeproject/win64

Win64 build support [DONE] 馃殌馃帀
 2021-08-27 12:34:24 +08:00
aismann 147b4b7946 Update README.md 2021-08-27 06:25:18 +02:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
rh101 f488de7d6c Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 426aa0db93 Merge: b48133e9c6 c9ebafe501 
Merge pull request #466 from rh101/fix-sprite-test-crashes

Fixes for crashes in sprite and sprite cache tests
 2021-08-19 14:35:44 +08:00
rh101 ad3e3380e2 Fixes for crashes in sprite and sprite cache tests 2021-08-19 15:43:18 +10:00
aismann 288941a63f cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 14a1556c6c Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
rh101 e558b3c976 Fix incorrect reference count check in SpriteFrameCache::removeUnusedSpriteFrames 
[BaseTest] Ensure unused frames are released before attempting to free unused textures
 2021-08-17 15:26:44 +10:00
rh101 c60f66c9bb Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 7a6734408d Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 39dbbc4713 More improvements (#455) 2021-08-14 10:28:28 +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 d8ad4ab8db Update comment 2021-07-15 17:32:50 +08:00
halx99 36042fdb55 Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 1699dcc93d Use const ValueMap& for CCParticleSystem init functions 2021-07-15 12:23:50 +08:00
halx99 f9ecb53623 Fix member not initialized [skip ci] 2021-07-07 22:38:58 +08:00