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

3082 Commits

Author SHA1 Message Date
halx99 992d6139d9 More clearly programState management 2020-09-09 13:03:31 +08:00
HALX99 03c2fa52e0
fix ident [skip appveyor] [skip travis] 2020-09-08 17:23:15 +08:00
halx99 7a15d5b74f Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 090cd1002b Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
HALX99 7a2f91e514
ASTC6x6 support and more comment about bpp usage in engine (#191) 
* ASTC6x6 support and more comment abount bpp usage in engine

* fix log output

* Comment astc compression tool download url

* Add command line comment for astcenc tool [skip travis][skip appveyor]

* Add astc_6x6 test image[skip appveyor][skip travis]

* astc_6x6 mtl

* Refine log info[skip appveyor][skip travis]

* Empty line[skip appveyor][skip travis]
 2020-09-03 18:01:40 +08:00
HALX99 2539e78774
Merge pull request #188 from halx99/etc2-support 
Add etc2 compressed texture support
 2020-09-01 00:16:01 -07:00
halx99 f3c17427aa More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 5ddc84bbee fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 e7811e707a 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 8b7505e171 Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 ae99a5965b Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 3c7ede5859 Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +08:00
halx99 9d9067dec4 Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 e44903c461 Update README files [skip appveyor] [skip travis] 2020-08-17 19:09:54 +08:00
halx99 67ef8bb624 Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms. 2020-08-17 18:45:14 +08:00
halx99 bcc00eaffe Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 0b728e076a Remove unnecessary code 2020-08-10 00:21:56 +08:00
halx99 adc97af519 Optimize YAsioTest, see #150 2020-08-10 00:20:29 +08:00
aismann c5f1e242e3
Polygon looks correct now 
Tested with Clipper 6.x and new poly2tri
 2020-08-08 09:57:17 +02:00
halx99 f38f76c1a1 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 6eb58f58bd Optimize CMake scripts 2020-08-04 14:05:00 +08:00
halx99 b142167560 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
aismann 1c811d857a
The switch to the third monitor was not working 2020-08-03 08:34:19 +02:00
halx99 6f274a8003 Set full screen before layout renderer elements to ensure VisibleRect is correct with full screen window size 2020-08-02 16:55:21 +08:00
halx99 aa59cf6876 Add wav testcase 2020-08-01 19:25:39 +08:00
Eismann 253f82a894 Add tests for Fullscreen Monitor 3 
Add tests for Fullscreen Monitor 3 (if present)
 2020-08-01 07:12:29 +02:00
Eismann 8c71708323 Revert "Revert "Update NewAudioEngineTest.cpp"" 
This reverts commit 379c099b2d.
 2020-08-01 06:55:33 +02:00
Eismann 379c099b2d Revert "Update NewAudioEngineTest.cpp" 
This reverts commit 87232d61b1.
 2020-08-01 06:54:56 +02:00
Eismann 87232d61b1 Update NewAudioEngineTest.cpp 
"wav-samples/8kadpcm.wav" not existing.
 2020-08-01 06:49:44 +02:00
halx99 da7e235b25 Optimize link, remove -Wl,--whole-archive for linking 3rd libs. 2020-07-29 18:55:45 +08:00
halx99 d1cd05c0c8 Copy angle binaries 2020-07-23 10:32:50 +08:00
halx99 26fb5a596c Add ccs-res 2020-07-20 18:47:47 +08:00
halx99 a70b43af1e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 87635cfa81 fix compile issue 2020-07-10 16:00:21 +08:00
halx99 93a3452261 finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 40cb068201 finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 b24d244f6e Remove unused Android.mk files 2020-03-04 22:59:33 +08:00
halx99 313d4dc2a1 Update deps to v33 2020-03-03 23:17:38 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
weiwest 89105d0db2 Merge remote-tracking branch 'upstream/master' 2020-02-12 16:58:47 +08:00
weiwest 9496d34470 add astc soft decode support 2020-02-11 23:54:17 +08:00
weiwest dbc089d51d add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
weiwest a6edda385b add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 b6cf5871cd Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
halx99 3f78448495 Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 a40c81e984 load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
halx99 1b33d88416 fix compile issue 2020-02-03 22:01:18 +08:00
halx99 a350f4be88 solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
minggo 589e09c328 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
RH 93352ff06f V4 bmfont improved api (#20406) 
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
 2020-01-18 20:40:17 +08:00
RH 3b3086b8d8 V4 uilayout scissorclipping fix (#20415) 
* Fix for issue #19890

* Updated with better fix from the V3 PR #18651

* Formatting fix

* Fixed issue with incorrect type (double instead of float) when compiling on certain platforms.

* Another attempt to fix compilation issue
 2020-01-18 20:40:13 +08:00
Arnold 2fdb65e2c6 set attribute (#20417) 2020-01-18 20:40:09 +08:00
Arnold cdc0d4702c [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
halx99 d3aabf3f89 Add test case for yasio 2020-01-05 04:24:13 +08:00
halx99 a2eb8507bb [v4] spine v3.8 2020-01-05 03:09:32 +08:00
RH deffc2cbef Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
Arnold b74af1970b [bugfix] set Info.plist path (#20405) 
fix bug introduced in #20205
 2019-12-12 23:55:18 +08:00
halx99 3a877c50f2 fix SpritePolygonTest 2019-12-03 00:50:11 +08:00
HALX99 d4b9775436
fix link issue for android 2019-12-02 18:17:42 +08:00
halx99 4bab298e21 update links 2019-12-02 05:40:50 +08:00
coulsonwang abc25ae04a adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 ab7ccf0a58 Update etc1 alpha test case 2019-11-25 02:46:52 +08:00
halx99 30ffbe1514 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 d3e97a75a3 Remove websockets, sync tests. 2019-11-24 21:02:16 +08:00
Arnold 3b4748009f
use copy instead of linkis (#20356) 2019-11-21 15:12:37 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
Arnold e3c636c23c Sync resource automatically on Windows and Linux (#20319) 2019-11-15 10:24:38 +08:00
minggo 5acc952a17
fix iOS build issue (#20292) 2019-11-05 15:23:54 +08:00
coulsonwang 8126cfafd5 add defualt ios deloyment target (#20282) 
* add defualt ios deloyment target
 2019-11-01 17:07:52 +08:00
coulsonwang 4914dfff10 fix AudioSwitchStateTest subtile (#20278) 2019-10-31 16:05:57 +08:00
minggo 2f79eb10af fix installation error on some Android devices 
May meet "The application could not be installed: INSTALL_FAILED_TEST_ONLY" error on some devices.
 2019-10-29 11:35:22 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253) 
* nodeTest

* fix
 2019-10-25 18:22:35 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
coulsonwang b849fce842 remove box2d tests (#20246) 2019-10-25 13:37:08 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
Arnold 11a1f820e2 [v4] add unzip test code (#20219) 2019-10-22 13:47:07 +08:00
Andy Duplain 1a04787287 Rework CMake Xcode support. (#20205) 
- Build using C++17 by default.
- Simplified customization of Xcode project via cmake.
- Add documentation to demonstrate how to use the customization.

- NOTE: I believe we could compile with bitcode enabled if the box2d
        library was compiled using bitcode.
 2019-10-22 13:42:56 +08:00
minggo 24b04e561b
sync #20007 to v4 (#20210) 
* sync #20007 to v4

* Fixing a bug in Node::enumerateChildren (#20045)

This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
 2019-10-17 11:12:25 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189) 
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
 2019-10-15 09:40:59 +08:00
coulsonwang ab04e037b7 fix PhysicsContactTest (#20171) 
modify the item relative position to avoid inappropriate operation.
 2019-10-08 15:07:46 +08:00
minggo 42c43a53a1
fix crash when back with playing video (#20169) 2019-09-25 14:33:18 +08:00
coulsonwang 6de088ab98 fix C4244 warning (#20162) 
* fix C4244 warning

* fix warning C4244

* fix compile error
 2019-09-25 14:32:26 +08:00
coulsonwang 03a4ddf764 fix warning (#20146) 
* fix warning
fix warning

* remove integer type constructor for Vec2
 2019-09-24 11:31:35 +08:00
coulsonwang 1888267fa9 add particle texture (#20144) 
add particle texture
 2019-09-20 17:31:08 +08:00
minggo 965ea379a7
Merge pull request #20139 from Mee-gu/fixWarning 
fix warning
 2019-09-20 14:36:36 +08:00
coulsonwang 0dbe3419d2 fix warning 
fix warning
 2019-09-20 11:20:07 +08:00
coulsonwang 4c3375bc41 add particle texture 2019-09-18 10:02:33 +08:00
coulsonwang d9e6c74ea6 particle use tiff issue (#20105) 2019-09-06 09:46:15 +08:00
Arnold 92b48359ea add cert file (#20081) 2019-09-04 10:09:12 +08:00
Arnold 7c3a7153c8 update' (#20082) 2019-09-04 10:06:38 +08:00
Arnold 55f6f6d6e7 [bugfix] Fileutils iOS isDirectory (#20079) 2019-09-04 10:03:38 +08:00
coulsonwang 469fc61d5a set depth write (#20071) 2019-09-04 10:02:03 +08:00
coulsonwang 4d04b64a3a add specific define for metal (#20084) 2019-09-04 09:58:40 +08:00
coulsonwang b4d0522116 shader value validation (#20086) 2019-09-04 09:53:26 +08:00
minggo 5e40f5e6a5
remove tiff (#20047) 2019-08-20 15:15:40 +08:00
coulsonwang c4e6ede197 move VertexLayout to ProgramState (#20029) 
* move VertexLayout to ProgramState

* fix lua
 2019-08-15 16:51:49 +08:00
Arnold 00f07a526c [v4] add renderer performance test (#20011) 2019-08-05 14:25:58 +08:00
rh101 e574e4984f Added support for saving non-premultiplied alpha images from RenderTexture. (#19990) 2019-07-26 17:09:00 +08:00
Arnold f440369f1c Update gradle to 5.1.1 (#19958) 2019-07-24 09:53:02 +08:00
coulsonwang 57a3bd98f1 fix glfw3.3 no respond issue (#19963) 2019-07-23 16:58:35 +08:00
minggo 0d121d7913
remove void in function declaration (#19954) 2019-07-22 09:38:46 +08:00
minggo c8d13184f8
sync 19893: fix Wformat warnings (#19949) 2019-07-22 09:37:48 +08:00
minggo ad54a24cf0
sync 19634 and fix conflict (#19930) 2019-07-19 11:57:11 +08:00
coulsonwang 7b7cf55efb remove vertex step mode (#19921) 2019-07-17 13:59:37 +08:00
minggo 96534de260
fix warnings (#19891) 2019-07-03 10:43:10 +08:00
coulsonwang 7f96375871 Feature/fix tile map (#19883) 2019-06-30 11:36:52 +08:00
minggo b9d72cdb53
add missing label (#19871) 2019-06-27 13:41:41 +08:00
coulsonwang 2c5fc38297 add test case (#19830) 
* add test case

* comment meaningless test case
 2019-06-18 18:04:56 -07:00
coulsonwang 7a94e66a14 Feature/fix alpha test (#19824) 2019-06-18 00:25:26 -07:00
Arnold cf83c91480 [cmake] Update plist template for iOS projects (#19828) 
* update cmake template

* fix tabs

* use function instead of macros

* rename local variables & cocos_fake_set

* use g++ 7 in travis ci

* use clang

* use g++6
 2019-06-17 18:37:56 -07:00
coulsonwang fef1752cfe fix TODO (#19793) 2019-06-11 23:58:07 -07:00
Arnold 36228d0182 use https (#19820) 2019-06-11 18:23:56 -07:00
minggo 1273fb305d
Remove simple audio engine (#19802) 2019-06-11 18:23:16 -07:00
Arnold b2c5535ff4
ignore ON_PERCENTAGE_CHANGED event 2019-06-10 10:25:50 +08:00
coulsonwang 9dc04bf228 remove opengl codes (#19797) 2019-06-05 02:58:33 -07:00
minggo 46ffa8e03d
remove PROP_BUILD_TYPE (#19795) 
since only support cmake now
 2019-06-04 18:29:58 -07:00
coulsonwang 10b2799051 Feature/fix mipmap issues (#19753) 
* fix mipmap

* fix mipmap issues

* remove unneeded code

* fix

* remove Texture2D::PixelFormat, add backend::PixelFormat

* fix lua compile error

* reset *.tps files

* fix compile error

* fix compile error
 2019-06-02 18:39:51 -07:00
coulsonwang 254c57a347 add test cases (#19741) 2019-05-21 19:00:05 -07:00
coulsonwang a066ac729f add subTitle (#19731) 2019-05-21 18:52:40 -07:00
coulsonwang 97431b1197 [ParticleSpriteFrameTest] remove getName() in Texture2D (#19740) 2019-05-21 18:49:11 -07:00
coulsonwang 9c0033e1e7 Feature/draw in rect (#19664) 
* Texture2D draw in point and draw in rectangle tests work

* optimize code

* fix compile error

* make initProgam() private
 2019-05-16 18:14:14 -07:00
coulsonwang 2d02e23fbd Feature/update device info (#19712) 
* update DeviceInfo

* remove unneeded code

* fix indentation

* add FeatureSet enum for metal

* revert code
 2019-05-15 18:26:00 -07:00
coulsonwang 833ab9bb81 need specify font path when use as system font (#19692) 
* need specify font path when use as system font

* set custom fonts
 2019-05-13 18:31:46 -07:00
Arnold 825c4aa3f7 remove bad test case (#19704) 2019-05-13 18:01:04 -07:00
Arnold e52a35708e enable tests (#19702) 2019-05-13 18:00:27 -07:00
Arnold bd76e891d5 [cpp-tests] SpritePolygonTest invoke `UISlide::setPercent` after initialization (#19676) 
* delay onProgressChange event when setProgress

* Revert "delay onProgressChange event when setProgress"

This reverts commit a9ad090f513f08e1103a0fd793d02f26600e52b3.

* setPercent after initialization
 2019-05-09 20:31:10 -07:00
Arnold ce7a6eadbe fix localization tests (#19675) 2019-05-09 01:30:19 -07:00
Arnold 6dc547080f [cpp-tests] fix fileutils list file, reject empty paths (#19681) 
* protect empty string

* enable tests cases
 2019-05-08 19:21:25 -07:00
Arnold 62dc64a8d1 [cpp-tests] camera3dtests adjust button position (#19673) 
* reduce log 1

* fix camera3d test/2 button position
 2019-05-07 18:07:37 -07:00
Arnold 0f2e5f513b fix downloader url (#19674) 2019-05-07 18:07:17 -07:00
Arnold 8a7d6a77f5 merge (#19669) 2019-05-07 00:50:29 -07:00
Arnold 98d5f37a30 fix lua-tests errors (#19646) 
* enable test case

* save

* generate enum classes

* save

* autobindg backend interface

* safe

* fix typos

* fix setUniform

* enable draw primitives and fast tmx tiled map

* save all

* update

* fix compile error on mac

* fix locations

* fix locations

* deduce vertexlayout

* clean

* compile on mac

* fix resource path

* save

* update bindings-generator

* remove unused code

* rename ccbackend to ccb

* remove todo
 2019-05-05 00:26:34 -07:00
coulsonwang 7ee0b65bb6 [Feature] fix spirte, label test when EGL context lost (#19612) 
* [BugFix] fix compile error

* [Feature] fix spirte, label test when EGL context lost

* [Feature] map uniform location

* [Feature] remove unneeded codes

* [Feature] add BufferManager

* [Feature] fix compile error

* [Feature] add files

* [Feature] remove unneeded codes

* [Feature] no need to release opengl resource

* [Feature] update BufferManager

* 1. reCreate frame buffer when needed.
2. initial texture when come back to foreground

* [Feature] add Program and Buffer event listener

* [FixTerrain] need check location had used before

* fix compile error

* add updateTextureDescrptor function for TextureMTL, since TextureMTL creation was move to Texture2D constructor.

* [FixDrawNode] record buffer data when needed

* [FixShaderTest] add nullptr judgement

* [FixShaderText] no need to reCreate ProgramState when come back to foreground

* [FixRenderTexture] retain the render texture image

* [Feature] optimize buffer memory

* fix compile error

* fix CI test fail
 2019-04-29 18:51:45 -07:00
minggo fd792813d2
Optimize calls to std::string::find() and friends (#19624) 2019-04-21 18:44:19 -07:00
minggo 9f8100678b
remove unneeded test case (#19607) 2019-04-15 23:34:15 -07:00
minggo b09e1a8667
add test case title (#19606) 2019-04-15 01:54:27 -07:00
minggo 62d20a9825
Add clear request and responses method to httpclient (#19598) 
* Added functionality to clear pending responses and requests in the http client

* Responses and Requests now are processed in similar way

* Fix for clearing the http requests

* Added tests for HttpClient::clearResponseAndRequestQueue
 2019-04-10 18:33:55 -07:00
minggo ffcf627c13
Ui video player new style looping input options 2019-04-10 18:33:05 -07:00
minggo 195dc704e3
[Android] fix FileUtils::listFiles with path 'assets/' 2019-04-10 00:09:30 -07:00
Arnold 3bf5e84926 [bugfix] cpp-test small bugs (#19574) 2019-04-04 01:13:17 -07:00
Arnold 9a56e6923f [bugfix] motionstreak & DrawNode3D on GL (#19564) 2019-04-03 02:27:15 -07:00
Arnold 6452d5faec [bugfix] enable depth test for all commands in 3d queue (#19565) 
* save states

* save bits

* include deque

* remove 2d default states

* remove unsused flags
 2019-04-02 00:47:55 -07:00
Arnold e4c2c7a01e
enable cpp-tests test cases (#19552) 
* enable more test cases

* enable more
 2019-03-27 13:59:47 +08:00
Arnold aa54a6c576 enable shader tests (#19546) 2019-03-25 22:45:03 -07:00
Arnold 913211116e enable physics (#19545) 2019-03-25 20:02:06 -07:00
minggo 6067d62341
adapt ClippingNodeTest (#19528) 2019-03-24 19:08:49 -07:00
Arnold e1675ae67b Enable navmesh (#19530) 
* enable flags

* impl debug draw

* run tests

* remove comments

* fix mac compile error

* review fix
 2019-03-20 14:34:35 +08:00