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

18743 Commits

Author SHA1 Message Date
zhangbin 6483f0d3ec Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:33:00 +08:00
James Chen 377b50e6fd Merge pull request #6249 from dumganhar/develop 
Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' in ConsoleTest.
 2014-04-11 20:28:00 +08:00
zhangbin e27545df61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:27:42 +08:00
James Chen b71e1c1570 Merge pull request #6250 from natural-law/develop 
fix the error effect of ` FontTest` in lua-tests.
 2014-04-11 20:26:30 +08:00
James Chen 350f61c4da Merge pull request #5921 from koowolf/Branch_cocos2d-x-3.0rc0 
closed #4497: use /z7 to build without .pdb
 2014-04-11 20:20:47 +08:00
zhangbin 99766cdd03 fix the error show of ` FontTest` 2014-04-11 20:17:34 +08:00
James Chen 576d9d872c Fixes for Console, 1) wrong lambda capture, 2) Crashes when click 'next' 
in ConsoleTest.
 2014-04-11 20:07:54 +08:00
James Chen 8e9e72c88c Merge pull request #6248 from natural-law/develop 
Solve the incorrect effect of some transition test case in lua-tests.
 2014-04-11 20:07:04 +08:00
zhangbin d611cfb49f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-11 20:03:24 +08:00
zhangbin 0eee9bc288 Solve the incorrect effect of some transition test case in lua-tests. 2014-04-11 20:02:11 +08:00
James Chen 6417c8f8e9 Merge pull request #6244 from dumganhar/develop 
Warning fixes in ui, getZOrder -> getLocalZOrder
 2014-04-11 18:14:54 +08:00
James Chen 7c5b4be0b1 Warning fixes in ui, getZOrder -> getLocalZOrder 2014-04-11 18:06:53 +08:00
koowolf 5b3d5badfa closed #4763: 1.fix stopalleffect lead to stop background music 2.fix play effect may lead to memory leak 2014-04-11 17:53:00 +08:00
James Chen b40773f6d0 Merge pull request #6240 from dabingnn/develop_add_rendererAssert 
Trigger an assert if a command is added while render is rendering.
 2014-04-11 17:37:02 +08:00
Huabing.Xu a8378a2b99 adjust comment 2014-04-11 17:31:35 +08:00
James Chen bf2450ad54 Merge pull request #6242 from andyque/fix_zfighting 
fix a compile error
 2014-04-11 16:49:21 +08:00
andyque 280c2755b3 closed #4761. fix a compile error 2014-04-11 16:47:35 +08:00
James Chen 96ce8cb8cb Merge pull request #6241 from andyque/fix_zfighting 
closed #4761, fix zfighting between tests
 2014-04-11 16:41:39 +08:00
andyque 83664e2322 closed #4761. fix a improve super class function call 2014-04-11 16:34:26 +08:00
andyque 4be149e492 closed #4761, fix zfighting between tests 2014-04-11 16:30:25 +08:00
Huabing.Xu 7c027b16b0 change assert message 2014-04-11 16:07:55 +08:00
Huabing.Xu 51289e8a4c 1. add assert condition of rendering when adding command 
2. fix bug: renderTexture->SpriteRenderTextureBug
 2014-04-11 16:05:22 +08:00
James Chen cc0147adfe Merge pull request #6239 from boyu0/label_create_refactor 
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label:create...
 2014-04-11 15:30:04 +08:00
boyu0 b69b14382e Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont 2014-04-11 15:25:18 +08:00
James Chen e24a975599 Merge pull request #6238 from lmskater/add-rebuild-git-fail 
[Jenkins][ci skip] Add rebuild when git fail in pull request builder
 2014-04-11 15:11:24 +08:00
James Chen c44e2f9bc8 Merge pull request #6211 from chuanweizhang2013/luaruntime 
update lua template runtime
 2014-04-11 15:08:15 +08:00
lm 3088ac88f5 [Jenkins][ci skip] Add rebuild when git fail in pull request builder 2014-04-11 15:06:14 +08:00
James Chen 9bcc3facda Merge pull request #6237 from samuele3hu/develop_fix 
fix the crash invoked by calling the `glGetUniformfv` on the 64-bit ios
 2014-04-11 14:54:50 +08:00
samuele3hu 2f1f09d5bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-11 14:35:07 +08:00
samuele3hu 5b2cf595a2 fix the crash invoked by calling the `glGetUniformfv` 2014-04-11 14:31:44 +08:00
James Chen 588d825691 Merge pull request #6236 from dumganhar/develop 
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
 2014-04-11 13:53:54 +08:00
James Chen 85cc100ac4 Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop 2014-04-11 13:51:40 +08:00
zhangbin 76972e6304 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4727 2014-04-11 11:37:50 +08:00
zhangbin 29615f7e26 closed #4727, Support run sample projects with console. 2014-04-11 11:36:23 +08:00
James Chen 9f1c529885 Update AUTHORS [ci skip] 2014-04-11 10:57:42 +08:00
James Chen 4c169f9867 Merge pull request #6232 from gaoxiaosong/develop 
A warning fix in cpCollision.c
 2014-04-11 10:56:36 +08:00
James Chen 4b2ded620c Merge pull request #6234 from dumganhar/pull/6230 
Merge PR #6230: Quadcommand remove unneeded codes
 2014-04-11 10:53:45 +08:00
James Chen 48a5fd555b Compilation error fix in CCQuadCommand.cpp 2014-04-11 10:50:38 +08:00
James Chen dbeefcdff2 Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230 2014-04-11 10:48:29 +08:00
chuanweizhang2013 1fadba7de1 add static to variable 2014-04-11 10:41:35 +08:00
chuanweizhang2013 41933a6fd0 Merge pull request #23 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:55:51 +08:00
James Chen 5bcee62708 Merge pull request #6231 from samuele3hu/develop_fix 
fix the crash invoked by deprecated `create` function of `Label`
 2014-04-11 09:54:29 +08:00
samuele3hu f136108037 fix compile error 2014-04-11 09:52:09 +08:00
chuanweizhang2013 337bc2f2e8 Merge pull request #22 from cocos2d/develop 
update cocos2d-x
 2014-04-11 09:33:04 +08:00
Xiaosong Gao d82c4bed75 In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project. 2014-04-11 08:07:18 +08:00
samuele3hu 70dec15e76 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-10 23:38:57 +08:00
samuele3hu c687b97c6e fix the crash invoked by deprecated `create` function of `Label` 2014-04-10 23:36:25 +08:00
minggo 951bf1cbfa remove unneeded codes 2014-04-10 22:56:40 +08:00
James Chen 8e2bd0d2ee Merge pull request #6229 from dumganhar/develop 
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
 2014-04-10 21:16:19 +08:00
James Chen 6b21e598c5 [win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui 2014-04-10 21:14:24 +08:00