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

14287 Commits

Author SHA1 Message Date
榆柳松 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
halx99 cc03fc970a
Code style 2021-07-21 21:06:55 +08:00
halx99 85a1954adc Improve logic 2021-07-20 15:08:31 +08:00
halx99 ee3b08c182
Remove test code 2021-07-20 15:06:17 +08:00
halx99 8bb93fcaa0 Fix cookie match 2021-07-20 15:03:19 +08:00
halx99 e6c6c54044 Improve cookie file parse 2021-07-19 17:58:13 +08:00
halx99 8fdb279a28 Fix ci 2021-07-19 14:49:38 +08:00
halx99 04aa501cde Improve code quality 2021-07-19 14:17:51 +08:00
halx99 fc768cbd3b Improve code quality 2021-07-19 13:43:59 +08:00
halx99 e90c4cdc3d
Update HttpCookie.h 2021-07-19 12:40:22 +08:00
halx99 abd98f50aa HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 b167ffc311 Use lowercase as preferred to storage HttpResponse headers [skip ci] 2021-07-19 08:04:12 +08:00
halx99 648a5b5554 HttpClient: Improve url redirect process 2021-07-19 00:17:50 +08:00
halx99 617d2b97e0 Fix http response header processing 2021-07-18 23:20:22 +08:00
halx99 81f646783b clang-format: Set PointerAlignment to Left 2021-07-17 23:36:13 +08:00
halx99 ad035e2729 Improve code quality 2021-07-17 23:32:31 +08:00
halx99 092b24e591 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 65148417b2
Fix ci 2021-07-15 23:31:49 +08:00
halx99 a3f8cf28ed Improve code style 2021-07-15 23:10:36 +08:00
halx99 bc6ebd920a Improve code quality 2021-07-15 23:03:43 +08:00
halx99 2efeef0217 Update comment 2021-07-15 17:32:50 +08:00
halx99 ec9a50136f Add new API Node::hitTest 2021-07-15 17:01:57 +08:00
halx99 6ca77bebb4 Use const ValueMap& for CCParticleSystem init functions 2021-07-15 12:23:50 +08:00
halx99 522de34990 Add defaultValue CCValue::asXXX for number types [skip ci] 2021-07-15 12:21:38 +08:00
halx99 c766cba275
Improve logic 2021-07-10 00:32:19 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 2782d993c4 Restrict detect utf-8 support 2021-07-08 00:39:22 +08:00
halx99 360e8cee94 Fix member not initialized [skip ci] 2021-07-07 22:38:58 +08:00
halx99 fae361ba02 detectNonAsciiUTF8 Don't regard null character as ascii 2021-07-07 22:35:30 +08:00
halx99 1cf4e82b80 Add API detectNonAsciiUTF8 [skip ci] 
This api will return true if any non-ascii utf-8 detected, and also return whether all chars is ascii.
 2021-07-07 21:49:57 +08:00
halx99 6864ef23b5
Fix ci error 2021-07-07 14:09:11 +08:00
halx99 ffcd4770cb Move GL macros to backend MacrosGL.h 
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
 2021-07-07 13:52:56 +08:00
