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

869 Commits

Author SHA1 Message Date
halx99 5ef8402b59 Remove unused callbackUniforms 2021-09-30 08:18:01 +08:00
halx99 c3667c76f0 Fix #510 2021-09-30 08:16:33 +08:00
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
halx99 a099194a47 Add HttpClient::getInternalService 2021-09-05 22:18: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 39064cde56 Fix #491 2021-09-03 10:49:44 +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 e87384a4e2 Use %d for int32_t 2021-09-02 22:45:59 +10:00
rh101 5507b69fc0 Change %lu to %u 2021-09-02 22:43:10 +10:00
rh101 5e0a717aa5 Change off_t to int64_t 2021-09-02 21:18:23 +10:00
rh101 94cf6a83ac Support 64 bit versions of posix lseek 2021-09-02 20:43:37 +10: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 eba8696d65 Change %ld to %d for 32bit data types 
Regenerate LUA bindings
 2021-09-02 17:46:22 +10:00
rh101 fcaaa9a135 Revert to `long` for library usage 2021-09-02 16:20:16 +10:00
rh101 5c61f42990 Add required include for uint32_t 
Fix code warning
 2021-09-02 16:18:32 +10:00
rh101 4e5b07f6cb Revert to usage of `long` type for external library methods that require it. 2021-09-02 16:08:57 +10:00
rh101 38167107cc Revert changes where `long` type is required. 2021-09-02 15:59:29 +10: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 0cee74a4bf Fix part of #487 2021-09-02 11:43:27 +08: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 583bb5ece4 HttpClient: clear channel ud when it been recycle 2021-08-31 15:53: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 fa1f2f2d33 Fix lua build for win64 and 1 warning 2021-08-27 11:41:11 +08:00
halx99 5d0565b900 Fix byteorder detect error for win64 and some warnings 2021-08-27 11:27:33 +08:00
halx99 860400cb8c Fix win64 build 2021-08-27 08:33:17 +08:00
halx99 6dd878a90f Delete unused sources 2021-08-25 16:14:15 +08:00
halx99 1e36900153 Merge: ce5ecfcdbe 219c253c84 
Merge pull request #471 from rh101/dynamic-lib-fix

Fix for dynamic library issue
 2021-08-20 14:22:52 +08:00
rh101 f488de7d6c Fix for dynamic library issue 2021-08-20 14:43:19 +10:00
halx99 961c2d1895 Update version id [skip ci] 2021-08-20 12:19:26 +08:00
halx99 99099dc08f Merge: 11434287cd 0266d332e5 
Merge pull request #469 from rh101/filestream-64bit

Update FileStream seek, tell and size to support files greater than 4GB files
 2021-08-20 01:20:17 +08:00
halx99 825a87685f Update thirdparty libs 2021-08-19 22:53:54 +08:00
rh101 cb696b06ac 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
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 1452e698e3 Fix xcode ci 2021-08-12 11:25:01 +08:00
halx99 f02e0a7b87 Fix #443 
a. HttpClient: improve request header processing
 2021-08-05 14:56:40 +08:00
