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

2942 Commits

Author SHA1 Message Date
GavT 6ab60118af Update cocos2dx/include/CCTouch.h 2011-12-06 20:31:40 -08:00
GavT 190891bab7 Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751 
Files Modified: Eagleview.mm, CCTouch.h
 2011-12-06 20:06:38 -08:00
minggo d97e1b705f Merge pull request #607 from dualface/fix-xcode4-template 
* fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground()
 2011-12-05 19:46:14 -08:00
YuLei Liao 443656f88c * fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground() 2011-12-06 10:51:12 +08:00
Walzer 70d5a088f1 fixed #887, define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7 2011-12-04 20:18:17 +08:00
Walzer e14a3f52ad changelog of 0.10.0 2011-12-02 10:36:58 +08:00
minggo e71044fce3 Merge pull request #606 from dumganhar/master 
Add two license files used for bada port
 2011-12-01 04:15:13 -08:00
dumganhar 9b36298ccf add two license used for bada port 2011-12-01 19:26:03 +08:00
minggo 75d40c2e98 Merge pull request #603 from dumganhar/master_base 
modify helloworld .cproject, use xcopy /y /s to copy resource
 2011-12-01 01:28:46 -08:00
minggo 262d17d010 Merge pull request #604 from minggo/master 
fixed #854: cache texture on android
 2011-12-01 01:06:38 -08:00
minggo f0e80b32f4 fixed #854: cache texture on android 2011-12-01 17:04:56 +08:00
dumganhar d71b467ca5 modify helloworld .cproject, use xcopy /y /s to copy resource 2011-12-01 17:02:11 +08:00
Walzer 014286cf36 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-12-01 17:01:04 +08:00
Walzer 21af60ee9c update xcode4 templates 2011-12-01 17:00:30 +08:00
minggo 2f6fb5b189 Merge pull request #602 from minggo/master 
change file structure in xcode view
 2011-12-01 00:28:17 -08:00
minggo d92bdcc40d change file structure in xcode view 2011-12-01 16:27:11 +08:00
minggo e5fb91198b Merge pull request #601 from dumganhar/master_base 
fix a bug in ZwoptexTest.
 2011-11-30 22:39:08 -08:00
dumganhar 6973525319 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-12-01 14:19:07 +08:00
dumganhar ef8e34f9a1 fix a bug in ZwoptexTest. 
step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.
 2011-12-01 14:15:10 +08:00
minggo ec70d1d240 Merge pull request #600 from dumganhar/master_base 
fix a bug in IntervalTest
 2011-11-30 22:05:07 -08:00
dumganhar f02ce4b15a fix a bug in IntervalTest 2011-12-01 13:56:20 +08:00
minggo 34d10fb3db Merge pull request #598 from dumganhar/master_base 
DemoModernArt test crash on bada
 2011-11-30 20:45:36 -08:00
minggo ed030139b8 Merge pull request #599 from minggo/master 
make SimpleAudioEngine::setEffectVolume() take effect immediately
 2011-11-30 20:45:12 -08:00
minggo cddaa3fea2 fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android 2011-12-01 12:12:14 +08:00
dumganhar bdddc188aa fix a bug that DemoModernArt crash on bada 2011-12-01 12:04:43 +08:00
minggo b6b92944d6 Merge pull request #597 from minggo/master 
fixed #580: update Box2d for vs2010
 2011-11-30 18:09:33 -08:00
minggo ea9cd75e67 fixed #580: update Box2d for vs2010 2011-12-01 10:08:15 +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
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
minggo 735726355c issue #850: add Makefile for Box2d 2011-11-29 17:22:03 +08:00
minggo adfec68577 fixed #850: update Box2d for linux 2011-11-29 17:12:21 +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
minggo 266f0ee7ab Merge pull request #586 from leon-li/master 
Fix some minor bugs.
 2011-11-28 18:27:38 -08:00