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

15060 Commits

Author SHA1 Message Date
James Chen 0b3a4c3ce5 Merge pull request #4817 from heliclei/develop 
[Jenkins]fetch pull request and checkout to a local branch
 2014-01-02 19:08:54 -08:00
heliclei 4549760f2c fetch pull request and checkout to a local branch 2014-01-03 10:59:37 +08:00
James Chen b193768f26 Update AUTHORS [ci skip] 2014-01-03 10:57:09 +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
James Chen 7774a948f0 Merge pull request #4814 from dumganhar/jsb-spine-module 
[Android] Adds jsb-spine module. TestJavascript now depends on jsb-spine module.
 2014-01-02 18:45:57 -08:00
andyque 67153f816c remove unused code 2014-01-03 10:44:43 +08:00
minggo 93d724f408 [ci skip] 2014-01-03 10:41:26 +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
andyque 053656fea2 Merge branch 'develop' of github.com:andyque/cocos2d-x into develop 2014-01-03 09:37:15 +08:00
Ricardo Quesada f5fa5cbff4 Merge pull request #4812 from ricardoquesada/node_test_fixes 
NodeTest converted to lambda functions
 2014-01-02 15:52:07 -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 de2569d726 Merge pull request #4811 from ricardoquesada/transition_test_fix 
Improves transitions test
 2014-01-02 14:26:14 -08:00
Ricardo Quesada f023ada6f6 Improves transitions test 
Unifies functions with trantions name
 2014-01-02 14:25:28 -08:00
chengstory ee2d9e9c74 fixed #3480 remove unused ret. 2014-01-03 02:49:11 +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
James Chen 3063080446 Merge pull request #4808 from CocosRobot/updategeneratedsubmodule_1388672423 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-02 06:32:41 -08:00
CocosRobot c120394cae [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 14:20:27 +00:00
James Chen 1eda0b5835 Merge pull request #4806 from minggo/remove-using_namespace 
no use "using namespace" in header file
 2014-01-02 06:08:40 -08:00
minggo 22195a44d0 include spine dependence in testjavascript 2014-01-02 22:06:18 +08: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
James Chen d8186a1d3c Merge pull request #4769 from heliclei/develop 
update exception catch clause
 2014-01-02 05:35:07 -08:00
minggo 676e25d304 2d module don't denpend on spine 2014-01-02 20:17:11 +08:00
James Chen 1beb992157 Update CHANGELOG [ci skip] 2014-01-02 20:09:43 +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
James Chen 5980007454 Merge pull request #4800 from CocosRobot/updategeneratedsubmodule_1388662583 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-02 03:38:15 -08:00
CocosRobot 1c5638ad4f [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 11:36:25 +00:00
James Chen bdb99c5aa1 Update AUTHORS [ci skip] 2014-01-02 19:33:07 +08: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
heliclei e43ca98a94 get the correct branch 2014-01-02 19:08:22 +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