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

38808 Commits

Author SHA1 Message Date
Arnold a0e114a07f remove cc.SimpleAudioEngine (#19859) 2019-06-25 09:41:19 +08:00
Arnold 0dfb0de1d3 remove removeFromParentAndCleanup (#19860) 2019-06-25 09:18:06 +08:00
coulsonwang ab749c69ec fix setBlendFunc (#19858) 2019-06-24 15:30:15 +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 1b6c3a7173 setFrameBufferOnly to false when necessary (#19843) 2019-06-18 18:05:22 -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
coulsonwang 7486fe89dc fix flip issue (#19831) 
* fix flip

* fix flip issue
 2019-06-18 00:20:29 -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 9281ca701e
fix ref of binding-generators' (#19839) 2019-06-17 10:35:18 +08:00
Arnold c8e909eecf
update tools/cocos2d-console (#19838) 2019-06-17 10:15:57 +08: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 3c93c3d3dd swap shader source arguments (#19823) 2019-06-11 23:54:15 -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 ef442e5cc8
Merge pull request #19818 from PatriceJiang/fix_view_pollEvents 
[bugfix] glview->pollEvents in main loop
 2019-06-10 23:13:58 -07:00
patricejiang 85b72ca88a
pollEvents in loop 2019-06-11 10:16:20 +08: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
minggo 73e21ea187
Merge pull request #19817 from PatriceJiang/update_deprecated_functions 
[lua-tests] update deprecated calls
 2019-06-10 01:44:20 -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
minggo 82e9024e94
Merge pull request #19814 from PatriceJiang/fix_obb_collision_test 
[lua-tests] extend buffer size of Draw3DNode
 2019-06-09 18:55:19 -07:00
minggo 261cf5b82a
Merge pull request #19810 from minggo/change-version 
change version to beta
 2019-06-09 18:31:11 -07:00
minggo 07959475de
Merge pull request #19808 from minggo/fix-warnings 
fix warnings
 2019-06-09 18:30:24 -07: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 e1a10faa9c change version to beta 2019-06-06 18:16:55 +08:00
minggo 0a85432d02 remove unneeded codes 2019-06-06 18:00:45 +08:00
minggo d6cbaa44e0 fix warnings 2019-06-06 17:53:16 +08: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
Arnold 60deaa60ca run genbindings.py (#19805) 2019-06-06 02:49:33 -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
coulsonwang 9bea7a3255 fix crash when using compressed pixel format (#19794) 2019-06-04 18:30:16 -07:00
minggo 46ffa8e03d
remove PROP_BUILD_TYPE (#19795) 
since only support cmake now
 2019-06-04 18:29:58 -07:00
coulsonwang 655d0d3404 [TileMapTest] Depth write state setting should not depended on the depth test flag (#19792) 2019-06-04 03:09:47 -07:00
coulsonwang 59d5f97d30 fix compile error (#19788) 2019-06-03 19:52:16 -07:00
coulsonwang 7c29811c81 vertex shader does not need header define (#19785) 2019-06-03 19:43:19 -07:00
coulsonwang bf93892ec9 bind texture target (#19786) 2019-06-03 18:25:32 -07:00
coulsonwang 89ba801628 add compressed format for metal (#19762) 2019-06-03 03:34:28 -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