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

579 Commits

Author SHA1 Message Date
aismann 91843b3fae Chipmunk2D and Box2D works together now (add two new classes) 
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D

Improve window size problem with ImGuiEXTTest
 2020-12-01 10:15:30 +01:00
Eismann b51545ac54 Same as on 3.17 (with small changes) 2020-11-23 07:46:09 +01:00
Eismann e08b35755b Update Box2dTest.h 2020-11-20 07:05:21 +01:00
Eismann d126affebf Update CMakeLists.txt 2020-11-20 06:38:09 +01:00
Eismann 232fea1442 add Box2D to CMakeList 2020-11-20 06:19:30 +01:00
Eismann 7179435c80 Add BOX2D test 
Add BOX2D test
 2020-11-20 04:51:47 +01:00
halx99 a976e217c1 Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0 2020-11-12 22:50:38 +08:00
halx99 db2e468e91 CMake, use file TO_CMAKE_PATH instead string replace [ci build] 2020-11-12 22:47:35 +08:00
halx99 c98313ac4b Prepre for box2d-2.4.1 2020-11-08 13:11:40 +08:00
halx99 3835174a45 Sync folder for binding generator config 2020-11-01 20:18:50 +08:00
halx99 a4b6361478 fix fairygui-tests ios project file 2020-10-27 00:24:55 -07:00
halx99 f55c974d18 Build android arch arm64-v8a only for ci, fix test case compiling warning 2020-10-26 11:12:55 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +08:00
halx99 0830fe9c14 Only needs updateUniformID when set a unstable uniform variable 2020-10-23 15:07:18 +08:00
halx99 119479b060 Refine ProgramState mat id 2020-10-23 11:37:52 +08:00
halx99 cff35a61b8 Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake 2020-10-22 17:50:25 +08:00
halx99 253b82c617 Make setup.py works with python3 2020-10-22 16:53:28 +08:00
halx99 b8a0e0a478 Finsih rename 2020-10-22 10:58:10 +08:00
halx99 2e7546eca4 Update gradle plugin to 4.1.0 2020-10-21 10:55:32 +08:00
halx99 5748bbee85 Reserve extensions 'cocostudio' for esay to migrate exist projects 2020-10-21 10:12:00 +08:00
halx99 8152e6d8ad cpp-tests for mobile, set resourceSize to 960x640 2020-10-20 16:38:50 +08:00
halx99 9e6b360437 fix lua build link on android 2020-10-19 23:21:40 +08:00
halx99 4c128913c1 Sync SharedLoader template. 2020-10-19 19:19:17 +08:00
halx99 3741bbd7e2 Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project. 2020-10-19 18:33:10 +08:00
halx99 5dc2626894 Reserve extension GUI for cpp-tests only 2020-10-18 12:31:45 +08:00
halx99 fdf2d5f668 Remove gradle compile lua to fix compile error, needs tools to compile and encrypt lua later 2020-10-18 01:12:11 +08:00
halx99 9019cb0d0f 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 d02c9da98b 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 b9c58a8420 Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 5401bbf821 Simplfy hsv color 2020-10-16 17:23:29 +08:00
halx99 c594e3789c 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 cca0739793 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 ac2e8e4bb6 fix ci 2020-09-17 12:10:08 +08:00
halx99 c0a61434e0 Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580 2020-09-17 12:05:31 +08:00
halx99 1f30e31b17 Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523 2020-09-17 11:49:47 +08:00
halx99 f2e7955724 fix warn [skip appveyor] 2020-09-11 18:46:15 +08:00
halx99 4fc03985d3 Use glMapBuffer if available 2020-09-11 17:32:08 +08:00
halx99 6c2939d235 More clearly programState management 2020-09-09 13:03:31 +08:00
halx99 08ee67158a fix ident [skip appveyor] [skip travis] 2020-09-08 17:23:15 +08:00
halx99 7f6b6dfa90 Update CMake scripts and readme 2020-09-08 13:44:59 +08:00
halx99 ddbb6bb0b9 Add ImGuiEXT test case for PC platforms 2020-09-08 13:38:16 +08:00
halx99 d66e62e436 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 cc53868d27 More clearly ETC1 format, sync enums for ETC1, correct somethings 2020-09-01 11:43:03 +08:00
halx99 09cedf60b2 Improve images decoder 2020-08-31 21:04:47 +08:00
halx99 e96ae229dd Merge: 5ddc84bbee 539e5ca42c 
Merge pull request #189 from aismann/patch-8

Update README.md
 2020-08-31 04:27:33 -07:00
