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

3029 Commits

Author SHA1 Message Date
YuLei Liao f3e654056c * fix merge error 2 2011-11-30 21:50:00 +08:00
YuLei Liao 25f1cf16fd * fix merge error 1 2011-11-30 21:47:23 +08:00
YuLei Liao 45fe3b3090 * merge luafix-0.9.2 2011-11-30 21:42:18 +08:00
YuLei Liao 216ad9b9cb * merge upstream/master to master 2011-11-30 21:38:20 +08:00
YuLei Liao a680ba4a8a * CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference 2011-11-30 21:29:57 +08:00
YuLei Liao 31285fea17 * add Touch & MultiTouches lua support 2011-11-30 21:27:50 +08:00
minggo 427f33d01d Merge pull request #596 from tszming/master 
Lua support: fix for the rename of getHornorParentTransform & setHornorParentTransform
 2011-11-30 02:31:02 -08:00
Tsz Ming WONG a7fddfc641 Fix for the rename of getHornorParentTransform/setHornorParentTransform: ab7db20809 2011-11-30 18:19:34 +08:00
minggo c7ba8c13b7 Merge pull request #594 from dumganhar/master_base 
Fix a bug in SpriteTest and comment one line of unused code
 2011-11-30 02:04:31 -08:00
minggo db72782c5b Merge pull request #595 from minggo/master 
fix type error according the change of CCSprite
 2011-11-30 01:51:56 -08:00
minggo f693a5a10e fix type error according the change of CCSprite 2011-11-30 17:49:52 +08:00
dumganhar 0ae54cc0fd comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer. 2011-11-30 17:37:09 +08:00
dumganhar 2b6d4e1b82 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-30 17:30:33 +08:00
dumganhar 262d5969c3 fixed #883: fix a bug in SpriteTest. 2011-11-30 17:29:16 +08:00
minggo a5f389894a Merge pull request #593 from minggo/box2d 
change version and support android 4.0
 2011-11-29 23:34:33 -08:00
minggo 5391d17421 Merge branch 'box2d' of https://github.com/minggo/cocos2d-x into box2d 2011-11-30 15:32:49 +08:00
minggo 4607ba8029 support for android 4.0 2011-11-30 15:30:11 +08:00
minggo abe66d2652 Merge pull request #592 from dumganhar/master_base 
fix a bug in CCScheduler.cpp
 2011-11-29 18:04:07 -08:00
dumganhar 445982a252 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-30 09:35:15 +08:00
dumganhar 68297f0121 fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param. 2011-11-30 09:32:07 +08:00
YuLei Liao d383211f99 Merge branch 'refs/heads/luafix-0.9.2' 2011-11-29 20:09:39 +08:00
YuLei Liao a20ec0e7fc * update README.mdown 2011-11-29 20:09:27 +08:00
YuLei Liao 4bf68e79fd * merge upstream/master to master 2011-11-29 19:56:20 +08:00
YuLei Liao ebd381af26 * merge luafix-0.9.2 to master 2011-11-29 19:20:49 +08:00
minggo efff0b767f Merge pull request #591 from minggo/box2d 
update Box2d for android iOS and linux
 2011-11-29 01:49:50 -08:00
minggo 7194c25b63 issue #850: update Makefile for Box2d 2011-11-29 17:43:11 +08:00
YuLei Liao 9070248d17 * [fix] MenuItem::activate() not call script function with tag value 2011-11-29 17:40:18 +08:00
YuLei Liao 07a468cec9 * merge LuaSimpleAudioEngine to LuaCocos2d 2011-11-29 17:39:47 +08:00
minggo 735726355c issue #850: add Makefile for Box2d 2011-11-29 17:22:03 +08:00
YuLei Liao 9aa72c23b2 * remove LuaEngineImpl.cpp 2011-11-29 17:13:44 +08:00
minggo adfec68577 fixed #850: update Box2d for linux 2011-11-29 17:12:21 +08:00
YuLei Liao 757f840b47 * update tolua++ .pkg files, add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler() 2011-11-29 17:12:08 +08:00
YuLei Liao 83aaa504d2 * change error message 2011-11-29 17:11:47 +08:00
YuLei Liao 3e47f7a546 * add CCLuaEngine::executeFunctionWith...Data() 2011-11-29 17:11:20 +08:00
YuLei Liao 90ae1aabc7 * add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler() 2011-11-29 17:10:58 +08:00
YuLei Liao 6117e15354 * [fix] CCFileUtils::getDoubleResolutionImage() not display HD file path. 2011-11-29 15:52:13 +08:00
YuLei Liao 149e33ef69 * fix tolua_ref_function() and tolua_remove_function_by_refid() 2011-11-29 15:51:18 +08:00
YuLei Liao c7ee84ccd4 * update tolua++ .pkg files 2011-11-29 15:45:20 +08:00
YuLei Liao ab184c7ead * CCLuaEngine::executeFunctionByRefID() support additional parameters 2011-11-29 15:44:54 +08:00
YuLei Liao 0739c1f262 * rename LuaEngine to CCLuaEngine 
* add #if LUA_ENGINE
* format source files
 2011-11-29 15:42:12 +08:00
YuLei Liao e9fa8116e9 * rename tolua_fix.cpp to tolua_fix.c 2011-11-29 15:40:15 +08:00
minggo c99d254c01 issue #850: update box2d for iOS and android 2011-11-29 15:16:16 +08:00
minggo 30f547fbe6 Merge pull request #590 from dumganhar/issue850_Box2d2.2.1 
Issue850 box2d2.2.1
 2011-11-28 22:19:39 -08:00
dumganhar 89f9bd6560 issue #850: upgrate box2d to 2.2.1 version, test on win32 and bada 2011-11-29 12:50:29 +08:00
dumganhar 5106f60131 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue850_Box2d2.2.1 2011-11-29 12:42:25 +08:00
YuLei Liao 31b47c3fc6 * remove needless code 2011-11-29 12:38:28 +08:00
YuLei Liao f1351610d8 * merge CCLuaSupport to CCLuaEngine 2011-11-29 12:35:48 +08:00
YuLei Liao 4ba170d82f * rename LuaEngine.cpp/.h to CCLuaEngine.cpp/.h 2011-11-29 12:35:34 +08:00
minggo 266f0ee7ab Merge pull request #586 from leon-li/master 
Fix some minor bugs.
 2011-11-28 18:27:38 -08:00
Leon f108952595 Merge remote branch 'upstream/master' 
Conflicts:
	cocos2dx/support/CCPointExtension.cpp
 2011-11-29 10:15:15 +08:00