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

916 Commits

Author SHA1 Message Date
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
James Chen d8683ef705 Merge pull request #3988 from lite3/develop 
closed #3060: The Node's anchor point was changed after being added to ScrollView.
 2013-10-24 03:01:49 -07:00
samuelhu 26caaa0a36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-23 09:57:21 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
lite3 c6f9f0e406 do not change anchor point of child. 2013-10-22 11:30:53 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
Dhilan007 8fb0327597 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 14:57:33 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo f3f24e3bbd issue #2905:use - to connect multiple words 2013-10-12 13:54:16 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
James Chen edcf9fecb4 [Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'. 2013-10-11 21:52:28 +08:00
James Chen f05225ae4c Merge pull request #3888 from ktaobo/avoid-copy 
Avoid unnecessary object duplication using passing arguments by reference
 2013-10-11 00:09:28 -07:00
Keita Obo 43c2001d71 Avoid unnecessary object duplication using passing arguments by reference 2013-10-10 22:06:10 +09:00
minggo 6e62be5443 issue #2905: modify makefile to include correct header files 2013-10-10 17:39:53 +08:00
minggo 866906fd58 issue #2905:modify project settings to include correct audio path 2013-10-10 15:40:06 +08:00
rablwupei 5ea249a265 fix memory leak 2013-10-08 20:03:10 +08:00
Dhilan007 cafe930026 issues #2774:AssetsManager Test downloading progress label not sync with actual download. 2013-09-29 09:48:55 +08:00
CaiWenzhi 72f02f47a0 Modify version 2013-09-26 14:16:22 +08:00
CaiWenzhi 8a2cdf5a48 Modify wrong codes. 2013-09-25 19:04:37 +08:00
James Chen 3ffad35f0e Merge pull request #3741 from signmotion/develop 
Fixed some compiling-warnings (MSVC2012).[ci skip]
 2013-09-24 02:27:14 -07:00
CaiWenzhi f4471ae93c Modify layout enum 2013-09-23 21:26:44 +08:00
CaiWenzhi be7c7a5f0b Modify windows project. 2013-09-23 19:54:43 +08:00
CaiWenzhi fa892c2158 Remove layoutexecutant class 2013-09-23 19:16:20 +08:00
Michael Contento f6dcf88685 Prevent nullptr access in AssetsManager 2013-09-23 12:05:22 +02:00
Liam c4dfdbcb14 change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN 2013-09-23 14:44:55 +08:00
Liam 082e28b631 fixed action node crash 2013-09-23 14:34:50 +08:00
signmotion 7d139a3bc3 Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false'). 2013-09-22 23:50:54 +03:00
Liam e8cf0a1485 add judgment for retaining _actionSpawn 2013-09-22 23:55:12 +08:00
Liam 0840baa1ab retan ActionNode _actionSpawn while create 2013-09-22 22:49:25 +08:00
minggo 261f0e4f05 rename some files 2013-09-21 14:40:54 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
minggo 4c9771ba3c rename some class names to obey cocos2d-x coding style 2013-09-20 19:19:31 +08:00
James Chen c38dfb6a17 issue #2087: Setting default touch priority to -1 for CCInputDelegate 2013-09-19 09:24:11 +08:00
James Chen d7274b9475 issue #2087: Should not use fixed priority with 0 value, it's for scene graph based priority. 2013-09-19 09:19:03 +08:00
James Chen db98d662af issue #2087: Fixing crash of ComponentTest. 2013-09-19 09:15:56 +08:00
James Chen 3fbf61ad52 issue #2087: Adding CustomEvent and CustomEventListener classes. Make Event and EventListener as abstract classes. 2013-09-19 09:14:51 +08:00
Liam 3515a4f286 limited action frame index 2013-09-18 16:36:16 +08:00
minggo 801b7831df Merge pull request #3671 from chengstory/#4684 
Remove unused files from mk files.
 2013-09-17 22:08:38 -07:00
zhangcheng 820b8630dc 1. fixes failed to build linux. 2013-09-18 11:51:14 +08:00
zhangcheng 529d43544f 1. rename CCCActionFrameEasing.cpp to CCActionFrameEasing.cpp. 2013-09-18 11:22:30 +08:00
zhangcheng 0708edb762 1. remove CocoStudio/GUI/Action *.cpp *.h 2013-09-17 23:45:53 +08:00
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-09-17 23:24:14 +08:00
James Chen 513237d5f6 Fixing armature test crash. 2013-09-17 23:03:33 +08:00
zhangcheng c065dd2920 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684 2013-09-17 22:41:42 +08:00
zhangcheng a1d2045793 1.rename cocoaction system files 2013-09-17 22:39:42 +08:00
CaiWenzhi 1f45bad5e7 Modify guy example 2013-09-17 21:19:04 +08:00
zhangcheng ec401d1148 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684 2013-09-17 21:15:36 +08:00
zhangcheng b86a8271d9 1. Upload Cocostudio Action. 2013-09-17 21:14:45 +08:00
CaiWenzhi d9721a41dd Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 21:01:50 +08:00
James Chen e3a34bd5c5 Merge pull request #3657 from 2youyouo2/develop 
update armature[ci skip]
 2013-09-17 05:45:17 -07:00
CaiWenzhi f42797bc0d Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 20:43:16 +08:00
CaiWenzhi 841408d1bc Modify events methods 2013-09-17 20:34:26 +08:00
2youyou2 57ec881727 support set tween key 2013-09-17 20:14:08 +08:00
CaiWenzhi 9d07b2c1d2 Temp commit 2013-09-17 20:13:23 +08:00
James Chen 1896305fcb closed #2450: Fixing HttpClientTest crashes on 64bit system. 2013-09-17 18:21:20 +08:00
CaiWenzhi 9d6d9dcd19 Add getDescription method 2013-09-17 17:59:20 +08:00
2youyou2 07f72ac1b4 Change rotation range from(-180 -- 180) to (-infinity -- infinity) 2013-09-17 16:40:47 +08:00
zhangcheng a25c2cabf8 1. Fixes failed to build windows. 
2. Upload CocoGUI Resources.
 2013-09-17 13:25:15 +08:00
James Chen 28b266bc5e [Android] Android.mk fixes after adding GUI test. 2013-09-17 10:49:59 +08:00
James Chen 157ffa9299 Merge pull request #3627 from nutty898/Merge_GUI_to_Develop 
Merge gui to develop 3.0 branch
 2013-09-16 07:45:23 -07:00
CaiWenzhi 0b48552f04 Modify scene reader 2013-09-16 21:07:11 +08:00
James Chen b128018f76 Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 
Conflicts:
	extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-09-16 20:58:26 +08:00
CaiWenzhi 759fcc147b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Merge_GUI_to_Develop 2013-09-16 20:55:55 +08:00
CaiWenzhi ca599b4852 Merge guy to 3.0 branch 2013-09-16 20:54:13 +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 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
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
James Chen cc41377591 [CocoGUI] Updating linux makefile. 2013-09-16 17:24:25 +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
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
2youyou2 302555e711 standardizate code 2013-09-16 14:13:55 +08:00
2youyou2 d8b64b8645 standardize code 2013-09-16 12:21:18 +08:00
zhangcheng d4496ac02d 1. replace "CCFileUtils" to "FileUtils". 2013-09-16 12:16:11 +08:00
2youyou2 b7b079c1c6 standardize code 2013-09-16 12:02:57 +08:00
2youyou2 c767ff355c delete extensions/CCArmature 2013-09-16 11:46:08 +08:00
James Chen e31c4f008d Merge pull request #3597 from chengstory/#4560 
SceneEditorTest He version
 2013-09-15 20:23:05 -07:00
2youyou2 ac8261bcd5 update Android.mk 2013-09-16 09:56:25 +08:00
2youyou2 77db15bd0d change variables name 2013-09-15 20:24:25 +08:00
2youyou2 db4813f161 1.remove CC from class name 
2.fix async loading
 2013-09-15 19:08:45 +08:00
2youyou2 9fd89dbfc2 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CCArmature/CCArmature.cpp
	extensions/CCArmature/CCArmature.h
	extensions/CCArmature/CCBone.cpp
	extensions/CCArmature/CCBone.h
	extensions/CCArmature/animation/CCArmatureAnimation.cpp
	extensions/CCArmature/animation/CCTween.cpp
	extensions/CCArmature/animation/CCTween.h
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/datas/CCDatas.h
	extensions/CCArmature/display/CCDecorativeDisplay.cpp
	extensions/CCArmature/display/CCDecorativeDisplay.h
	extensions/CCArmature/display/CCDisplayFactory.cpp
	extensions/CCArmature/display/CCDisplayFactory.h
	extensions/CCArmature/display/CCDisplayManager.cpp
	extensions/CCArmature/display/CCDisplayManager.h
	extensions/CCArmature/display/CCSkin.cpp
	extensions/CCArmature/display/CCSkin.h
	extensions/CCArmature/external_tool/CCTexture2DMutable.cpp
	extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.cpp
	extensions/CCArmature/external_tool/Json/CSContentJsonDictionary.h
	extensions/CCArmature/external_tool/Json/lib_json/json_reader.cpp
	extensions/CCArmature/external_tool/Json/lib_json/json_value.cpp
	extensions/CCArmature/external_tool/Json/lib_json/value.h
	extensions/CCArmature/physics/CCColliderDetector.cpp
	extensions/CCArmature/physics/CCColliderDetector.h
	extensions/CCArmature/utils/CCArmatureDataManager.cpp
	extensions/CCArmature/utils/CCArmatureDefine.h
	extensions/CCArmature/utils/CCDataReaderHelper.cpp
	extensions/CCArmature/utils/CCSpriteFrameCacheHelper.cpp
	extensions/CCArmature/utils/CCSpriteFrameCacheHelper.h
	extensions/CCArmature/utils/CCUtilMath.cpp
	extensions/cocos-ext.h
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.h
	samples/Cpp/TestCpp/Resources/armature/Cowboy.ExportJson
 2013-09-15 15:19:13 +08:00
2youyou2 b329eb3854 update linux Makefile 2013-09-14 23:47:15 +08:00