halx99 a87c0bba78 More clearly data owner when decode images. 2020-08-31 19:24:23 +08:00
halx99 fa5d2d198b fix resources relative path to avoid test case crash on mobile 2020-08-31 17:39:29 +08:00
halx99 c338472df8 Move copyright notice to header [skip appveyor][skip travis] 2020-08-31 17:35:01 +08:00
halx99 477aa0c185 Clearly CCLOG content 2020-08-31 17:13:04 +08:00
halx99 43f464163c 1. Finish ETC2 support on GL renderer backend 
2. Improve ASTC compressed format check
 2020-08-30 17:58:39 +08:00
halx99 2197bb52cd Sync missing feature from v3, and API compatible 2020-08-28 16:33:52 +08:00
halx99 4674b1e89d Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough 2020-08-28 15:42:40 +08:00
halx99 9eb32b634f Make core lib can be build as dll, fix link issue for external 2020-08-18 12:36:44 +08:00
halx99 a3a231495c Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 abc9d5f411 fix #146 2020-08-18 10:51:32 +08:00
halx99 f0276f37ae Update README files [skip appveyor] [skip travis] 2020-08-17 19:09:54 +08:00
halx99 d084d9f61a 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 b456364167 Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja 2020-08-10 15:04:12 +08:00
halx99 d179f7916f Remove unnecessary code 2020-08-10 00:21:56 +08:00
halx99 0d357b57f8 Optimize YAsioTest, see #150 2020-08-10 00:20:29 +08:00
aismann 6cd61aac2f Polygon looks correct now 
Tested with Clipper 6.x and new poly2tri
 2020-08-08 09:57:17 +02:00
halx99 ebc8086a4c Sync optimize code 2020-08-06 19:58:24 +08:00
halx99 d1f7de2c03 Update fairygui-tests project name for android 2020-08-05 16:33:13 +08:00
halx99 cb40701e35 Sync fairygui-tests settings for ios 2020-08-05 13:33:31 +08:00
halx99 29113690a4 Sync fairygui-tests settings for android 2020-08-05 13:32:14 +08:00
halx99 ec80ebd344 Optimize CMake scripts 2020-08-04 14:05:00 +08:00
halx99 cf52f4d46a Add full fairygui-tests 2020-08-04 13:15:02 +08:00
halx99 8b9a6bbbf1 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 1e392c9dfe Refine readme [skip appveyor][skip travis] 2020-08-03 19:12:07 +08:00
halx99 3049b8f751 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
aismann 400c34fffb The switch to the third monitor was not working 2020-08-03 08:34:19 +02:00
halx99 588e977ef0 Merge: 8cc189fb4d 6fd4d6e4ab 
Merge pull request #134 from halx99/fullscreen-mode

Refactor full screen support
 2020-08-02 20:03:07 -07:00
halx99 d6958498d4 Unify plist implementation, remove apple specific sources. 2020-08-03 10:48:26 +08:00
halx99 839922bbfe 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 bd9a409dd7 Add wav testcase 2020-08-01 19:25:39 +08:00
Eismann 5edcd0b97d Add tests for Fullscreen Monitor 3 
Add tests for Fullscreen Monitor 3 (if present)
 2020-08-01 07:12:29 +02:00
Eismann ba0e91f7e3 Revert "Revert "Update NewAudioEngineTest.cpp"" 
This reverts commit 379c099b2d.
 2020-08-01 06:55:33 +02:00
Eismann 4c36d9477a Revert "Update NewAudioEngineTest.cpp" 
This reverts commit 87232d61b1.
 2020-08-01 06:54:56 +02:00
Eismann 34b3f1589e Update NewAudioEngineTest.cpp 
"wav-samples/8kadpcm.wav" not existing.
 2020-08-01 06:49:44 +02:00
halx99 c71642b14f Optimize link, remove -Wl,--whole-archive for linking 3rd libs. 2020-07-29 18:55:45 +08:00
halx99 f98bcff3a6 Copy angle binaries 2020-07-23 10:32:50 +08:00
halx99 690e89b00e Remove a submodules. 2020-07-20 18:41:45 +08:00
halx99 16a0fd73c3 Merge: db0ed5bd59 a3a65b0320 
Merge pull request #109 from halx99/win-utf8

Improve utf-8 path on win32, explicit call wide version of system API.
 2020-07-10 16:56:18 +08:00
halx99 e9fa3b4dac Merge: 7624df74f3 d20d3fd241 
Merge pull request #111 from halx99/fix-type-error

