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

26517 Commits

Author SHA1 Message Date
yinjimmy 7d430742f1 Merge branch 'bugfix_executeScriptFile' into combine 2015-01-07 15:33:15 +08:00
yinjimmy cbf9741dfd Compatibility code for executeScriptFile 2015-01-07 15:23:58 +08:00
minggo f69f2359c8 Merge pull request #9833 from htlxyz/v3_origin 
V3 origin
 2015-01-07 14:47:11 +08:00
Huabing.Xu 27d4c6a0f6 Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug 
DrawNode override drawPoints function to set pointSize, fix draw points ...
 2015-01-07 14:46:13 +08:00
htl 194fa09f30 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-07 14:14:52 +08:00
htl e1fd472df1 modify texture format name 2015-01-07 14:11:48 +08:00
huangshiwu f41f00fcb2 make rotated rect draw correctly 2015-01-07 11:44:16 +08:00
minggo fbf565fd59 Merge pull request #9798 from samuele3hu/v3_4_packagesize 
issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit
 2015-01-07 11:14:22 +08:00
minggo f60cbef0da Merge pull request #9811 from dabingnn/v3_refactorEGLConfigChooserJavaCode 
move class cocos2dEGLConfigChooser to Cocos2dxActivity
 2015-01-07 11:05:36 +08:00
minggo 95288b220f Merge pull request #9825 from CocosRobot/update_lua_bindings_1420597506 
[AUTO]: updating luabinding automatically
 2015-01-07 11:04:39 +08:00
minggo 3778bb5a9f Merge pull request #9824 from CocosRobot/update_cocosfiles_1420597394 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-07 11:04:14 +08:00
huangshiwu ac7ddad4ac DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug 2015-01-07 11:02:31 +08:00
CocosRobot f83daed2cf [AUTO]: updating luabinding automatically 2015-01-07 02:27:01 +00:00
CocosRobot 6a88a51e24 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-07 02:23:16 +00:00
minggo 4b0a35d772 Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass 
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
 2015-01-07 10:21:54 +08:00
minggo 1b96b0bef8 Merge pull request #9818 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-01-06 18:17:18 +08:00
zhangbin 1837b083f7 Update the reference of submodule cocos2d-console. 2015-01-06 18:13:48 +08:00
minggo 09302dfac0 Merge pull request #9795 from andyque/fixCurlErrorCode23 
Fix curl error code23
 2015-01-06 17:44:57 +08:00
Huabing.Xu 339a8b1abc class rename for EGLConfigChooser 2015-01-06 16:18:01 +08:00
minggo 961487d3fa [ci skip]Update Authors 2015-01-06 16:12:40 +08:00
minggo 5b0925d42d Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash 
fix delete wild opengl buffers
 2015-01-06 15:13:49 +08:00
WenhaiLin 2847a940ed Update project 2015-01-06 14:40:15 +08:00
WenhaiLin fdaa0bbfc6 Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics 2015-01-06 14:40:14 +08:00
minggo 019cda3110 [ci skip] Update CHANGELOG 2015-01-06 14:12:31 +08:00
minggo 31819bafc3 Merge pull request #9769 from ton1517/fix/jumpto 
fix problem : JumpTo position is changed each repeat.
 2015-01-06 14:09:54 +08:00
minggo 7fa3c2e078 [ci skip] Update CHANGELOG 2015-01-06 14:08:05 +08:00
minggo c8387dd2a8 Merge pull request #9780 from Dhilan007/v3-physics-gravity 
Fixed physics body not still after disable gravitational force by PhysicsBody::setGravityEnable.
 2015-01-06 13:59:31 +08:00
Huabing.Xu 1180f7a41e move class cocos2dEGLConfigChooser to Cocos2dxActivity 2015-01-06 12:44:29 +08:00
Huabing.Xu 1edc3c6ebd Merge pull request #9809 from Dhilan007/v3-3d-missfile 
Add miss file for win32 project
 2015-01-06 11:08:00 +08:00
Huabing.Xu 69c1ad1d99 Merge pull request #9808 from mannewalis/update_release_notes 
Update release notes
 2015-01-06 10:57:49 +08:00
WenhaiLin f620038c59 Add miss file for win32 project 2015-01-06 10:55:26 +08:00
minggo b88b9ea994 Merge pull request #9777 from ffskyfan/v3 
fix the problem that engine can't get data from file on windows
 2015-01-06 10:21:36 +08:00
mannewalis 772f379ed7 update release notes 2015-01-05 17:55:44 -08:00
mannewalis 876827db04 update release notes 2015-01-05 17:51:17 -08:00
minggo 44b51c0114 [ci skip] Update CHANGELOG 2015-01-06 09:47:45 +08:00
minggo b14ed0cc64 Merge pull request #9801 from super626/v3 
add node quaternion to changelog
 2015-01-06 09:46:49 +08:00
Huabing.Xu 7f61a3d97b reset _VAOname to 0 before recreating on android 2015-01-06 09:44:19 +08:00
WenhaiLin ac8e820472 Fixed gravity of physics module not work as expected. 2015-01-05 22:15:03 +08:00
minggo 1ae4de2374 Merge pull request #9797 from doomsdayer/v3 
Bug fix:When parsing a plist file as image mergin, if in fact the plist ...
 2015-01-05 18:05:51 +08:00
Huabing.Xu a1654e5714 fix delete wild opengl buffers 2015-01-05 17:53:31 +08:00
yangxiao c320bd46dd add node quaternion to changelog 2015-01-05 17:42:36 +08:00
samuele3hu 58d946b578 issue #9796: Extract related physical auto-binding codes to manual-binding to add `CC_USE_PHYSICS` limit 2015-01-05 17:10:25 +08:00
yusheng.lu 3c992fe38c Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur. 
Now it's fixed.
 2015-01-05 16:59:09 +08:00
andyque a1daba88f9 fix indent issue 2015-01-05 16:04:59 +08:00
andyque 56e333dc9b fix crash on mac 2015-01-05 16:02:46 +08:00
andyque 2a266efc1a fix CurlTest error code 23 on Windows 2015-01-05 15:55:40 +08:00
minggo c7508bb1c6 Merge pull request #9783 from doomsdayer/v3 
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
 2015-01-05 15:11:22 +08:00
minggo 82db989432 [ci skip] Update CHANGELOG 2015-01-05 14:30:58 +08:00
minggo 4b2375e28c Merge pull request #9794 from htlxyz/v3_origin 
modify event register function name
 2015-01-05 14:22:53 +08:00
minggo ef5076983d Merge pull request #9792 from minggo/memory-leak 
fix memory leak
 2015-01-05 14:20:49 +08:00