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

3042 Commits

Author SHA1 Message Date
halx99 adf09cf173 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 4142499bc4 Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:05:36 +08:00
halx99 dfce234ced Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template 2020-10-18 01:01:36 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 2f934aeedc Simplfy hsv color 2020-10-16 17:23:29 +08:00
HALX99 b342ebd7ae
Refactor programState management (#236) 
1. Add custom program registery
2. Re-enable batch draw for custom program
 2020-10-16 16:23:14 +08:00
HALX99 235f09f635
Refactor pixel format manipulate (#217) 
* PixelFormat use table

* Correct PixelFormat name to match 'GL_LUMINANCE'

* Up

* fix cube update texture enum

* linux build

* Refine ci

* fix linux build

* Remove unused function, match mtl framebuffer pixel format

* readPixels always RGBA format

* fix ci for linux

* fix linux build

* Remove unused functions

* fix travis

* fix android ci

* Update config.json

* linux glad

* Update CCGLViewImpl-desktop.cpp

* fix linux build

* Fix linux build

* Link issue [skip appveyor][skip travis]

* Update CMakeLists.txt

* Refine GL enums use

* Update test case name [skip appveyor][skip travis]

* fix linux link issue

* for mtl

* fix ci

* Tidy pixelformat enums

* fix ci

* fix rgba8 to abgr4 error

* fix ci

* fix ci for GLES

* Fix linux build, require glibc-2.27+

* Use properly dist for travis [skip appveyor]

* fix linux build [skip appveyor]

* Update install-deps-linux.sh

* Remove unused members for pixel block info, update external to v73

* Sync from compile linux warnings

* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format

* metal doesn't support rgb8 (#3)

* Update CCTexture2D.cpp

* Refine code

* Pixel Format Descriptor Table

* fix ci

* BGR5A1

* Simplfy texture format convert function name

* Update

* rgba4 match mtl render format

* Add note about RGBA4

* Remove unused function

* fix osx

* Already converted at texture2d

* Clearly comment

* fixup
 2020-09-25 11:07:56 +08:00
halx99 e8ce296dd3 Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523 2020-09-17 11:49:47 +08:00
halx99 8c7ce70ef6 fix warn [skip appveyor] 2020-09-11 18:46:15 +08:00
halx99 7249325ff4 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
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