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

14284 Commits

Author SHA1 Message Date
rh101 9b2b3de565 The releaseFontAtlas method will remove the font atlas from the cache if it has a reference count of 1, and will always call release on that atlas as expected by the calling code. 2021-10-29 00:07:46 +11:00
rh101 b60478ac90 Revert "Ensure font atlas is correctly released even if it does not exist in the atlas cache." 
This reverts commit 8b27fdb832.
 2021-10-29 00:05:52 +11:00
rh101 8b27fdb832 Ensure font atlas is correctly released even if it does not exist in the atlas cache. 2021-10-28 17:41:25 +11:00
halx99 af19d52d0e
Update CCConsole.cpp 2021-10-27 23:02:38 +08:00
halx99 d8ed219bc4
Update copyright notice [skip ci] 2021-10-25 23:30:03 +08:00
halx99 45607062bd Fix ci 2021-10-25 20:29:40 +08:00
halx99 9183c664ce Rename cocos2d.cpp to adxe.cpp 2021-10-25 18:06:45 +08:00
halx99 c67aabac1d
Update version indicator [skip ci] 2021-10-25 17:55:05 +08:00
halx99 85d5b99add
Add copyright notice [skip ci] 2021-10-24 23:27:17 +08:00
halx99 67ce72db58 Unify Tex2F to Vec2 2021-10-24 22:44:44 +08:00
halx99 f88a490173 Fix reviews [skip ci] 2021-10-24 22:06:13 +08:00
halx99 0ce675aa5a Fix reviews 2021-10-24 21:55:48 +08:00
halx99 83618b7e23 Resolve reviews 2021-10-24 14:09:59 +08:00
halx99 43f80b4416 Fixup 2021-10-24 11:07:54 +08:00
halx99 cc2ba51ed6 Use struct `Vec2` instead `Size` 2021-10-23 23:27:14 +08:00
halx99 4fc5ee5840 Add HttpClient::setNameServers 
a. support set custom dns server list when c-ares enabled.
 2021-10-23 21:57:36 +08:00
halx99 c38681bdd0 Code style 2021-10-11 12:15:41 +08:00
halx99 d51056935f Put fps labels to safe origin 2021-10-09 14:45:49 +08:00
halx99 d9b73b9a72 Fix codacy issues 2021-10-09 14:05:32 +08:00
halx99 bc4cbddd50 Fix some warnings 2021-10-09 13:48:56 +08:00
halx99 bbd3a78ae4 Improve lua workflow on windows 
a. Use working directory as default resource root on windows
b. Don't copy res and scripts to build binary dir on windows
c. Always build plainlua as dll on windows for fast debug
d. Remove 64bit spec search path for lua script
 2021-10-07 18:44:34 +08:00
rh101 46befe3fab Use rapidjson for parsing webview json data 
Rename methods
 2021-10-07 00:37:37 +11:00
halx99 92890788f8 Update copyright notice [skip ci] 2021-10-06 18:47:07 +08:00
halx99 52dff7c19b Fix #518 2021-10-06 18:45:58 +08:00
rh101 5c7d116e5b Avoid usage of strlen and terminate decoding on any null character. 2021-10-05 13:29:33 +11:00
rh101 5a2c050bbe Move url encode and decode methods to ccUtils 2021-10-05 12:50:01 +11:00
rh101 012e9708b8 Download external tools to tools/external 
Ensure git ignores the tools/external folder
Update NuGet CLI exe path
 2021-10-05 10:47:45 +11:00
rh101 def5da447c Add comments, use SUCCEED macro to check for success on windows API calls. 2021-10-05 09:22:48 +11:00
rh101 55d4affcc1 Remove incorrect style settings on Windows control for webview 
Set focus to the webview control when it is created
 2021-10-05 00:14:50 +11:00
rh101 7ddddf9bb7 Remove initialization of missing variable 2021-10-05 00:10:15 +11:00
rh101 3ef9148745 Support clean cache data before loading URL 
Remove unused class members
 2021-10-05 00:04:30 +11:00
rh101 1d2ff2265f Removed unused code and added invoke method comments to identify which ICoreWebView2 interface they belong to 2021-10-04 23:50:04 +11:00
rh101 f95774ae54 [skip ci] Fix copyright notice 2021-10-04 19:56:22 +11:00
rh101 fe991bbc1c Fix typo 2021-10-04 19:34:10 +11:00
rh101 9857ea8732 [setup.py] Add download support. Add NuGet CLI download to tools folder. 
Download NuGet Microsoft.Web.WebView2 package version 1.0.992.28
Add support for WebView for Windows builds.
 2021-10-04 18:55:01 +11:00
halx99 0eb2da0d14 Avoid OS_WINDOWS conflicit with system macro 2021-10-02 17:29:07 +08:00
halx99 f0bb34dc4f Revert 'Remove callbackUniforms support" 2021-09-30 22:33:23 +08:00
halx99 986ffad3fa Use more better typecast 2021-09-30 08:18:44 +08:00
halx99 8c86e7fe59 Remove unused callbackUniforms 2021-09-30 08:18:01 +08:00
halx99 aaa479cdfb Fix #510 2021-09-30 08:16:33 +08:00
halx99 c4aedff539 Better spread for freetype sdf 2021-09-26 13:03:40 +08:00
halx99 8b71cf25fe Fixup 2021-09-20 14:49:00 +08:00
halx99 6ebd14f72a Fixup 2021-09-20 12:24:54 +08:00
halx99 5b53f005a5 Replace SDF implementation with freetype 2021-09-20 12:08:37 +08:00
halx99 352d57773e Refine code 2021-09-18 14:06:52 +08:00
halx99 c48390c1d8 Fix #502, avoid vector iterator damaged when remove child 2021-09-18 11:55:42 +08:00
halx99 14a295af52 Add HttpClient::getInternalService 2021-09-05 22:18:42 +08:00
榆柳松 ac1aa636ac Merge remote-tracking branch 'upstream/dev' into dev 2021-09-05 20:45:32 +08:00
榆柳松 f5663f279c [fix]ScrollView and ListView goes back to the front incorrectly after calling doLayout. 2021-09-05 20:44:14 +08:00
halx99 7cc2d34398 LayerMultiplex use Node* to store layers 
a. Layer no specificed functions
 2021-09-03 11:13:15 +08:00
