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

1570 Commits

Author SHA1 Message Date
samuele3hu 51e3e3fd1b Resolve the android and linux compile error 2014-01-03 11:15:46 +08:00
James Chen 4de2f82bd2 Merge pull request #4815 from andyque/fix 
ix move assignment operator doesn't clear previous content bug
 2014-01-02 18:55:41 -08:00
samuele3hu bfc7441453 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:51:05 +08:00
samuele3hu cdc82d6e8c Add a newline 2014-01-03 10:50:06 +08:00
andyque 67153f816c remove unused code 2014-01-03 10:44:43 +08:00
samuele3hu c4588722dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 10:41:03 +08:00
andyque 0e90ef8337 fix move assignment operator doesn't clear previous content bug 2014-01-03 10:39:53 +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
andyque c68efd7c5c Merge remote-tracking branch 'upstream/develop' into develop 2014-01-03 09:39:10 +08:00
chengstory e08e4ce0f8 fixed #3480 add search paths. 2014-01-03 02:21:36 +08:00
chengstory 77dca5958f issue #3480 upload Samples resources. 2014-01-03 02:03:05 +08:00
chengstory 5903a74bd2 issue #3480 
1.  add getNode  and  setNode class function to Component.
            2.  fixes some build error.
 2014-01-03 01:42:14 +08:00
chengstory 6892d8cf6a issue #3480 
1.  add SceneReader Tests.
                  2.  Modify class member name.
 2014-01-03 01:14:12 +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
James Chen 831e0b08e0 Merge pull request #4807 from dumganhar/iss3291-xmlhttprequest-error-fix-develop 
closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails.
 2014-01-02 06:46:25 -08:00
CocosRobot c120394cae [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 14:20:27 +00:00
James Chen e337fb35fc closed #3291: XMLHttpRequest.status needs to be assigned even when connection fails. 2014-01-02 21:59:47 +08:00
minggo d345139a08 fix compiling errors 2014-01-02 21:53:18 +08:00
minggo 674b38beef no in header file 2014-01-02 21:43:27 +08:00
minggo 676e25d304 2d module don't denpend on spine 2014-01-02 20:17:11 +08:00
James Chen 602468e3f2 Merge pull request #4802 from dumganhar/develop 
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
 2014-01-02 04:08:22 -08:00
minggo 2b5be1bacf Merge pull request #4801 from minggo/namespace 
fix compiling errors because of new namespace of network module
 2014-01-02 04:03:03 -08:00
James Chen 05b1be3aeb Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners). 2014-01-02 19:59:10 +08:00
minggo 9124f189c3 fix compiling errors because of new namespace of network module 2014-01-02 19:44:46 +08:00
CocosRobot 1c5638ad4f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 11:36:25 +00:00
James Chen b071578541 Merge pull request #4798 from andyque/fixassignment 
fix missing check self assignment of Vector<T>, Map<K,V>, Value and String
 2014-01-02 03:31:39 -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
andyque 961b27eacb remove move semantic into another pr 2014-01-02 18:32:47 +08:00
andyque 8a7228049a fixed self assignment error and provide move semantics to pushBack of Vector<T> 2014-01-02 18:31:43 +08:00
andyque 75d5bcfb42 remove const modifier of move semantic 2014-01-02 18:05:22 +08:00
andyque 80adda2ce8 fixed self assignment error and provide move semantics to pushBack of Vector<T> 2014-01-02 17:54:52 +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
James Chen 67c5ba8dfb closed #3565: Adds missing `lua_pop`to prevent lua stack issues. 2014-01-02 16:21:35 +08:00
Kenneth Chan 80df88d2cf Add missing bindings to setBlendFunc for various classes 
Conflicts:
	cocos/scripting/lua/bindings/lua_cocos2dx_manual.cpp
 2014-01-02 16:21:35 +08:00
Huabing.Xu 57b0426994 fix bug clippingNodetest on mobile 2014-01-02 16:19:23 +08:00
samuele3hu d802518413 Rename Cocos2dStudio.lua to CocoStudio.lua 2014-01-02 15:51:25 +08:00
James Chen 7abeacd86e HttpClient don't have to be inherited from Object, its a singeton, ok? 2014-01-02 15:47:38 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
CocosRobot c6425172b7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:58:15 +00:00
James Chen 91e25bc0b4 Merge pull request #4782 from CocosRobot/updategeneratedsubmodule_1388645344 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 22:51:49 -08:00
CocosRobot ada5eb82ec [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:49:06 +00: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
James Chen 69d681e343 Merge pull request #4781 from dumganhar/js-ui-test 
Updates JSB gui test
 2014-01-01 22:44:25 -08:00
James Chen dd54e906f0 ccs.XXX —> ccui.XXX for gui js bindings. 2014-01-02 14:21:24 +08:00
James Chen efc7effac5 Adds override keyword for some override methods in gui::Widget class. 2014-01-02 14:20:52 +08:00
samuele3hu f1d94b9b7b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2014-01-02 12:02:28 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
Lee, Jae-Hong c44dea5eb8 [Win32] Update project files. 
- lIbGUI
 2014-01-02 12:49:56 +09:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
minggo 3a1c5e4f6e Merge pull request #4759 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-01 18:47:21 -08:00
James Chen 0ec2738ce5 Merge pull request #4720 from zarelaky/develop 
closed #3556: openal context not destroy correctly on mac and ios
 2014-01-01 05:55:03 -08:00
CocosRobot ff550bf865 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-01 13:49:57 +00: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 8c1c9fef15 Bug fix in cc.VisibleRect 2013-12-31 18:17:20 +08:00
James Chen 74a7f68dc1 [JSB] Adds cc.VisibleRect. 2013-12-31 18:12:42 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
Dhilan007 ebf3faadc3 fix crash related to not support the z length modifier for size_t on vs 2013-12-31 16:32: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
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
zarelaky 2822066a5f openal context not destroy correctly on mac and ios 2013-12-30 08:37:36 +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