walzer
|
3a844f5527
|
[uphone] fix Makefile.ARM for CocosDenshion
|
2011-01-18 14:54:56 +08:00 |
walzer
|
a58acc79f3
|
[iphone] fixed #301, add info.plist for HelloWorld & tests
|
2011-01-18 12:02:27 +08:00 |
walzer
|
e399a77369
|
fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.
|
2011-01-17 22:01:15 +08:00 |
walzer
|
04c685b95a
|
issue #289, fix some warnings
|
2011-01-17 21:16:25 +08:00 |
walzer
|
b60e1e1ff8
|
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
|
2011-01-17 20:37:23 +08:00 |
yangws
|
d2a116b001
|
fixed bug: Post build error on win32 when compiled project which the project's path string has space.
|
2011-01-17 18:01:20 +08:00 |
walzer
|
b574a47b9e
|
[iphone] fixed #302 template for xcode
|
2011-01-17 17:03:48 +08:00 |
walzer
|
ad5ee3c9f6
|
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
|
2011-01-17 16:21:11 +08:00 |
yangws
|
551947e9b4
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-01-17 15:52:17 +08:00 |
minggo
|
b5b3930a95
|
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
|
2011-01-15 15:22:31 +08:00 |
minggo
|
dca425e1b3
|
[iphone] add project template
|
2011-01-15 15:15:22 +08:00 |
natural-law
|
acff950860
|
[uphone]fixed #315,remove the way which use resource in ResourceMap.
|
2011-01-14 17:42:37 +08:00 |
minggo
|
6043008a11
|
Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track
|
2011-01-13 13:52:20 +08:00 |
natural-law
|
5fe891408c
|
[win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again.
|
2011-01-13 10:14:32 +08:00 |
natural-law
|
01e876df03
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-12 18:01:44 +08:00 |
natural-law
|
9ccbb62f6e
|
fixed #313,Modify the main menu of tests project from page-turning to scroll.
|
2011-01-12 18:00:11 +08:00 |
Walzer
|
c9d52d2a48
|
[uphone] add CCNS_uphone.cpp into Makefile.ARM
|
2011-01-12 17:35:53 +08:00 |
natural-law
|
2148097fdc
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-12 15:53:32 +08:00 |
natural-law
|
d1c6c466d3
|
fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.
|
2011-01-12 15:48:36 +08:00 |
minggo
|
7efa234d53
|
issue 311: add some codes to support cocosdenshion on android, the implementation has not implemented
|
2011-01-12 11:49:54 +08:00 |
natural-law
|
3072961d31
|
issue #310.Modify the SimpleAudioEngine in cocos2d-win32.
|
2011-01-11 17:01:06 +08:00 |
natural-law
|
3d45614227
|
issue #310.Modify the SimpleAudioEngine in cocos2d-uphone.
|
2011-01-11 16:41:06 +08:00 |
natural-law
|
5155980ef9
|
fixed #309,optimize code.
|
2011-01-11 13:57:13 +08:00 |
natural-law
|
00a9615e0f
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-10 18:08:57 +08:00 |
natural-law
|
237042f7dd
|
fixed #309,App will not crash any more when surface re-created.
|
2011-01-10 17:54:44 +08:00 |
minggo
|
d405d3a1ba
|
fixed #310:
|
2011-01-10 16:03:53 +08:00 |
minggo
|
7e30615d02
|
issue #304 Remove codes for controlling frame rate.
|
2011-01-10 15:13:30 +08:00 |
minggo
|
c1b32d7305
|
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
|
2011-01-10 14:05:17 +08:00 |
minggo
|
0a799f5c1e
|
fixed #241 cocosdenshion runs ok on iphone
|
2011-01-10 13:59:13 +08:00 |
minggo
|
221943fc26
|
rename SimpleAudioEngine::release() to SimpleAudioEngine::end()
|
2011-01-10 11:47:59 +08:00 |
minggo
|
89710486fe
|
removed unneeded files of cocosdenshont on iphone
|
2011-01-10 11:41:23 +08:00 |
minggo
|
dca85259b1
|
cocosdenshion ok on iphone
|
2011-01-10 11:39:34 +08:00 |
Walzer
|
653cb2d76d
|
[uphone] fixed #308, BGM can be paused after power key pressed to make uphone sleep.
|
2011-01-10 11:03:58 +08:00 |
minggo
|
19a413dc40
|
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
|
2011-01-08 13:42:42 +08:00 |
minggo
|
3712372cc8
|
issue #241: add some files to support cocosdension for iphone
|
2011-01-08 13:41:27 +08:00 |
minggo
|
78a7329054
|
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
|
2011-01-08 09:27:58 +08:00 |
natural-law
|
c02a9a4dd5
|
Setting apk file path at runtime in cocos2d-android.
|
2011-01-07 16:29:06 +08:00 |
minggo
|
321c8098f3
|
make tests runs ok on iphone
|
2011-01-07 11:49:17 +08:00 |
natural-law
|
ec7fbd0e69
|
Fix bugs.
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
|
2011-01-07 11:30:19 +08:00 |
minggo
|
1f08213563
|
HelloWorld runs ok on iphone
|
2011-01-07 11:27:42 +08:00 |
minggo
|
a391c8ef99
|
fixed some errors for iphone platform
|
2011-01-07 10:25:32 +08:00 |
minggo
|
99dd33f94a
|
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
|
2011-01-07 09:33:09 +08:00 |
minggo
|
9a959c299f
|
fixed some errors of iphone platform
|
2011-01-07 09:35:27 +08:00 |
minggo
|
0a7b16f9c0
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
|
2011-01-06 14:15:45 +08:00 |
natural-law
|
e0570d43ad
|
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
|
2011-01-06 14:04:03 +08:00 |
Walzer
|
ca8dc4bc07
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-01-06 10:44:26 +08:00 |
minggo
|
e312bb4d18
|
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merger
|
2011-01-06 10:24:29 +08:00 |
natural-law
|
0d2d746aec
|
Fix bugs.Run tests in cocos2d-uphone successful.
|
2011-01-05 17:01:08 +08:00 |
natural-law
|
1b37dd27ad
|
Fix bugs.Run HelloWorld successful.
|
2011-01-05 11:24:52 +08:00 |
natural-law
|
25e9721678
|
fix bugs.
|
2011-01-04 17:46:23 +08:00 |