Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,783 Commits 2 Branches 33 Tags 1.2 GiB
Commit Graph

1458 Commits

Author SHA1 Message Date
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 2013-12-31 14:58:11 +08:00
minggo a80c9dd625 Merge pull request #4752 from Dhilan007/label_distanceField 
fix align text error in label
 2013-12-30 22:27:55 -08:00
Dhilan007 b51efbd654 fix align text error in label 2013-12-31 14:13:26 +08:00
Huabing.Xu bf1f5dd0e0 fix rendertexture bug 2013-12-31 11:48:51 +08:00
CocosRobot 2555318c13 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-31 03:36:47 +00:00
minggo 2b54e5e296 Merge pull request #3864 from dumganhar/iss2865-deprecate-ccnotification 
closed #2865:Deprecates NotificationCenter, uses new EventDispatcher instead.
 2013-12-30 19:31:34 -08:00
James Chen 8145bf903e texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +08:00
James Chen 973adc6b2f Updates nativeactivity.cpp. 2013-12-31 10:55:59 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08:00
CocosRobot 674804f1b4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-30 13:49:19 +00:00
James Chen 1d8ee016e5 Merge pull request #4596 from boyu0/bug2050_tilemap_firstgid_bug 
closed #2050: fix tilemap firstgid bug
 2013-12-30 05:42:19 -08:00
Huabing.Xu a14006bb8f calculation matrix 2013-12-30 21:24:16 +08:00
James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding 
Conflicts:
	cocos/editor-support/cocostudio/TriggerMng.cpp
 2013-12-30 21:06:57 +08:00
James Chen 165e6c2a78 Adds an empty LuaEngine::parseConfig function. 2013-12-30 21:04:00 +08:00
James Chen 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +08:00
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
minggo c7fd67ee29 Merge pull request #4736 from chengstory/#3474 
fixed #3474
 2013-12-30 02:14:55 -08:00
CaiWenzhi b8aa9fbf93 Merge branch 'develop' into develop_nutty_modify_framework_testbugfixed 2013-12-30 15:57:41 +08:00
boyu0 0984eafaef closed #2050: move autorelease to CLN 2013-12-30 15:32:04 +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
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
Huabing.Xu 1962dfa52d migration transition page turn to new renderer 2013-12-30 14:43:18 +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
CocosRobot a269fba371 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-30 05:58:34 +00:00
minggo 0e9b43248c Merge pull request #4728 from dabingnn/develop_removeCommandPool 
Develop remove command pool
 2013-12-29 21:53:12 -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
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 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 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
Roman "SBKarr 93f6d9c4f5 Added test case for binary fnt file 
Also, fixed nul-termination issue in file parsing
 2013-12-28 23:00:07 +04:00
CocosRobot 203b0f183e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-28 06:59:45 +00:00
James Chen e509a52551 Small fix for `FREE` wrong variable. 2013-12-28 14:38:13 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
Roman "SBKarr b0e6b5a43f AngelCode binary file format support for LabelBMFont 2013-12-27 22:32:07 +04:00
CocosRobot 2051041df7 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 13:12:17 +00:00
James Chen 0d16f7bc3b Merge pull request #4712 from dumganhar/cocostudio-test 
Merge PR #4672: We need to replace trigger system by EventDispatcher in future.
 2013-12-27 05:05:41 -08:00
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
minggo 3760cddf49 Merge pull request #4705 from Dhilan007/failed_dispatch_receive 
fix failed to receive dispatch signal on some android device
 2013-12-27 04:33:30 -08:00
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-27 20:18:58 +08:00
samuele3hu aa0eb36071 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2013-12-27 20:08:09 +08:00
samuele3hu 30439e4689 Improve the coding style 2013-12-27 20:07:00 +08:00
James Chen 9baa64f274 Merge pull request #4688 from walzer/develop 
make CC_USE_PHYSICS can ACTUALLY be switch off
 2013-12-27 04:04:48 -08:00
James Chen bf881f3ac0 Merge pull request #4691 from samuele3hu/DispatcherBak1 
Reconstruct the operation of handling lua script event
 2013-12-27 03:58:08 -08:00
CaiWenzhi af563653e2 Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed 2013-12-27 18:26:30 +08:00