halx99 54a97c5820
Delete unused comment 2021-07-07 04:08:07 +08:00
halx99 dca7f95163 Code style 2021-07-06 21:15:02 +08:00
halx99 cc85623d30 For doxgen happy 2021-07-06 15:22:07 +08:00
halx99 45ad0d86fe Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 ca859645ef HttpClient: Fix crash when process redirect 2021-07-06 02:44:57 +08:00
halx99 f2b4c3d647 Fix CCValue move assignment with std::string 2021-07-06 01:44:02 +08:00
halx99 04fc722d8d HttpClient: refine User-Agent encoding 2021-07-05 20:42:22 +08:00
halx99 7405c5781b HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 a3b5315a4a Fix ci [ci build] 2021-07-04 21:59:31 +08:00
halx99 2181268139 Refine code [ci build] 2021-07-04 21:21:29 +08:00
halx99 b9e2a8b7e1 Fix #414 2021-07-04 21:18:14 +08:00
halx99 ec904ed2b2 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 79b13d2372 Fix #413 2021-07-04 16:40:34 +08:00
halx99 75e707c67a Delete unused code 2021-07-02 15:17:13 +08:00
halx99 4c2ad68c58 ASTC decompress benchmark print 2021-07-02 15:11:01 +08:00
halx99 f4757ed450 Take care memory leak 2021-07-02 14:32:22 +08:00
halx99 eb11fd9a61 Always decompress astc parallel for sotware decoder [ci build] 
a. Improve task life cycle management.
b. Fix ci
 2021-07-02 14:20:54 +08:00
halx99 26c9365a04 Fix ci [ci build] 2021-07-02 13:25:00 +08:00
halx99 4a5b281506 Always decompress astc parallel for sotware decoder [ci build] 2021-07-02 13:00:04 +08:00
halx99 36870f7aaf
Update astc.cpp 2021-07-02 00:38:02 +08:00
halx99 26027020ba
Revert profile 2021-07-02 00:23:26 +08:00
halx99 628a9e7bb6 Add decompress astc parallel support [ci build] 
a. Define macro ASTC_ENABLE_PARALLEL_DECOMPRESS to enable.
 2021-07-02 00:18:02 +08:00
halx99 bcbf8e0b30
Make astc decode profile same with render backend 2021-06-28 21:04:36 +08:00
halx99 de8334416d Improve Sprite programState update logic 2021-06-27 21:43:21 +08:00
halx99 a84067eb74 Refactor dual sampler shader [ci build] 
Since not only etc1 could use sepreate RGB, A to two texture samplers, we unify the shader name.
 2021-06-27 20:58:50 +08:00
halx99 5f33ddeee6 Improve HttpResponse interanlCode set 2021-06-25 18:29:16 +08:00
halx99 c7dd59b2ad
Simplify code 2021-06-25 08:18:32 +08:00
halx99 01f3c57e15 Optimize CCValue [ci build] 2021-06-25 07:30:47 +08:00
halx99 de656ff773 Tidy thirdparty lib xsxml, fastlib to xsbase 2021-06-25 07:29:14 +08:00
halx99 94fc8f6ee8 Fix HttpClient compatible issue 
a. should let user do urlencode manually
b. this behavior is same with previous curl implemented HttpClient
 2021-06-25 07:07:59 +08:00
