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

5280 Commits

Author SHA1 Message Date
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
minggo 514834c4c0 use sprite to create editbox (#20371) 2019-11-26 23:40:48 +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
coulsonwang 5b15737b3a fix walking boundary of terrain (#20364) 2019-11-22 16:07:14 +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
coulsonwang dde4780e14 decrease the font size or it will be conflict (#20333) 2019-11-14 18:11:15 +08:00
coulsonwang a6f73e2f5a adjust testItem relative position (#20331) 2019-11-14 15:13:20 +08:00
Arnold 6a53b31d08 [bugfix] add pagezero_size link flags (#20321) 2019-11-13 11:07:52 +08:00
minggo 98ab6d23b6
set iOS default deployment version in correct place (#20307) 2019-11-08 10:30:51 +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
coulsonwang d41457d447 comment spine codes in lua (#20272) 2019-10-30 16:25:08 +08:00
coulsonwang 4f486528cc fix walking boundary of 3D test in lua 2019-10-29 19:24:35 +08:00
minggo 487634b5b7
Merge pull request #20264 from Mee-gu/fixLua 
fix experimental namespace
 2019-10-29 14:30:10 +08:00
coulsonwang d77cd8f3b1 fix experimental namespace 2019-10-29 14:19:16 +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
minggo 4af28a2f68
revert cpp-empty-test (#20262) 2019-10-29 10:46:24 +08:00
minggo 84feb1f87c
update default ABI 2019-10-28 15:43:42 +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
coulsonwang ee4432661c fix label text word wrong warp issue (#20226) 2019-10-23 14:13:38 +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 b8cf680342 update ProgramState usage in lua (#20204) 2019-10-16 09:48:38 +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
coulsonwang 5918758904 fixLuaNodeTest (#20145) 
set depth write mask correctly
 2019-09-20 17:30:52 +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 83dd39ec0b remove unneeded codes (#20126) 
was removed from Sprite3D. Should not be call from lua.
 2019-09-18 09:22:15 +08:00
Arnold 96ae05d511 [bugfix] Android compile error on arm64 (#20128) 
* add --no-warn-shared-textrel only in android/x86

* update comment position
 2019-09-18 09:21:56 +08:00
minggo 9df47ef6fd
use WKWebview instead (#20103) 
UIWebView is removed in iOS 13.
 2019-09-06 09:57:38 +08:00
coulsonwang d9e6c74ea6 particle use tiff issue (#20105) 2019-09-06 09:46:15 +08:00
Arnold eed319938d [lua tests] MaterialSystemTest update u_Time uniform (#20083) 2019-09-05 15:56:39 +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
Arnold 56c9ec137c add link flags (#20069) 2019-09-02 09:39:43 +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
coulsonwang e23f1f34c3 remove step mode (#20032) 2019-08-15 09:31:44 +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
coulsonwang e70f09368b fix fast tile map (#19905) 2019-07-04 17:54:10 +08:00
coulsonwang fbd0062e3d fix tile map test in lua (#19897) 2019-07-03 16:03:58 +08:00
minggo 96534de260
fix warnings (#19891) 2019-07-03 10:43:10 +08:00
Arnold 888cd9b159 fix lua (#19888) 2019-07-02 09:29:20 +08:00
coulsonwang 7f96375871 Feature/fix tile map (#19883) 2019-06-30 11:36:52 +08:00
coulsonwang e8839cefbe Feature/lua drawing node (#19863) 
* fix DrawInRect in lua

* fix

* rename
 2019-06-27 17:44:07 +08:00
minggo b9d72cdb53
add missing label (#19871) 2019-06-27 13:41:41 +08:00
Arnold 4f6e6454ba convert to integer (#19872) 2019-06-27 13:38:27 +08:00
Arnold 0dfb0de1d3 remove removeFromParentAndCleanup (#19860) 2019-06-25 09:18:06 +08:00
coulsonwang 22e8a651d2 Feature/lua render texture test (#19827) 
* fix render texture test in lua

* remove unnecessary code

* fix CI compile error
 2019-06-18 22:45:14 -07: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
Arnold 7851f212bf Rename backend::Texture2D (#19821) 
* compile on windows

* compile on mac

* rename to Texture2DBackend

* compile on mac
 2019-06-12 00:01:15 -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
minggo 0d2b40b6ec
Merge pull request #19815 from PatriceJiang/ccEditBox_to_ccuiEditBox 
[lua-tests] replace cc.EditBox with ccui.EditBox
 2019-06-10 01:53:26 -07:00
minggo 1445bca9b0
Merge pull request #19816 from PatriceJiang/fix_audio_engine_slider 
[cpp-tests] bugfix NewAudioEngineTests slider callback
 2019-06-10 01:52:36 -07:00
Arnold ad0ffc205c
update deprecated calls 2019-06-10 14:34:26 +08:00
Arnold b2c5535ff4
ignore ON_PERCENTAGE_CHANGED event 2019-06-10 10:25:50 +08:00
Arnold e9700c4e9d
replace deprecated usage 2019-06-10 10:01:14 +08:00
Arnold a826515bbe
extend buffer size 2019-06-10 01:33:20 +08:00
minggo b3f7f8922c
Merge pull request #19807 from PatriceJiang/lua_fix_proguard 
[lua-tests] update proguard configuration
 2019-06-06 03:31:51 -07:00
minggo c1f90ada4d
Merge pull request #19809 from PatriceJiang/fix_gl_consnts 
[lua-tests] replace `gl.` constant variables
 2019-06-06 03:28:17 -07:00
minggo a0a4e08674
[lua-tests] replace cc.LabelTTF:create with cc.Label:createWithTTF (#19806) 
* remove in FileUtilsTest

* fix label
 2019-06-06 02:51:01 -07:00
patricejiang 6706c4dd04
save 2019-06-06 17:15:17 +08:00
Arnold c616fdce85 [lua tests] update Scene3DTest programState usage (#19803) 
* fix title of DrawPrivmitivesTests

* fix program state in Scene3DTests
 2019-06-05 23:45:45 -07:00
Arnold f5a479d20c
update 2019-06-06 10:12:18 +08:00