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

14750 Commits

Author SHA1 Message Date
minggo da2487f653 Merge pull request #4754 from dabingnn/develop_RenderTextureBug 
Develop render texture bug
 2013-12-30 23:23:16 -08:00
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
Huabing.Xu 8d9f62731e fix RenderTextureTestDepthStencil test sample 2013-12-31 14:48:07 +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
James Chen 999d46301c Merge pull request #4750 from natural-law/develop 
Update the JS binding code & samples for latest cocos2d engine.
 2013-12-30 22:15:53 -08:00
Dhilan007 b51efbd654 fix align text error in label 2013-12-31 14:13:26 +08:00
zhangbin 06dba7fc69 Update the JS binding code & samples for latest cocos2d engine. 2013-12-31 14:07:45 +08:00
James Chen 07fa18807d Merge pull request #4747 from CocosRobot/updategeneratedsubmodule_1388461005 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-30 20:02:23 -08:00
Huabing.Xu bc9f0311f4 migrate render texture test sample to new renderer 2013-12-31 11:49:46 +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
James Chen fe97fecc74 Merge pull request #4745 from heliclei/develop 
move ghprb.py to tools/jenkins-scripts, delete other non-functional scripts
 2013-12-30 06:30:55 -08:00
heliclei 62a0828f5b remove other non-functional jenkins scripts 2013-12-30 22:03:22 +08:00
James Chen bc0d094b94 Merge pull request #4746 from CocosRobot/updategeneratedsubmodule_1388411356 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-30 05:57:53 -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
heliclei 7696a5f2cc move ghprb.py to tools/jenkins-scripts/ 2013-12-30 21:40:28 +08:00
James Chen 18b983322c Merge pull request #4744 from heliclei/develop 
add github pull request builder for Jenkins
 2013-12-30 05:33:58 -08:00
boyu0 8506b64a50 issue #2050: commit resources 2013-12-30 21:30:58 +08:00
Huabing.Xu a14006bb8f calculation matrix 2013-12-30 21:24:16 +08:00
James Chen ca67e6935c Merge pull request #4743 from dumganhar/ccs-binding 
[JSB] Adds trigger bindings for CocoStudio.
 2013-12-30 05:20:39 -08:00
jiusheng 0cf0ad26d2 add github pull request builder for Jenkins 2013-12-30 21:11:32 +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 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
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
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
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