halx99 410d3b41af HttpClient: push front available channel to fix dns cache missing 2021-08-03 14:41:30 +08:00
halx99 981b3a9a79 Add HttpClient::handleNetworkStatusChanged to clear DNS cache 2021-07-31 14:39:42 +08:00
halx99 622c22c47b Avoid crash when http cookie enabled on android 2021-07-23 16:09:13 +08:00
halx99 21af858b20 Code style 2021-07-21 21:06:55 +08:00
halx99 f37be8f5c2 Improve logic 2021-07-20 15:08:31 +08:00
halx99 b793ff123e Remove test code 2021-07-20 15:06:17 +08:00
halx99 c74a12baf5 Fix cookie match 2021-07-20 15:03:19 +08:00
halx99 bc2ef65ba7 Improve cookie file parse 2021-07-19 17:58:13 +08:00
halx99 cf2b577a25 Fix ci 2021-07-19 14:49:38 +08:00
halx99 5bb5d43733 Improve code quality 2021-07-19 14:17:51 +08:00
halx99 0af95a3fbb Improve code quality 2021-07-19 13:43:59 +08:00
halx99 ee327238fa Update HttpCookie.h 2021-07-19 12:40:22 +08:00
halx99 d76a43406c HttpClient cookie support 2021-07-19 12:26:25 +08:00
halx99 ce13dc075f Use lowercase as preferred to storage HttpResponse headers [skip ci] 2021-07-19 08:04:12 +08:00
halx99 cc0bb3230f HttpClient: Improve url redirect process 2021-07-19 00:17:50 +08:00
halx99 4e3a2355ba Fix http response header processing 2021-07-18 23:20:22 +08:00
halx99 5dcc4f557a clang-format: Set PointerAlignment to Left 2021-07-17 23:36:13 +08:00
halx99 f0a2bd416a Improve code quality 2021-07-17 23:32:31 +08:00
halx99 4b7e098e65 Improve code quality 2021-07-16 11:04:38 +08:00
halx99 40a70806cb Fix ci 2021-07-15 23:31:49 +08:00
halx99 0d4aec88d1 Improve code style 2021-07-15 23:10:36 +08:00
halx99 ec5ef59474 Improve code quality 2021-07-15 23:03:43 +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 2870cd86b8 Add defaultValue CCValue::asXXX for number types [skip ci] 2021-07-15 12:21:38 +08:00
halx99 465440d689 Improve logic 2021-07-10 00:32:19 +08:00
halx99 a97ba886bf Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 f3f43ffb89 Restrict detect utf-8 support 2021-07-08 00:39:22 +08:00
halx99 f9ecb53623 Fix member not initialized [skip ci] 2021-07-07 22:38:58 +08:00
halx99 bb79db77c2 detectNonAsciiUTF8 Don't regard null character as ascii 2021-07-07 22:35:30 +08:00
halx99 8ce2947a0e 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 c94e6739bf Fix ci error 2021-07-07 14:09:11 +08:00
halx99 ed3a0d05ec 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 9048db93a7 Delete unused comment 2021-07-07 04:08:07 +08:00
halx99 d5f6714534 Code style 2021-07-06 21:15:02 +08:00
halx99 1292003e83 For doxgen happy 2021-07-06 15:22:07 +08:00
halx99 0c74a94525 Implement HttpClient::sendSync with std::promise 2021-07-06 11:39:53 +08:00
halx99 f4969ee388 HttpClient: Fix crash when process redirect 2021-07-06 02:44:57 +08:00
halx99 af0a0f1598 Fix CCValue move assignment with std::string 2021-07-06 01:44:02 +08:00
halx99 f895690b9d HttpClient: refine User-Agent encoding 2021-07-05 20:42:22 +08:00
halx99 3df92d56de HttpClient handle content type from custom headers 2021-07-05 14:24:04 +08:00
halx99 34d51633ad Fix ci [ci build] 2021-07-04 21:59:31 +08:00
halx99 14b24ed14b Refine code [ci build] 2021-07-04 21:21:29 +08:00
halx99 dabdb1315d Fix #414 2021-07-04 21:18:14 +08:00
halx99 43f25d5ad7 Downloader background task [ci build] 2021-07-04 19:26:18 +08:00
halx99 97425dc655 Fix #413 2021-07-04 16:40:34 +08:00
halx99 169d15943a Delete unused code 2021-07-02 15:17:13 +08:00
halx99 ea014d2924 ASTC decompress benchmark print 2021-07-02 15:11:01 +08:00
halx99 e2c213e0bd Take care memory leak 2021-07-02 14:32:22 +08:00
halx99 be7c037cd9 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 f6cbe606fd Fix ci [ci build] 2021-07-02 13:25:00 +08:00
halx99 71a0abf11c Always decompress astc parallel for sotware decoder [ci build] 2021-07-02 13:00:04 +08:00
halx99 8a904f72fa Update astc.cpp 2021-07-02 00:38:02 +08:00
halx99 9cac9491ed Revert profile 2021-07-02 00:23:26 +08:00
halx99 b6610a242f 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 2986c9d248 Make astc decode profile same with render backend 2021-06-28 21:04:36 +08:00
halx99 7d635e2a37 Improve Sprite programState update logic 2021-06-27 21:43:21 +08:00
halx99 10c1ed15ef 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 44677f1a3b Improve HttpResponse interanlCode set 2021-06-25 18:29:16 +08:00
halx99 3ea793f11e Simplify code 2021-06-25 08:18:32 +08:00
halx99 81ece6d061 Optimize CCValue [ci build] 2021-06-25 07:30:47 +08:00
halx99 f5c9bfc38f Tidy thirdparty lib xsxml, fastlib to xsbase 2021-06-25 07:29:14 +08:00
halx99 d12c614f99 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 72d1ba9ea6 Merge: df58dd753c 2397d54daf 
Merge branch 'dev' into Chipmunk2D
 2021-06-24 17:04:04 +08:00
aismann dbcb5816fe Add springs (draw), add Copyright, improve Chipmunk2d - Testbed 2021-06-24 09:54:02 +02:00
halx99 14dc7f05f9 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 f4871674df More compatible 2021-06-24 10:21:41 +08:00
halx99 36d258f589 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 8d0f8de1f4 Improve Uri parse 2021-06-22 14:19:22 +08:00
halx99 9ed3be94c0 Fix for luabinding generator [ci build] 2021-06-18 11:31:07 +08:00
halx99 e5237503fb Fix #386 [ci build] 2021-06-17 22:22:41 +08:00
halx99 3c9a18675c Add some comment for pr #384 2021-06-17 21:56:38 +08:00
RH 7d8fe551cc Use TTF scaled metrics to calculate line height (#384) 2021-06-17 21:15:50 +08:00
RH 621a6a16f5 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 382a12f181 Improve progress timer (#375) 2021-06-13 10:05:30 +08:00
halx99 9705ef7f11 Update CCConfiguration.cpp 2021-06-10 16:51:30 +08:00
halx99 123a6555c9 Fix android astc support check 
glCompressedTexImage2D no error, regard the device support astc
 2021-06-10 16:42:57 +08:00
halx99 c53038448d Fix android compile error [ci build] 2021-06-10 14:17:47 +08:00