fix type error, well xxhash never generate 0 for validate draw command.
 2020-07-10 16:42:57 +08:00
halx99 67ab691c30 fix compile issue 2020-07-10 16:00:21 +08:00
halx99 489fb1a50a finish angle dependencies auto copy for win32, make flatbuffers dep header only 2020-06-14 12:50:20 +08:00
halx99 04a460705d finish issue: #85 2020-05-06 15:42:25 +08:00
halx99 b30af83018 Remove unused Android.mk files 2020-03-04 22:59:33 +08:00
halx99 ecd988d324 Update deps to v33 2020-03-03 23:17:38 +08:00
halx99 52058861a0 Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 0cb266cb57 Merge: d3162956e7 5416b4d34c 
Merge pull request #60 from c4games/remove-xxtea

Remove xxtea, cleanup xxtea reference sources
 2020-02-15 23:48:21 +08:00
halx99 853e6b92e2 Update features status 2020-02-15 21:20:22 +08:00
halx99 52d8799d64 Remove xxtea, cleanup xxtea reference sources 2020-02-15 20:54:33 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad 
Merge pull request #50 from weiwest/master

add astc support (Great Job)
 2020-02-12 20:24:29 +08:00
halx99 53d784af8d fix #51 2020-02-12 20:15:09 +08:00
weiwest a998fe8c14 Merge: 2a02db76d8 2d3e162e21 
Merge remote-tracking branch 'upstream/master'
 2020-02-12 16:58:47 +08:00
weiwest 33b9e8330b add astc soft decode support 2020-02-11 23:54:17 +08:00
halx99 aa4d08eb3f Merge: ffcb65fdaa e10155bef4 
Merge pull request #39 from halx99/master

Refactor UserDefault, add plain mode for win32.
 2020-02-06 23:28:33 +08:00
weiwest 2acb59d377 add astc support 8x8 block size 2020-02-06 21:54:45 +08:00
halx99 a91953ac1a Refactor UserDefault, optmize for huge entities. 2020-02-06 01:08:51 +08:00
weiwest 27927bbcb3 add astc support 2d 4x4 RGBA 2020-02-05 22:45:19 +08:00
halx99 29f3ffc66e Merge: 8cb437601f 36f0d0b902 
Merge pull request #35 from weiwest/master

add windows android start guide
 2020-02-04 22:56:49 +08:00
halx99 7ad3f908b6 Refactor UserDefault, use file mapping & plain binary encode/decode for all platform 2020-02-04 22:28:54 +08:00
halx99 a95a49713a Fix .so auto link when folder not exists 2020-02-04 20:57:20 +08:00
halx99 9793a9dd7f load .so at AppActivity.java 2020-02-04 19:22:11 +08:00
halx99 325db43cdb fix compile issue 2020-02-03 22:01:18 +08:00
halx99 6aacce867f solve auto link .so for android platform 2020-02-03 21:18:23 +08:00
minggo 4f6a6b0960 set xcode installation path to (#20402) 2020-01-18 20:40:21 +08:00
RH f1c58b23e2 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 1f7e7b238e 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 1cd85b88d0 set attribute (#20417) 2020-01-18 20:40:09 +08:00
Arnold a0e24c4c42 [bugfix] set CFBundleExectuable in template info.plist (#20425) 
fix #20414
 2020-01-18 20:40:00 +08:00
halx99 b94c50f126 Add test case for yasio 2020-01-05 04:24:13 +08:00
halx99 8cc7800ea8 [v4] spine v3.8 2020-01-05 03:09:32 +08:00
RH 2b3c2872b7 Fix for issue #19890 (#20407) 2019-12-12 23:55:23 +08:00
Arnold e564e12f3a [bugfix] set Info.plist path (#20405) 
fix bug introduced in #20205
 2019-12-12 23:55:18 +08:00
halx99 be25a22759 fix SpritePolygonTest 2019-12-03 00:50:11 +08:00
halx99 1795e8c792 fix link issue for android 2019-12-02 18:17:42 +08:00
halx99 5759ea94e6 update links 2019-12-02 05:40:50 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489 
Merge pull request #11 from simdsoft/sync-v4

Sync v4
 2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2 
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
 2019-11-26 08:28:03 -08:00
coulsonwang 832ae29932 adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
halx99 0536b38509 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 305e7c6549 Update etc1 alpha test case 2019-11-25 02:46:52 +08:00
halx99 442012b525 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1 
Merge branch 'master' of https://github.com/simdsoft/engine-v5
 2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 d00fea9340 Remove websockets, sync tests. 2019-11-24 21:02:16 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00