halx99 210999f9e7 Update some copyright notice 2021-09-03 10:59:08 +08:00
halx99 e11f489750 Fix #491 2021-09-03 10:49:44 +08:00
halx99 1401e61702
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 ea4b212d1f Use %d for int32_t 2021-09-02 22:45:59 +10:00
rh101 ab2aa26242 Change %lu to %u 2021-09-02 22:43:10 +10:00
rh101 456d26628c Change off_t to int64_t 2021-09-02 21:18:23 +10:00
rh101 9cfc16ee38 Support 64 bit versions of posix lseek 2021-09-02 20:43:37 +10:00
rh101 568e3612bd 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
榆柳松 1548c75a3d [fix]The problem of inaccurate maximum width limit when using system fonts. 2021-09-02 17:15:03 +08:00
rh101 de182c8360 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 101eb89f4c Revert to `long` for library usage 2021-09-02 16:20:16 +10:00
rh101 0b27d0980c Add required include for uint32_t 
Fix code warning
 2021-09-02 16:18:32 +10:00
rh101 737f0c39d7 Revert to usage of `long` type for external library methods that require it. 2021-09-02 16:08:57 +10:00
rh101 64695cfb48 Revert changes where `long` type is required. 2021-09-02 15:59:29 +10:00
rh101 aecfb8be47 FT_StreamRec expects specific method signature with `unsigned long` 2021-09-02 15:55:57 +10:00
rh101 4d1ff40736 Usage of long and unsigned long changed to platform independent fixed-sized types where appropriate. 2021-09-02 15:39:28 +10:00
halx99 d197e8b245 Fix part of #487 2021-09-02 11:43:27 +08:00
halx99 a4ac70ee5f Remove deprecated stubs 2021-09-02 11:16:36 +08:00
halx99 857243ac21 Make override function default parameter same with parent 2021-09-01 11:13:17 +08:00
halx99 9abe2c38cf Revert unexpected layer changes 2021-09-01 11:11:32 +08:00
halx99 a2346d5e1f Merge branch 'dev' of https://github.com/adxeproject/adxe into dev 2021-09-01 10:10:46 +08:00
halx99 b7f391cbff HttpClient: clear channel ud when it been recycle 2021-08-31 15:53:46 +08:00
halx99 c354461982 Enum compatible [skip ci] 2021-08-31 15:50:18 +08:00
halx99 cb81a61530 Refactor layer 
Reimplement LayerColor and LayerGradient based on sprite for auto batch draw
 2021-08-30 19:47:53 +08:00
halx99 8e1d7bd85d Reimplement LayerColor and LayerGradient for auto batch draw 2021-08-29 18:59:09 +08:00
halx99 89f0e21508
Revert last commit 2021-08-29 08:06:38 +08:00
halx99 f16748f735 Set Sprite rect properly when create with empty texture. 2021-08-28 22:11:25 +08:00
halx99 beb593a22a Fix comment typo and do clang-format [skip ci] 2021-08-28 20:22:01 +08:00
halx99 56067f5acc Fix crash problem when load a non-truetype .ttf file. 2021-08-28 18:24:17 +08:00
halx99 7dd7422abd Macro compatible 2021-08-27 13:54:05 +08:00
halx99 bd436ae078 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 f9ac34c20f Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 d7e590b513 Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 74a1ac7cfe Delete unused sources 2021-08-25 16:14:15 +08:00
halx99 141c5991f1
Merge pull request #471 from rh101/dynamic-lib-fix 
Fix for dynamic library issue
 2021-08-20 14:22:52 +08:00
rh101 219c253c84 Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 ce5ecfcdbe Update version id [skip ci] 2021-08-20 12:19:26 +08:00
rh101 0266d332e5 Update FileStream seek, tell and size to support files greater than 4GB, and max size is 2^63. 2021-08-20 00:53:02 +10:00
aismann 780d4e6294 cleanup and improvement 2021-08-18 04:16:21 +02:00
rh101 b420a33b68 Revert check for reference count, since it was correct. [skip ci] 2021-08-17 18:49:14 +10:00
rh101 188345e42a 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 b3e045b387 Use integer identifier for sprite sheet format. 
Revert method name addSpriteFramesWithFileAndTexture back to addSpriteFramesWithFile
 2021-08-17 14:04:45 +10:00
rh101 5199bb087a Update sprite sheet API to allow custom sprite sheet texture filename to be used 2021-08-17 09:04:51 +10:00
aismann 9f2ab0ef28
More improvements (#455) 2021-08-14 10:28:28 +08:00
RH 4716456e33
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 39eb09daad Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 5e88382a93 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 cfffd35aec HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 71c17cfc9b Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 e08c9b136a
Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00