halx99 a379f936d8
Reimplement HttpClient based on yasio (#390) 
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request

* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code

* [WIP] Reimplement HttpClient based on yasio [ci build]

* [WIP] Fix ci [ci build]

* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support

* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works

* Update HttpClient.cpp

* HttpClientTest: enable sslVerifaction test

* Update HttpResponse.h

* Sync luabindings [ci build]

* Add chrome UA test

* Fix ci [ci build]

* The timer for read timeout should be associated with per channel

* Remove unused function

* Update url
 2021-06-24 12:33:07 +08:00
halx99 a40c60d261
More compatible 2021-06-24 10:21:41 +08:00
halx99 581a792155 Delay scene default camera init, see also #392 
This change will make sure user can change window or design size before scene init
 2021-06-24 02:23:02 +08:00
halx99 e35d340b46 Improve Uri parse 2021-06-22 14:19:22 +08:00
halx99 b6378332eb Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 c12aa74b55 Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 bafcac20c1 Add some comment for pr #384 2021-06-17 21:56:38 +08:00
RH d052cc8a48
Use TTF scaled metrics to calculate line height (#384) 2021-06-17 21:15:50 +08:00
RH eff5d1705b
Set global Z value of label debug layer to be the same as the parent label to fix display issue (#378) 2021-06-16 09:18:43 +08:00
halx99 c0f88c46e1
Improve progress timer (#375) 2021-06-13 10:05:30 +08:00
halx99 e5af6353b6
Update CCConfiguration.cpp 2021-06-10 16:51:30 +08:00
halx99 988fea5796
Fix android astc support check 
glCompressedTexImage2D no error, regard the device support astc
 2021-06-10 16:42:57 +08:00
halx99 2dcd3d64df Fix android compile error [ci build] 2021-06-10 14:17:47 +08:00
halx99 5570b17a17
Fix ci [ci build] 2021-06-10 12:55:58 +08:00
halx99 98fda4ae1e Use 1px detect method for checking whether GPU support astc [ci build] 2021-06-10 12:44:34 +08:00
halx99 cfd471f53a Fix warnings 2021-06-09 12:28:33 +08:00
RH fe26435e06
Ensure label underline node has the same global Z value as the label node to fix visibility issue when global Z is not 0. (#373) 2021-06-09 12:09:01 +08:00
halx99 61af6d75f9 Update readme guide and fixup [ci build] 2021-06-08 21:53:18 +08:00
halx99 73df034804 Rename external to thirdparty [ci build] 2021-06-08 20:45:55 +08:00
RH f72cd54eac
Fix to allow the correct saving of images on iOS when using a virtual file system (#369) 
* Fix to allow the correct saving of images on iOS when using a virtual file system

* Add missing import for FileUtils
 2021-06-03 02:34:02 +08:00
halx99 29015e1cd7 Make gradle utils file as shared [ci build] 2021-06-02 06:27:19 +08:00
halx99 9321a65e8c Use md5 from openssl [ci build] 2021-06-02 00:44:45 +08:00
halx99 d56a6f53cb Update astc [ci build] 2021-06-01 23:43:54 +08:00
halx99 e0beb6cf27 Update ConvertUTF,poly2tri [ci build] 2021-06-01 11:47:19 +08:00
RH d17e7b442a
FileStream::size() implemented (#365) 
* Add FileStream::size()
Add ZipFile::zfsize()

* Use FileStream::size()
 2021-05-31 15:08:44 +08:00
RH 4d020f20ca
Cache stream size because Apple audio decoder requests the value too often (#364) 
* Use FileStream to handle file operations for audio files on Apple platforms

* Audio callbacks are now static methods of AudioDecoderEXT class

* Track AudioFileID and close it explicitly in case it is required

* Remove unused code

* Improve performance by caching stream size since Apple audio decoder requests the size constantly during playback
 2021-05-31 12:37:28 +08:00
RH 36968c206e
Add Apple audio virtual file system support by using FileStream (#363) 
* Use FileStream to handle file operations for audio files on Apple platforms

* Audio callbacks are now static methods of AudioDecoderEXT class

* Track AudioFileID and close it explicitly in case it is required

* Remove unused code
 2021-05-29 16:15:16 +08:00
halx99 43b0f8dd71 Fix ci [ci build] 2021-05-28 16:43:32 +08:00
halx99 8750096575 Use type GLchar for glGetShaderInfoLog 2021-05-27 14:52:09 +08:00
halx99 143a1ab1f6 Fix #360 2021-05-27 14:39:17 +08:00
halx99 80b2d4f87f Fix console output text encoding for win32. 2021-05-26 00:24:39 +08:00
halx99 adce3298de Fix lua build [ci build] 2021-05-24 19:18:15 +08:00
halx99 2870c39fb2 Better code style 2021-05-24 13:26:56 +08:00
halx99 7f248efcee
Update CCDevice-win32.cpp 2021-05-18 23:52:25 +08:00
halx99 abc5f93c02
Fix charset process for fontName on win32 [ci build] 
Since we use freetype, never needs create ttf font by win32 API
 2021-05-18 23:50:23 +08:00
HALX99 a42f9ac25c
Renaming refactor (#353) [ci build] 2021-05-18 16:40:30 +08:00