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

30857 Commits

Author SHA1 Message Date
pandamicro 1a9056cf14 Merge pull request #12300 from jianglong0156/textFieldShowString 
[ci skip]add textfield show textString
 2015-06-11 19:33:21 +08:00
CocosRobot b2c5c69816 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 09:46:08 +00:00
pandamicro 12de53726d Merge pull request #12182 from VisualSJ/v3-jsb 
[ci skip] Synchronization studio parser
 2015-06-11 17:35:15 +08:00
jianglong0156 c317eb428a fix webview crash in android 2015-06-11 17:28:02 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
pandamicro 902f1696e8 Merge pull request #12290 from jianglong0156/issue#2928texture2d 
[ci skip]add pr#2928 test case, load same remote img. can callback the function
 2015-06-11 16:51:59 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix 
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
 2015-06-11 16:34:45 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
Hao Wu 8d99a7b842 Merge pull request #13 from samuele3hu/v3_update_spritepolygon 
Update the Lua binding about the Polygon and update the test case.
 2015-06-11 15:18:06 +08:00
WenhaiLin aff2f8c2c4 Fixed compile error. 2015-06-11 14:42:03 +08:00
samuele3hu 17b1dee363 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-11 14:39:35 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
pandamicro 8e3e928efd Merge pull request #12040 from geron-cn/v3 
fix bug:  fix actiontimeline can not step to last frame when loop play
 2015-06-11 14:36:08 +08:00
子龙山人 03814a569d Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix 
SimpleAudioEngine:Fixed thread safety problem on android.
 2015-06-11 14:30:36 +08:00
子龙山人 f1c183f785 Merge pull request #12294 from CocosRobot/update_lua_bindings_1434003034 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-11 14:25:31 +08:00
子龙山人 b79e167900 Merge pull request #12293 from CocosRobot/update_cocosfiles_1434003160 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-11 14:25:09 +08:00
CocosRobot 94a47fabcf [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 06:16:36 +00:00
CocosRobot c58927e7fc [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-11 06:12:41 +00:00
pandamicro 6dfe937cae Merge pull request #11892 from dabingnn/v3FrameBufferObject 
V3 frame buffer object
 2015-06-11 14:04:30 +08:00
Vincent Yang 097bf455c2 Rename CCRenderBufferObject to CCRenderBuffer in windows projects. 2015-06-11 11:45:10 +08:00
VisualSJ 2d12d6a295 Plist file parsing (action-2.x.js) 2015-06-11 11:14:10 +08:00
jianglong0156 f97955682a add pr#2928 test case, load same remote img. can callback the function 2015-06-11 11:11:51 +08:00
Hao Wu 92c14ef210 Merge pull request #12 from fusijie/fix_spritepolygon2 
change clipper version to 6.1.3.
 2015-06-11 10:55:16 +08:00
Jacky a32fec8471 change clipper version to 6.1.3. 2015-06-11 10:45:37 +08:00
Hao Wu 9f94cb415c Merge pull request #11 from fusijie/fix_spritepolygon2 
remove draw points and add expand precision.
 2015-06-11 10:01:11 +08:00
Oscar Utbult 3a4b6bf52b Add debug flag -Wextra 2015-06-10 23:02:13 +02:00
pandamicro 25a25776ce Add macro_judgement to physics3d auto bindings 2015-06-10 19:39:29 +08:00
pandamicro 70606caa14 Fix template android compilation issue on physics3d 2015-06-10 19:37:52 +08:00
Jacky 4b5bcc06a1 remove draw points and add expand precision. 2015-06-10 18:54:53 +08:00
jianglong0156 96ce3ec22c add textfield show textString 2015-06-10 16:15:09 +08:00
pandamicro f38c8852fc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-10 15:22:11 +08:00
samuele3hu 8935ad0226 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-10 13:54:32 +08:00
子龙山人 b666b373c7 Merge pull request #12261 from iris-wy/v3 
fix bug #12200
 2015-06-10 11:39:22 +08:00
子龙山人 7f9a01c340 Merge pull request #12272 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-10 10:55:50 +08:00
andyque 4e754dd999 modify changelog 2015-06-10 10:54:50 +08:00
子龙山人 6c0fb80eb1 Merge pull request #12269 from CocosRobot/update_cocosfiles_1433900952 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-10 10:32:27 +08:00
Hao Wu 02d18a6bf5 Merge pull request #10 from fusijie/fix_spritepolygon2 
fix conflicts.
 2015-06-10 10:27:56 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 
# Conflicts:
#	external/config.json
 2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
Hao Wu db07e21a71 Merge pull request #9 from fusijie/fix_spritepolygon2 
fix memory leakage about operation=
 2015-06-10 10:08:28 +08:00
CocosRobot 369b7d9926 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-10 01:49:13 +00:00
子龙山人 1897eef05d Merge pull request #12267 from oscr/fix_download_deps 
Capitalize default option in download-deps.py
 2015-06-10 09:45:57 +08:00
子龙山人 e1cb308f1d Merge pull request #12234 from MSOpenTech/v3-winrt-ogg 
Added OGG support to winrt audio
 2015-06-10 09:44:32 +08:00
Oscar Utbult 76a3db6f29 Capitalize default option in download-deps.py 2015-06-09 23:58:56 +02:00
anniruddh.koppal 3f4d1c4ed3 Fixed merge conflict issue 2015-06-09 14:06:24 -07:00
yangxiao 7f26ccb9ba code style 2015-06-09 14:06:09 -07:00
tangziwen fc34881ab9 fix Terrain::getIntersectionPoint 2015-06-09 13:23:33 -07:00
Justin Hawkwood 852639cfe7 Added empty string check 2015-06-09 09:19:04 -07:00
Dale Stammen 0cb2f87d3e Merge branch 'v3' into v3-winrt-ogg 2015-06-09 08:21:09 -07:00
子龙山人 a202387800 Merge pull request #12247 from stari4ek/v3-outline-inner-holes 
improve rendering of letter's inner shapes when outline is used
 2015-06-09 23:11:39 +08:00