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

89 Commits

Author SHA1 Message Date
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
natural-law 134a3a0fcf fixed #590 2011-07-08 14:32:09 +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
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
natural-law d4dbedca4d fixed #451,remove the code of support mac platform. 
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
 2011-04-11 11:24:10 +08:00
natural-law 6ee16ce878 update menu_nodes to 0.99.5 2010-12-25 11:15:19 +08:00
natural-law ff4a9e42fd fixed #217 2010-11-23 13:41:10 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming 857595d644 issue #116 2010-09-02 08:46:25 +00:00
Ming 59afd38192 issue #116: remove __super 2010-09-02 06:54:42 +00:00
Ming c293bd456f issue #85: remove the use of static_cast() 2010-08-31 03:23:54 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Walzer 4a91a25226 issue #18, debug 2010-08-28 07:43:13 +00:00
Walzer 35b33ba82b issue #18, debug 2010-08-28 07:24:33 +00:00
Ming 60adec78e8 issue #85: avoid virtual inheriting from NSObject, and remove the using of dynamic_cast() 2010-08-27 06:13:32 +00:00
natural-law 7fd86b7734 fixed #95 
add CocosNode Test code
 2010-08-26 07:09:02 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Walzer 1d7f567963 issue #18, debug 2010-08-19 08:45:18 +00:00
Walzer 9703e75e57 issue #18, debug 2010-08-19 06:09:40 +00:00
Ming 3c658c27a5 issue #44: fix some bugs 2010-08-12 09:01:51 +00:00
Ming c93cdeaa1e fixed #38: implemented 2010-08-10 09:21:01 +00:00
Walzer 2a2f5ccf38 issue #38, implement CCMenu 2010-08-10 04:49:16 +00:00