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

2582 Commits

Author SHA1 Message Date
samuele3hu bfc7441453 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:51:05 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
samuele3hu 07a3efb585 Update the lua test cases about the GUI 2014-01-03 10:39:19 +08:00
James Chen 04760f2508 [Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module. 2014-01-03 10:30:55 +08:00
Ricardo Quesada d76e8e57bb NodeTest converted to lambda functions 
Uses Lambda functions to call the subtests
Easier to add new tests
 2014-01-02 15:51:26 -08:00
Ricardo Quesada f023ada6f6 Improves transitions test 
Unifies functions with trantions name
 2014-01-02 14:25:28 -08:00
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config 
don't build spine module when build 2d module
 2014-01-02 06:53:15 -08:00
minggo 22195a44d0 include spine dependence in testjavascript 2014-01-02 22:06:18 +08:00
minggo 054972fd3b Merge pull request #4796 from minggo/deprecated-function 
use std::function for call back
 2014-01-02 03:29:17 -08:00
minggo ded3e753f3 use std::function for call back 2014-01-02 17:23:00 +08:00
minggo f2b1a3cc83 Merge pull request #4793 from minggo/namespace 
network -> cocos2d::network
 2014-01-02 00:38:50 -08:00
James Chen c29e328490 Merge pull request #4779 from samuele3hu/DispatcherBak1 
Develop branch adds lua trigger for CocoStudio
 2014-01-02 00:29:30 -08:00
minggo 07600bd46b network -> cocos2d::network 2014-01-02 16:25:35 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
James Chen 1480dd99d6 Merge pull request #4777 from 2youyouo2/develop 
update armature, change interface from "by" to "with"
 2014-01-01 22:47:18 -08:00
samuele3hu cc2e6aef63 Add missis “ccs.” prefix 2014-01-02 14:25:15 +08:00
James Chen e2887a2b64 Updates JS-Test submodule reference. 2014-01-02 14:22:22 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
James Chen 71d21d2e10 Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename 2013-12-31 19:13:59 +08:00
James Chen f793ff01b2 Updates JS-test submodule. 2013-12-31 18:15:47 +08:00
James Chen c8c37ac63c Updates JS-Test submodule 2013-12-31 17:25:14 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +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
Huabing.Xu bc9f0311f4 migrate render texture test sample to new renderer 2013-12-31 11:49:46 +08:00
James Chen cf006df9ff closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead. 2013-12-31 10:54:37 +08: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
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 1edf748dc3 [JSB] Adds trigger bindings for CocoStudio. 2013-12-30 20:57:46 +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
Dhilan007 5cc0297748 update describe for support translucency on android 2013-12-30 18:12:43 +08:00
Dhilan007 a5960c3252 recover java activity on android. 2013-12-30 15:58:04 +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
Huabing.Xu 5b420df4de Fix compile bug on mobile, use Vector instead of std::vector 2013-12-30 15:26:01 +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
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
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
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
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 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