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

12302 Commits

Author SHA1 Message Date
CaiWenzhi ca599b4852 Merge guy to 3.0 branch 2013-09-16 20:54:13 +08:00
James Chen afc8627796 Merge pull request #3625 from dumganhar/develop 
Re-adding the submodule of plugin which was deleted in  pull request #3623[ci skip]
 2013-09-16 05:53:09 -07:00
James Chen 6a662c094f Re-adding the submodule of plugin which was deleted in pull request #3623. 2013-09-16 20:53:27 +08:00
James Chen a8032b4a58 Merge pull request #3623 from dumganhar/2youyouo2-develop 
Updating armature (Merge PR https://github.com/cocos2d/cocos2d-x/pull/3600)[ci skip]
 2013-09-16 05:44:40 -07:00
James Chen 9981aecddf Removing unneeded log in win32/CCEGLView.cpp. 2013-09-16 20:41:03 +08:00
signmotion 5dffb1b44e Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
James Chen 72c2d4ca35 Merge branch 'develop' into 2youyouo2-develop 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-09-16 20:12:03 +08:00
James Chen 79ed827e7b Merge pull request #3622 from dumganhar/develop 
[GUI] Fixing compilation errors for win32. [ci skip]
 2013-09-16 05:04:01 -07:00
James Chen c12a655fdf [GUI] Fix compilation error on win32. 2013-09-16 20:05:25 +08:00
James Chen 621e682e6e [GUI] Fixing compilation errors for win32. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-09-16 20:00:48 +08:00
James Chen dba7f3eae6 [GUI] Fixing compilation errors for win32. 2013-09-16 19:53:59 +08:00
minggo 21d299150e Merge pull request #3621 from minggo/develop 
upstream synchronize
 2013-09-16 04:47:21 -07:00
minggo 819fbf2866 upstream synchronize 2013-09-16 19:46:14 +08:00
minggo a96d16f94c Merge pull request #3620 from samuele3hu/developTest 
Develop test
 2013-09-16 04:31:25 -07:00
James Chen 83d61dff44 [Armature] Fixing compilation errors. 2013-09-16 19:27:34 +08:00
James Chen 22fd21db13 Fixing iOS and Mac project config. 2013-09-16 18:20:52 +08:00
James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 2013-09-16 18:18:23 +08:00
minggo 0fe28b7410 Merge pull request #3617 from boyu0/bug2745_after_PerformanceTextureTest_render_error 
closed #2745: fix bug: _dataLen not set at Image::initWithString() and I...
 2013-09-16 03:08:40 -07:00
samuele3hu 2ff505be81 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-16 18:05:35 +08:00
minggo 061004901d Merge pull request #3619 from minggo/develop 
[ci skip]set default projection to 3d
 2013-09-16 03:03:01 -07:00
minggo 4d4933728e Merge pull request #3615 from boyu0/bug2815_Texture2DTest_crash 
closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it d...
 2013-09-16 03:02:04 -07:00
minggo 13f83a084e set default projection to 3d 2013-09-16 18:01:16 +08:00
James Chen e44dcb648a Merge pull request #3618 from dumganhar/nutty898-MergerGUIDevelop 
[GUI] Merge PR https://github.com/cocos2d/cocos2d-x/pull/3613 [ci skip]
 2013-09-16 02:59:35 -07:00
James Chen cc41377591 [CocoGUI] Updating linux makefile. 2013-09-16 17:24:25 +08:00
boyu0 c726765b4a closed #2745: fix bug: _dataLen not set at Image::initWithString() and Image::initWithStringShadowStroke() 2013-09-16 17:13:44 +08:00
James Chen 3e7708dcd1 Updating Android.mk 2013-09-16 17:12:15 +08:00
James Chen 5ee8ad8c4f Fix compilation errors for CocoGUI. 2013-09-16 17:12:15 +08:00
CaiWenzhi 210af21615 Modify member names 2013-09-16 17:12:15 +08:00
CaiWenzhi a6428824d5 Modify makefiles 2013-09-16 17:12:15 +08:00
CaiWenzhi cf4b8c0163 Add guy loading of scene 2013-09-16 17:12:15 +08:00
CaiWenzhi 4843046d17 Merge GUI to develop step 1; 2013-09-16 17:12:15 +08:00
James Chen f50722de67 Merge pull request #3616 from CocosRobot/updategeneratedsubmodule_1379321876 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-16 02:05:38 -07:00
samuele3hu cf5e04ad63 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 
Conflicts:
	samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
 2013-09-16 16:58:30 +08:00
CocosRobot f607d6d248 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-16 08:58:07 +00:00
samuele3hu b563c52e10 Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for the android projects 2013-09-16 16:55:16 +08:00
James Chen 0121d3033b Merge pull request #3614 from dumganhar/iss2087-new-event-dispatcher 
issue #2087: [EventDispatcher] Comment fixes. Adding a new test. Event priority fix, the lower value, the higher priority.
 2013-09-16 01:52:16 -07:00
James Chen 501ed32973 issue #2087: [dispatcher] Fix of the listener of specified type is null. 2013-09-16 16:40:47 +08:00
James Chen abf834731a issue #2087: [dispatcher] Making Node::updateEventPriorityIndex to inline function. 2013-09-16 16:39:59 +08:00
boyu0 8d7d653031 closed #2815: Fixed the bug in ZipUtils::ccInflateMemoryWithHint(): it doesn't copy the previous unpacked data into new memory when malloced memory is not enough. 2013-09-16 16:22:52 +08:00
James Chen d8fb3aa731 issue #2087: [dispatcher] Reverts: HelloCpp. 2013-09-16 16:22:22 +08:00
James Chen 37dd173644 issue #2087: [dispatcher] Fixing errors in test. 2013-09-16 16:03:39 +08:00
James Chen 8e668cd837 issue #2087: [dispatcher] Rename FixedPriorityChangedTest to FixedPriorityTest. 2013-09-16 16:02:48 +08:00
James Chen 46e1291ce1 issue #2087: [dispatcher] Enabled touch for Box2dTestBed, removed touch listener before re-adding. 2013-09-16 15:55:03 +08:00
James Chen 990b801b11 issue #2087: [dispatcher] Reverts: glGetError --> CHECK_GL_ERROR_DEBUG. 2013-09-16 15:54:02 +08:00
James Chen 60645a6702 issue #2087: [dispatcher] Changes event priority. The lower value is, the higher priority will be gotten. 2013-09-16 15:45:56 +08:00
James Chen 7921b45090 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. Adding include. 2013-09-16 15:43:48 +08:00
James Chen b3cade3be0 issue #2087: [dispatcher] New Dispatcher Test: Fixed priority. 2013-09-16 15:43:20 +08:00
2youyou2 a08ce3df73 change singleton class get method to getInstance 2013-09-16 15:16:05 +08:00
2youyou2 16c70363dd standardizate code 2013-09-16 14:56:59 +08:00
minggo 27381fc83f Merge pull request #3562 from bassarisse/develop 
Win32 icons on template
 2013-09-15 23:44:11 -07:00