natural-law
|
5cf0ee5d90
|
[uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0
|
2011-01-22 16:22:26 +08:00 |
minggo
|
882b473291
|
[iphone]: font support
|
2011-01-21 18:15:12 +08:00 |
minggo
|
b3fe7f5b6c
|
fixed #307:merge TestAudioEngine into tests
|
2011-01-21 16:26:51 +08:00 |
minggo
|
01a3e37db8
|
[android] fix bug of build_native.sh
|
2011-01-21 15:45:55 +08:00 |
minggo
|
cffc61d426
|
issue #307: add music resource
|
2011-01-21 15:17:23 +08:00 |
minggo
|
e92970ec69
|
[android] fixed #311: implement cocosdenshin on android
|
2011-01-21 15:15:09 +08:00 |
minggo
|
f9d0db48e1
|
issue #307: merge TestAudioEngine into tests
|
2011-01-21 15:11:15 +08:00 |
minggo
|
14fa024e48
|
Merge https://github.com/cocos2d/cocos2d-x into merger
|
2011-01-20 09:22:29 +08:00 |
walzer
|
9041d03d3b
|
[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.
|
2011-01-19 18:02:35 +08:00 |
minggo
|
d64ac9fdb8
|
issue #311: cocosdenshion for android
|
2011-01-19 16:00:19 +08:00 |
natural-law
|
ec7c24ad8d
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-19 10:03:39 +08:00 |
natural-law
|
f992838f96
|
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
|
2011-01-18 18:21:06 +08:00 |
walzer
|
a58acc79f3
|
[iphone] fixed #301, add info.plist for HelloWorld & tests
|
2011-01-18 12:02:27 +08:00 |
natural-law
|
c682dd7084
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
|
2011-01-18 10:16:35 +08:00 |
natural-law
|
acb4a6a369
|
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
|
2011-01-18 10:14:44 +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
|
ad5ee3c9f6
|
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
|
2011-01-17 16:21:11 +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 |
natural-law
|
237042f7dd
|
fixed #309,App will not crash any more when surface re-created.
|
2011-01-10 17:54:44 +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 |
natural-law
|
0d2d746aec
|
Fix bugs.Run tests in cocos2d-uphone successful.
|
2011-01-05 17:01:08 +08:00 |
natural-law
|
25e9721678
|
fix bugs.
|
2011-01-04 17:46:23 +08:00 |
Walzer
|
4a6989b6ff
|
[uphone] add keyMenuBack to CCKeypadDelegate
|
2010-12-31 18:15:30 +08:00 |
natural-law
|
3dfd530b38
|
Merge branch 'iss295' into upto-0.99.5
|
2010-12-31 09:48:48 +08:00 |
natural-law
|
34f45c8faa
|
Implement CCEventDispatcher.
|
2010-12-31 09:36:53 +08:00 |
yangws
|
706f97114b
|
issue #281 CCParticleSystemQuad upto-0.99.5
|
2010-12-28 11:55:34 +08:00 |
yangws
|
5e377f9368
|
issue #281 CCParticleSystemPoint.h upto-0.99.5
|
2010-12-28 11:09:40 +08:00 |
natural-law
|
01cd90f2cc
|
update layers_scenes_transition_nodes to 0.99.5.
|
2010-12-27 09:40:45 +08:00 |
natural-law
|
4a64f899fe
|
update label_nodes to 0.99.5.
|
2010-12-24 17:07:31 +08:00 |
minggo
|
e3b49d7504
|
merge from minggo and natual-raw
|
2010-12-23 17:40:23 +08:00 |
minggo
|
6d98bc7b5d
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
|
2010-12-23 16:22:37 +08:00 |
minggo
|
30f4c94bfb
|
make a little change to upto-0.99.5
|
2010-12-23 10:35:09 +08:00 |
natural-law
|
eeb4e99804
|
rename the action classes.
|
2010-12-22 15:43:54 +08:00 |
natural-law
|
4a765d33a3
|
rename the CCXXXAction files to CCActionXXX.
|
2010-12-22 15:15:04 +08:00 |
Walzer
|
5c9aea9ee7
|
Merge branch 'minggo-master'
|
2010-12-20 15:03:32 +08:00 |
Walzer
|
13865e7331
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2010-12-20 15:03:12 +08:00 |
minggo
|
3d85f8f8d3
|
correct the error for checking the existance of resources
|
2010-12-20 14:44:38 +08:00 |
minggo
|
dc980de055
|
copy resources correctly
|
2010-12-20 14:35:02 +08:00 |
minggo
|
32307cc3e0
|
copy resources from top directory
|
2010-12-20 14:21:33 +08:00 |
minggo
|
4c14ff2c2f
|
copy resources from top directory
|
2010-12-20 14:17:51 +08:00 |
Walzer
|
156e667849
|
merge tests/proj.uphone & framework.uphone, merge tests/proj.win32 & framework.win32
|
2010-12-20 12:47:56 +08:00 |
natural-law
|
9a4f0c0283
|
fixed #267 Fix the bug of test case "ParallaxParticle" in ParticleTest.
|
2010-12-18 15:20:45 +08:00 |
Walzer
|
5c858b182c
|
issue #243, fix warnings
|
2010-12-18 12:02:57 +08:00 |
Walzer
|
edc742d41b
|
Merge branch 'master' of https://github.com/leon-li/cocos2d-x into leon-li-master
|
2010-12-18 10:26:22 +08:00 |
Walzer
|
b12f20c834
|
[iphone-cpp] SDKROOT = "iphoneos" instead of "iphoneos4.1"
|
2010-12-18 10:15:07 +08:00 |