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

26599 Commits

Author SHA1 Message Date
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
dualface 156e9eb4f2 update templates 2015-01-06 08:31:43 +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
dualface efada94e18 update proj.ios_mac 2015-01-05 17:56:34 +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
htl c4cc6b5c34 modify event register function name 2015-01-05 14:19:27 +08:00
minggo bc639acbf6 Merge pull request #9793 from htlxyz/v3_origin 
modify node register event interface
 2015-01-05 14:19:10 +08:00
htl d754900b28 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-05 14:07:37 +08:00
htl f82404f9c9 modify node register event interface 2015-01-05 14:02:29 +08:00
minggo ab2b1976a0 [ci skip] Update CHANGELOG 2015-01-05 13:57:38 +08:00
minggo 1f271a3668 Merge pull request #9786 from dabingnn/v3_fixGLProgramLogCrash 
fix GLProgram log crash on windows
 2015-01-05 13:56:05 +08:00
Huabing.Xu 8dde42b66a code adjust, delay deprecated flag specification 2015-01-05 13:52:22 +08:00
minggo f155386f05 fix memory leak 2015-01-05 13:49:47 +08:00
minggo 7407105f24 Merge pull request #9791 from yinjimmy/runtime 
update google analytics tid
 2015-01-05 13:37:29 +08:00
yusheng.lu ec540fcaa2 Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader 2015-01-05 13:26:46 +08:00
yinjimmy d4681c1150 update google analytics tid 2015-01-05 12:15:52 +08:00
yusheng.lu 8415f10498 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-05 11:57:18 +08:00
minggo acffd1ca65 Merge pull request #9771 from andyque/fixLinuxCompile 
fix linux compile error
 2015-01-05 11:28:35 +08:00
Huabing.Xu 63e6557165 fix GLProgram log crash on windows 2015-01-04 21:51:22 +08:00
yusheng.lu 7e8d1bb74c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-04 19:13:20 +08:00
yusheng.lu a7fb75dc7d Update the description when the csb reader version dismatches the reader version in Cocos2d-x 2015-01-04 19:12:19 +08:00
samuele3hu c91bd076cb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp 2015-01-04 17:10:22 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
ffskyfan cb3b760759 Update CCFileUtils-win32.cpp 
fix the problem that engine can't get data from file while other app using the file on windows platform
 2015-01-04 16:43:10 +08:00
andyque 412e76a626 add fixme 2015-01-04 15:16:22 +08:00
andyque 7328c2eea0 fix linux compile error 2015-01-04 15:16:22 +08:00