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

15152 Commits

Author SHA1 Message Date
Liam 0e42c1c369 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-01-03 19:53:23 +08:00
Huabing.Xu d75d2159dd fix control switch bug 2014-01-03 19:53:14 +08:00
James Chen 17ddb010cc Merge pull request #4836 from CocosRobot/updategeneratedsubmodule_1388748771 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 03:48:10 -08:00
chengstory 7f8224b621 Merge branch 'develop' into #3480 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
 2014-01-03 19:36:22 +08:00
CocosRobot 126c315673 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 11:32:54 +00:00
chengstory 46c7338008 fixed #3480 
1.  remove unused getnode and setnode interface.
                 2.  add condition test.
                 3.  Modify ComAttribute to support for parse json file.
                 4.  Replace scenereader callback function  to C++ 11 implement.
 2014-01-03 19:30:47 +08:00
minggo 5ad3414921 Merge pull request #4834 from minggo/bug-fix 
Put "initxx" functions into protected.
 2014-01-03 03:27:55 -08:00
CaiWenzhi a7f482fbf9 Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets 2014-01-03 19:17:26 +08:00
CaiWenzhi 3ccb80085f Fixed bugs of page view 2014-01-03 19:14:17 +08:00
chuanweizhang c22cc77c66 add cocos files list configure script 2014-01-03 19:09:13 +08:00
minggo 4fc7ad6e3d Merge pull request #4791 from dabingnn/develop_clippingNodeMobile 
fix bug clippingNodetest on mobile
 2014-01-03 02:36:52 -08:00
minggo b0c23eacf5 Don't release autoreased object. 2014-01-03 18:28:43 +08:00
minggo 1d04b42947 Put "initxx" functions into protected. 2014-01-03 18:15:56 +08:00
minggo 3a486a3591 Merge pull request #4833 from minggo/bug-fix 
Fix crash of PerformanceTest:PerformanceNodeChildrenTest
 2014-01-03 02:14:24 -08:00
minggo e649282c19 Merge pull request #4832 from minggo/performancetest-crash 
fix a crash in PerformanceTest:AllocTest
 2014-01-03 02:13:27 -08:00
minggo 7c0d4240ae Don't release an autoreleased object 2014-01-03 18:12:58 +08:00
minggo d52e980538 don't release an object return by Object::create() 2014-01-03 16:53:04 +08:00
James Chen 86598edb73 Merge pull request #4829 from CocosRobot/updategeneratedsubmodule_1388738242 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-03 00:39:24 -08:00
CocosRobot 37c8b03253 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 08:37:25 +00:00
James Chen c5ec24195a Merge pull request #4821 from nutty898/develop_nutty_modify_framework_optimizewidgets 
optimize button
 2014-01-03 00:35:48 -08:00
James Chen b4da0e71fd Merge pull request #4828 from Dhilan007/develop_crash 
fix compiling error in TransitionTest on vs.
 2014-01-03 00:30:07 -08:00
James Chen 5346677a47 Merge pull request #4825 from samuele3hu/developNewUI 
Update the lua test cases about the armature
 2014-01-03 00:29:24 -08:00
James Chen 7eb7cf1c52 Merge pull request #4826 from Dhilan007/develop_crash 
update vs project for split spine binding.
 2014-01-03 00:14:28 -08:00
Dhilan007 2f84abd19c fix compiling error in TransitionTest on vs. 2014-01-03 16:13:13 +08:00
CaiWenzhi a32976802a Merge branch 'develop' into develop_nutty_modify_framework_optimizewidgets 2014-01-03 15:50:35 +08:00
CaiWenzhi 767bf81e90 Modify renderers draw order define. 2014-01-03 15:46:42 +08:00
Dhilan007 8e2c51d31e update vs project for split spine binding. 2014-01-03 15:29:50 +08:00
CaiWenzhi 9c0e669e09 Add "override" 2014-01-03 15:14:48 +08:00
samuele3hu a72cf0428c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-03 14:53:15 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
James Chen b98174b3df Merge pull request #4822 from CocosRobot/updategeneratedsubmodule_1388725346 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-02 21:08:14 -08:00
CocosRobot 0661d87cdb [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-03 05:02:28 +00:00
minggo 1caae52140 [ci skip] 2014-01-03 12:58:57 +08:00
James Chen ac6b72450f Merge pull request #4816 from samuele3hu/developNewUI 
Update the lua test cases about the GUI
 2014-01-02 20:53:19 -08:00
James Chen 3e2ff8d467 Update AUTHORS [ci skip] 2014-01-03 12:50:52 +08:00
James Chen 3d722319a9 Merge pull request #4820 from andyque/develop 
fix compile error of Map's getRandomObject
 2014-01-02 20:49:25 -08:00
CaiWenzhi 7d8d645c70 Modify "include" 2014-01-03 12:15:42 +08:00
CaiWenzhi e734f3ccaf optimize button 2014-01-03 12:14:21 +08:00
andyque 88efbfc9cc remove srand function call 2014-01-03 11:56:58 +08:00
andyque 774542a341 fix compile error of getRandomObject in map 
and add srand to  vector and map
 2014-01-03 11:53:16 +08:00
samuele3hu 53f2415fcf Resolve the android compile error 2014-01-03 11:29:56 +08:00
samuele3hu 51e3e3fd1b Resolve the android and linux compile error 2014-01-03 11:15:46 +08:00
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