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

79 Commits

Author SHA1 Message Date
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
James Chen 9b9fe67d25 issue #2387: Using static_cast instead of C style cast in iteration of CCArray. 2013-07-09 14:29:51 +08:00
James Chen 93b6328303 issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo 14a35cff11 issue #1686:synchronize CCMenu.cpp 2013-02-28 10:15:09 +08:00
Ed Bartley 908035bdee Fixed a CCMenu bug that prevented the touch priority from being set to the value specified by a call to CCMenu::setTouchPriority(int). 2013-01-23 14:00:23 -05:00
minggo a7dca5c05a fixed #1547:set selected menu item to null when it is removed from a menu 2013-01-17 15:04:48 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
James Chen 98045f667f issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray. 2012-11-30 21:13:25 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
minggo b497143f93 issue #1555:menu can receive touch event now 2012-11-16 14:51:48 +08:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
Denis Mingulov d4f65b5348 CCMenu - prevent a crash if some child item is not CCMenuItem 
CCMenu::itemForTouch expects that all children are CCMenuItems.
But it is still possible to add other child types, for example
if CCAssert is disabled or some other addChild method is called.

In this case dynamic_cast to CCNode and later try to do
((CCMenuItem*)pChild)->isEnabled() triggers an undefined behaviour
- up to a crash or something else.

Fixed by a dynamic_cast straightforward to CCMenuItem.
 2012-10-21 11:16:10 +03:00
Walzer cc3d850892 fixed #1416, add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 0431cb455b fixed #1413, add CCTouch::getLocation(), getDelta() method 
return OpenGL coordinates directly, to make the usage more convenient.
 2012-07-31 17:41:53 +08:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen fd2d9a8aa6 issue #1310: Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'. 2012-06-08 14:50:41 +08:00
James Chen 734ea54aba fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int. 2012-06-06 15:16:02 +08:00
James Chen f1c5cfef1e fixed #1177: Added CCApplicationProtocol.h. 2012-04-24 17:13:13 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
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 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +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
minggo a2efab73a0 fixed #959: make touch id correct on android 2012-01-31 14:49:02 +08:00
dumganhar 49b57569c9 fixed #756: CCMenu can't be initialized by using CCMenu::node() method. 2012-01-28 14:38:44 +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
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
minggo d48c3fdfb1 upgrade to 1.0.0-final 07-11 2011-07-12 11:20:41 +08:00