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

3629 Commits

Author SHA1 Message Date
James Chen 0adca5774c move CCNotificationCenter to extensions folder 2012-02-14 11:45:59 +08:00
James Chen 65b1b20c8d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter 
Conflicts:
	cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
	tests/test.win32/test.win32.vcxproj.filters
 2012-02-14 11:43:04 +08:00
minggo f8b7e01c69 Merge pull request #722 from minggo/iss948_CCMutableArray 
fixed #948: remove getIndexOfObject()
 2012-02-13 19:07:26 -08:00
minggo c98dd0cf2d fixed #948: remove getIndexOfObject() 2012-02-14 10:49:53 +08:00
minggo d89037c95d Merge pull request #721 from minggo/master 
Use new logo
 2012-02-13 01:55:24 -08:00
minggo 4f6fa935d9 Use new logo 2012-02-13 17:53:00 +08:00
minggo 63679ab9f4 remove unneeded file 2012-02-10 14:35:02 +08:00
minggo 1dacd152e5 Merge pull request #719 from minggo/lua_support_refactor 
Lua support refactor
 2012-02-09 21:58:03 -08:00
minggo 538adcec3e merge code from duleface 2012-02-10 13:56:20 +08:00
James Chen 4b9ee55145 issue #972: modify project settings for linux and marmalade. 2012-02-10 13:39:39 +08:00
minggo 8b855a917f issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
YuLei Liao 791736162f fix tolua_fix.c compile with C++ in VS2008 2012-02-10 12:00:55 +08:00
James Chen 81ec2c8586 issue #972: add support for CCNotificationCenter, and add the test demo for it. 
modify the project setting for VS2008 and VS2010
 2012-02-10 11:48:33 +08:00
minggo 5ce4968524 merge from cocos2d-x master 2012-02-10 10:46:58 +08:00
minggo bee77a7d9f issue #973: add tool for mack 2012-02-10 10:43:36 +08:00
minggo 3c41164b23 Merge pull request #716 from minggo/iss971_rtti 
build cocos2dx as static lib and remove some unneeded codes
 2012-02-09 18:35:28 -08:00
minggo 6ae40fc12f fixed #971: build cocos2dx as static lib 2012-02-10 10:31:56 +08:00
Walzer 0171304dae Update README.mdown 2012-02-09 21:17:11 +08:00
YuLei Liao c02aa9e666 * update windows vs2008 project 2012-02-09 20:08:13 +08:00
YuLei Liao 1d6d966717 fix CCScriptEngineManager::purgeSharedManager() 2012-02-09 20:07:55 +08:00
minggo 1123e6768e Merge pull request #717 from minggo/master 
fix a typo error
 2012-02-09 02:18:40 -08:00
minggo 481f1c2532 fix a typo error 2012-02-09 18:17:25 +08:00
minggo 6988964a6e refactor lua support 2012-02-09 18:12:45 +08:00
minggo 141dac47d3 Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 17:58:39 +08:00
YuLei Liao 8b0d201850 update xcode4 lua template 2012-02-09 17:54:25 +08:00
YuLei Liao e74b842a58 update HelloLua 2012-02-09 17:48:15 +08:00
minggo 357c825fa5 issue #971: set JavaVM at JNI_Onload() 2012-02-09 16:27:15 +08:00
minggo 95906c34bf Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor 2012-02-09 16:14:54 +08:00
minggo 153d2b8192 issue #971: build cocos2dx as static lib and remove some unneeded codes 2012-02-09 15:49:14 +08:00
YuLei Liao 1858b7be18 * remove lua exts 2012-02-09 14:13:01 +08:00
YuLei Liao 6ebdf9cb4b * add CCScriptSupport 2012-02-09 14:07:11 +08:00
YuLei Liao 00d6ddd34e * update luasocket 2.0.2 source files 2012-02-08 19:51:08 +08:00
YuLei Liao 5d50cf3308 * update lua 5.1.4 source files 2012-02-08 19:49:25 +08:00
minggo ee08c4629e Merge pull request #714 from minggo/ndk_module 
fixed #970: use modules in the android ndk build
 2012-02-07 19:16:01 -08:00
minggo 52de292e20 fixed #970: use modules in the android ndk build 2012-02-08 11:14:47 +08:00
dumganhar 437f27ff47 Merge pull request #713 from dumganhar/iss951_rm_NSMutableSet 
fixed #951: removed definition of NSMutableSet.
 2012-02-06 23:37:29 -08:00
dumganhar ca94a11190 fixed #951: removed definition of NSMutableSet. 2012-02-07 15:35:10 +08:00
YuLei Liao 2b1f83a61b add addLuaLoader(loader_Android) 2012-02-07 15:16:15 +08:00
minggo 29c18c67ca Merge pull request #712 from minggo/ndk_module 
Use modules in the Android NDK build
 2012-02-06 22:36:45 -08:00
minggo 9249328afb fixed #970: use modules in the Android NDK build 2012-02-07 14:34:30 +08:00
dumganhar d83e18b7ba Merge pull request #711 from dumganhar/iss967_pvr_tex_reload 
fixed #967: PVR Textures cannot be reloaded after GL context lost on android.
 2012-02-06 22:22:07 -08:00
YuLei Liao 5497d25e0f remove unused wophone files 2012-02-07 13:36:43 +08:00
YuLei Liao 22cddb5240 * update hello.lua 2012-02-07 13:17:23 +08:00
YuLei Liao 7a96d13fb6 rename all FuncID to Handler 2012-02-07 11:43:29 +08:00
dumganhar 1e807d00c3 fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android. 2012-02-07 11:18:39 +08:00
dumganhar ee2139023a Merge pull request #708 from Wartortle/master 
fixed #969: Addition of Accelerometer Simulation for Win32.
 2012-02-06 18:57:41 -08:00
minggo 8770976884 Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module 2012-02-07 10:48:07 +08:00
minggo 3874450200 Merge pull request #710 from minggo/iss954_accerometer 
correct accelerometer data when set orientation to portrait in tablet
 2012-02-06 18:23:15 -08:00
minggo a7c96b5371 fixed #954: correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
Wartortle aa06de2fb3 Second half of commit for adding Accelerometer simulation to Win32. 2012-02-06 11:38:53 +00:00