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

5161 Commits

Author SHA1 Message Date
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
Arnold 58269d2ce2
update consts 2019-06-06 10:02:12 +08:00
Arnold 39113c0a73
remove in FileUtilsTest 2019-06-06 09:32:50 +08:00
Arnold ed364476d3
fix label 2019-06-06 16:16:20 +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