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

92 Commits

Author SHA1 Message Date
minggo b43d5aa654 fixed #1156 syn CCDirector 2012-04-13 14:11:35 +08:00
James Chen b1f293e089 issue #1056: Updated MenuTest. Added CCArray::arrayWithObject function. 2012-03-22 14:22:06 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen 8aa3f7f9ae issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
minggo 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
James Chen 6c01009a18 fixed #986: Add init() member funciton of CCMenu class. 2012-02-29 10:07:18 +08:00
YuLei Liao 6ebdf9cb4b * add CCScriptSupport 2012-02-09 14:07:11 +08:00
YuLei Liao 7a96d13fb6 rename all FuncID to Handler 2012-02-07 11:43:29 +08:00
YuLei Liao 9164e90515 * fix some issues 2012-02-02 15:58:10 +08:00
YuLei Liao 1dd0330351 * add CCMenuItem script support 2012-02-02 10:39:36 +08:00
YuLei Liao 9bdde0cb82 * remove script support 2012-02-01 16:45:23 +08:00
minggo a2efab73a0 fixed #959: make touch id correct on android 2012-01-31 14:49:02 +08:00
dumganhar f44b38eaf8 fixed #958: move the implement of SelectorProtocol to CCObject 2012-01-30 15:31:59 +08:00
dumganhar 49b57569c9 fixed #756: CCMenu can't be initialized by using CCMenu::node() method. 2012-01-28 14:38:44 +08:00
dumganhar a773e4fb96 move SelectorProtocol to CCObject 2012-01-08 21:03:16 +08:00
minggo 4bffaaf9cb fixed #936: check whether selector is valid 2012-01-04 10:58:20 +08:00
minggo cdc842051f issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
dumganhar d108f4f456 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-28 23:13:02 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
minggo efa9275d7f save the codes for testing 2011-11-21 12:04:21 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
minggo 61f2ab3cf2 fixed #718: fixed a typo error 2011-09-15 13:49:04 +08:00
minggo bdb7cfdd71 fixed #715: make sure selected image is valid 2011-09-13 14:29:15 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
minggo 78642a39ac [android] fixed #652: refactor JniHelper::jstringtochar() 2011-08-03 10:44:39 +08:00
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
natural-law d6221cfa36 Use the setter to set the value of m_tAnchorPoint. 2011-08-02 11:02:02 +08:00
Leon a8e4d5ea89 rename CCMenu::menu() -> CCMenu::node() 2011-07-28 14:24:24 +08:00
Leon 4510101e96 add CCMenu::init() and CCMenu::menu() to create empty menus 2011-07-28 10:45:32 +08:00
Leon c5f7036f7b add CCMenuItem::setTarget 2011-07-26 18:41:58 +08:00
minggo 7a12bb9cdc fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate() 2011-07-18 10:31:41 +08:00
minggo a3e9679578 fixed #611: add some functions for lua 2011-07-18 10:18:36 +08:00
minggo fe3aadf800 update to 1.0.0 07-12 2011-07-13 10:20:24 +08:00
minggo d48c3fdfb1 upgrade to 1.0.0-final 07-11 2011-07-12 11:20:41 +08:00
natural-law 810cf3f8c3 fixed #591 2011-07-08 15:02:46 +08:00
natural-law 134a3a0fcf fixed #590 2011-07-08 14:32:09 +08:00
minggo 8478288e88 fixed #iss559 2011-07-04 14:47:32 +08:00
minggo 00cc1d277d fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx() 2011-06-21 16:59:17 +08:00
minggo 2f97a43439 issue #528: refactor lua ok on Android 2011-06-21 10:18:43 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00