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

15159 Commits

Author SHA1 Message Date
Huabing.Xu c030553d8c Fix missed popMatrix 2013-12-30 20:25:25 +08:00
minggo 3680995f0b Merge pull request #4742 from minggo/develop 
update cocos2d-x version string
 2013-12-30 04:23:41 -08:00
minggo 046d6696bc update cocos2d-x version string 2013-12-30 20:22:25 +08:00
cw 3292faf513 fix exc create_project no args error in linux 2013-12-30 18:50:26 +08:00
cw 89838e4c93 755 2013-12-30 18:45:20 +08:00
cw 437c6545da fix linux error not Tkinter 2013-12-30 18:35:08 +08:00
minggo 1900366c77 Merge pull request #4731 from dabingnn/develop_fixRawStencilTest 
Develop fix raw stencil test
 2013-12-30 02:18:43 -08:00
minggo 0add02bc47 Merge pull request #4737 from dabingnn/develop_ShaderTestSprite 
Develop shader test sprite
 2013-12-30 02:16:44 -08:00
minggo aa0383ce33 Merge pull request #4738 from Dhilan007/recover_activity 
recover java activity on android.
 2013-12-30 02:16:07 -08:00
minggo 43636635b0 Merge pull request #4733 from boyu0/Iss2771_physical_disable_text_bug 
issue #2771:  fix physics test disable text.
 2013-12-30 02:15:35 -08:00
minggo c7fd67ee29 Merge pull request #4736 from chengstory/#3474 
fixed #3474
 2013-12-30 02:14:55 -08:00
Dhilan007 5cc0297748 update describe for support translucency on android 2013-12-30 18:12:43 +08:00
minggo 3ab478383d Merge pull request #4734 from nutty898/develop_nutty_modify_framework_testbugfixed 
Fixed bugs
 2013-12-30 01:43:47 -08:00
子龙山人 50c9617d25 Merge pull request #5 from cocos2d/develop 
sync original repo
 2013-12-30 01:35:23 -08:00
Dhilan007 4f2d7f47fc update describe for support translucency on android 2013-12-30 16:42:33 +08:00
Dhilan007 3fd9561df8 update describe for support translucency on android 2013-12-30 16:30:08 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +08:00
CaiWenzhi b8aa9fbf93 Merge branch 'develop' into develop_nutty_modify_framework_testbugfixed 2013-12-30 15:57:41 +08:00
Huabing.Xu 3fb31e0b25 remove draw increment 2013-12-30 15:54:57 +08:00
Huabing.Xu f1635924d6 migrate ShaderTestSprite to new renderer 2013-12-30 15:53:36 +08:00
chuanweizhang 326f640eb7 reset 2013-12-30 15:41:52 +08:00
chuanweizhang b4ae213c04 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-30 15:32:16 +08:00
boyu0 0984eafaef closed #2050: move autorelease to CLN 2013-12-30 15:32:04 +08:00
chuanweizhang 04a213135e reset 2013-12-30 15:28:59 +08:00
chengstory 0488aa6dcb fixed #3474 
1.  Modify CCLOG, Add classname.
         2.  change ArmatureMovementDispatcher::addAnnimationEventCallBack to ArmatureMovementDispatcher::addAnimationEventCallBack.
         3.  remove unused do while(0).
 2013-12-30 15:26:51 +08:00
Huabing.Xu 5b420df4de Fix compile bug on mobile, use Vector instead of std::vector 2013-12-30 15:26:01 +08:00
minggo b474f7ca0e Merge pull request #4735 from dabingnn/develop_transitionPageTurn 
migration transition page turn to new renderer
 2013-12-29 23:25:38 -08:00
minggo 714af52e0c Merge pull request #4732 from Dhilan007/update_vs_project 
fix compiling error on liblua VS 2012 project
 2013-12-29 23:24:01 -08:00
chuanweizhang 991db80198 reset 2013-12-30 15:21:25 +08:00
chuanweizhang 623e205256 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos/scripting/auto-generated
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.cpp
	samples/Cpp/TestCpp/Classes/Box2DTestBed/Box2dView.h
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.cpp
	samples/Cpp/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTestNew.h
	tools/bindings-generator
	tools/tolua/cocos2dx_studio.ini

reset modify
 2013-12-30 14:51:51 +08:00
Huabing.Xu 1962dfa52d migration transition page turn to new renderer 2013-12-30 14:43:18 +08:00
boyu0 839c385d3f issue #2771: fix physics test disable text. 2013-12-30 14:42:41 +08:00
CaiWenzhi e5b0bbad74 Fixed bugs 2013-12-30 14:40:49 +08:00
Dhilan007 30b3a6f8c3 fix compiling error on liblua VS 2012 project 2013-12-30 14:21:32 +08:00
James Chen a788d7cd27 Merge pull request #4730 from CocosRobot/updategeneratedsubmodule_1388383111 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-29 21:59:54 -08:00
Huabing.Xu db69767faf Merge branch 'develop' into develop_removeCommandPool 
* develop: (68 commits)
  Update CHANGELOG [ci skip]
  Fix of wrong include symbol of CCVector.h
  closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch.
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  Added test case for binary fnt file
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Small fix for `FREE` wrong variable.
  More warning fixes.
  AngelCode binary file format support for LabelBMFont
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Bug fixes for cocostudio.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Improve the coding style
  Modify wrong codes
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m].
  Fixed bugs
  [AUTO] : updating submodule reference to latest autogenerated bindings
  ...
 2013-12-30 13:58:54 +08:00
CocosRobot a269fba371 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-30 05:58:34 +00:00
Huabing.Xu c0a0bae21a Fix RawStecilTest bug for node reuse 2013-12-30 13:55:44 +08:00
minggo 0e9b43248c Merge pull request #4728 from dabingnn/develop_removeCommandPool 
Develop remove command pool
 2013-12-29 21:53:12 -08:00
James Chen e0af959cb4 Update CHANGELOG [ci skip] 2013-12-30 13:37:52 +08:00
boyu0 1f72fafd08 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug 
Conflicts:
	cocos/2d/CCTMXXMLParser.cpp
	cocos/2d/CCTMXXMLParser.h
 2013-12-30 12:30:59 +08:00
boyu0 e6dea295a2 closed #2050: Change tile map test to c++11, change XMLFormatTest name and subtile 2013-12-30 12:01:22 +08:00
James Chen d72a9d2c0d Merge pull request #4727 from dumganhar/develop 
Fix of wrong include symbol of CCVector.h
 2013-12-29 19:55:58 -08:00
James Chen c5c03a3b35 Fix of wrong include symbol of CCVector.h 2013-12-30 11:55:01 +08:00
boyu0 a76c59f644 closed #2050: add tile map xml format test and fix tile property bug. 2013-12-30 11:33:41 +08:00
James Chen a6e61f4ce0 Merge pull request #4725 from dumganhar/iss3290-onenter-order-develop 
closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch.
 2013-12-29 19:24:17 -08:00
James Chen 200f07dc34 closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch. 2013-12-30 11:10:02 +08:00
James Chen b534442cf1 Update CHANGELOG [ci skip] 2013-12-30 10:15:10 +08:00
James Chen 871662abe9 Update AUTHORS [ci skip] 2013-12-30 10:14:25 +08:00
James Chen 31e2b3d5c2 Merge pull request #4715 from SBKarr/develop 
closed #3542: AngelCode binary file format support for LabelBMFont.
 2013-12-29 18:11:19 -08:00