minggo
617d484257
[android] fixed #405 : pause BMG music when tap HOME and resume it when it is active
2011-03-18 11:12:06 +08:00
walzer
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
minggo
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
yangws
12254f95f0
fixed #395 Add initInstance code for all platform in msvc templates.
2011-03-17 11:27:51 +08:00
yangws
61e2f56439
Add Retina display resource for tests.
...
Modify CCDrawingPrimitives.cpp for retina display support.
2011-03-15 15:12:50 +08:00
minggo
7571e1a51c
Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev
2011-03-15 09:29:47 +08:00
walzer
db1f54ee45
[ios] HelloWorld.jpg ->.png, xcode project from iOS4.1 to 4.2 "Lastest iOS"
2011-03-14 18:31:16 +08:00
natural-law
6d028007c2
Fix the bug of CCAnimationCache and CCSpriteFrame.Run SpriteTest successful.
2011-03-11 17:00:10 +08:00
minggo
723dd89fb7
Merge branch 'dev' of https://github.com/minggo/cocos2d-x into dev
2011-03-11 12:03:53 +08:00
minggo
69dcaddb51
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-11 12:01:58 +08:00
minggo
9fa282c65c
[android] fix some bug and remove unneeded files
2011-03-11 11:56:33 +08:00
yangws
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
unknown
8e429c422d
Build-win32.bat OK on win7
2011-03-10 21:11:14 +08:00
unknown
795f1b985f
Add VC2010 project files on win32
2011-03-10 19:50:17 +08:00
minggo
9a67fa6df1
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-10 17:16:15 +08:00
natural-law
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
yangws
3fc701f1d2
fixed #300 Cocos2d-win32 application wizard for vs ok.
2011-03-10 12:00:29 +08:00
minggo
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
minggo
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
minggo
69edcb16af
fix a mergeing bug
2011-03-04 17:17:53 +08:00
minggo
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
minggo
8e2f9c96b8
remove unneeded files
2011-03-04 16:22:53 +08:00
natural-law
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
yangws
395a0b3d47
AtlasTest rename to LabelTEst on win32.
2011-03-02 17:34:26 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
minggo
f58d2f8b32
[andriod] fixed #247 : support multitouch on android
2011-03-02 10:40:02 +08:00
minggo
0a5ec4c12b
[android] move MultiTouchController.java to cocos2dx/lib/touch
2011-03-02 10:34:49 +08:00
minggo
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
minggo
e00222104f
merge yangws-issue360 into dev
2011-03-02 09:31:47 +08:00
minggo
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
yangws
b54de8a3ef
fixed #360 Modify CCXAppWiz for win32, add initInstance function in class AppDelegate
2011-03-01 14:28:39 +08:00
minggo
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
minggo
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
minggo
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
minggo
1428480c7f
[android] fixed #338:refactor platform_support
2011-02-25 13:35:27 +08:00
natural-law
6c54eb0a86
Update the tests from 0.99.4 to 0.99.5.
2011-02-25 11:31:49 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
natural-law
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
Macarse
b52eed0782
blah
2011-02-22 22:32:24 -03:00
yangws
4d47babf9e
add ; after NS_CC_BEGIN
2011-02-19 18:16:45 +08:00
natural-law
4362a5f381
[uphone]issue #316,Resolution auto adjustment.
2011-02-19 17:44:43 +08:00
natural-law
60e9ae873c
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
...
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
2011-02-19 10:19:14 +08:00
yangws
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
natural-law
245155e66a
[uphone]issue #340,Refactor platform_support on uphone,and run tests successful on both simulator and device.
2011-02-18 10:44:49 +08:00
Macarse
c6f4eab602
typo
2011-02-17 23:44:14 -03:00
Macarse
43a437a978
fixed small error
2011-02-17 23:28:17 -03:00
Macarse
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
natural-law
0a2ceee2c5
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into dev
2011-02-12 17:24:41 +08:00
minggo
043d771f1a
Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev
2011-02-12 17:23:50 +08:00
natural-law
20409e7a58
delete the code for debug in cocos2d-android.
2011-02-12 17:20:13 +08:00
natural-law
8fcb9d017c
delete the code for debug in cocos2d-android.
2011-02-12 17:18:25 +08:00
yangws
8458476597
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
.gitignore
2011-02-12 16:42:47 +08:00
Macarse
24c4a477e3
Fixed issue for tests
2011-02-11 00:48:46 -03:00
Macarse
e1dfb21dd4
Added logic for POINTER_UP and POINTER_DOWN
2011-02-06 19:02:03 -03:00
Macarse
8d5995d5a6
First approach
2011-02-06 17:05:56 -03:00
Macarse
ab44dafc6c
Use SENSOR_DELAY_GAME for the SensorManager
2011-02-06 09:11:24 -03:00
Macarse
66038230eb
Added logic to disable sensors from the c++ code
2011-02-05 20:17:24 -03:00
Macarse
284c330569
Added code from walzer's comment
2011-02-01 00:11:42 -03:00
Macarse
fce540989d
First approach
2011-01-30 20:05:30 -03:00
yangws
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
yangws
76ea63da7f
Change prefix CCX to ccx.
2011-01-27 17:07:36 +08:00
minggo
d68d33b029
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-27 09:56:45 +08:00
minggo
31f9969674
fixed #333 : fix compiling issue under linux
2011-01-27 09:49:06 +08:00
Macarse
89f012023e
Fix display issue with Samsung Galaxy Tab
2011-01-26 19:03:14 -03:00
minggo
046668c3f1
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-26 10:02:26 +08:00
minggo
052e8634dc
[android]fix a bug of SimpleAudioEngine::playEffect()
2011-01-26 09:46:34 +08:00
minggo
9e2587c26c
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-25 17:09:11 +08:00
minggo
acb6b67bd9
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2011-01-25 17:08:04 +08:00
walzer
5d051a14fa
[iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog
2011-01-25 16:56:46 +08:00
minggo
4fae086e8b
[android]: fps controller
2011-01-25 15:26:16 +08:00
natural-law
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
natural-law
d56575dd5a
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
2011-01-25 14:26:26 +08:00
walzer
04aab22145
Merge branch 'natural-law-master'
2011-01-25 11:43:57 +08:00
minggo
59edc619a8
[android] to prevent preload effect many times
2011-01-25 11:30:25 +08:00
minggo
38b7e054bd
[android]fix the error of preloadEffect()
2011-01-25 11:29:15 +08:00
natural-law
800033d98b
fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile.
2011-01-24 15:53:52 +08:00
yangws
09748e88a1
SchedulerTest can output log now.
2011-01-24 14:52:16 +08:00
yangws
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
yangws
6ad3ec6bf0
HelloWorld and tests can run after move ccxApplication.
2011-01-22 17:30:00 +08:00
minggo
e23c1eb2f6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-22 16:45:26 +08:00
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
4a4c0d3485
[android] fixed #321 : Frame control of android. It is not so accuracy.
2011-01-22 15:10:18 +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
yangws
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +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
yangws
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +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
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +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
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +08:00
Walzer
5a4c721f0c
modify build_natvie.sh to use unix line feed character
2010-12-17 15:43:36 +08:00
Walzer
063f595e9a
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-16 12:03:25 +08:00
natural-law
95e697d316
fixed #262 Add namespace for the project CocosDenshion.
2010-12-15 18:28:18 +08:00
impact
7434748d4a
Capitalization changes for building on linux (case-sensitive filesystem)
2010-12-15 01:00:35 -05:00
natural-law
2576bbe5b4
Merge branch 'master' into iss258
2010-12-14 13:53:25 +08:00