natural-law
|
31fc6c0039
|
[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().
|
2011-01-20 13:55:45 +08:00 |
natural-law
|
f7107fb015
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
Conflicts:
cocos2dx/platform/uphone/CCXApplication_uphone.h
|
2011-01-20 13:47:01 +08:00 |
natural-law
|
3d225465c0
|
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
|
2011-01-20 13:41:58 +08:00 |
walzer
|
dc11bdf16a
|
Merge remote branch 'origin/master'
|
2011-01-20 11:41:41 +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 |
yangws
|
ee50078b3e
|
implement FPS limitation on UPhone.
|
2011-01-20 10:49:30 +08:00 |
walzer
|
a9f90256b8
|
fix the wrong direction of particle system
|
2011-01-20 10:21:41 +08:00 |
walzer
|
a99619a3b7
|
[uphone] remove useless vcproj from solution
|
2011-01-20 10:10:27 +08:00 |
minggo
|
14fa024e48
|
Merge https://github.com/cocos2d/cocos2d-x into merger
|
2011-01-20 09:22:29 +08:00 |
walzer
|
b7e109f6e6
|
fixed iphone/android/uphone compilation errors brought by the prevous commit of #322
|
2011-01-19 22:29:57 +08:00 |
walzer
|
9347fadc71
|
[win32] fixed #322, FPS control on win32
|
2011-01-19 18:23:42 +08:00 |
walzer
|
e404a6aeb9
|
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
|
2011-01-19 18:11:21 +08:00 |
walzer
|
9041d03d3b
|
[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.
|
2011-01-19 18:02:35 +08:00 |
yangws
|
d627608ff4
|
win32 platform fps limitation support.
|
2011-01-19 17:59:20 +08:00 |
walzer
|
e22ec58feb
|
[iphone] fix compilation error on SimpleAudioEngine::setResource(...)
|
2011-01-19 16:51:40 +08:00 |
walzer
|
816deced9e
|
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
|
2011-01-19 16:41:47 +08:00 |
walzer
|
a0c50d3edb
|
[iphone] support UTF8 Chinese chars
|
2011-01-19 16:26:55 +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
|
14a5470d72
|
Merge branch 'master' of https://github.com/yangws/cocos2d-x
|
2011-01-18 18:04:55 +08:00 |
walzer
|
81b041ba54
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-18 18:01:26 +08:00 |
walzer
|
b5c70139c4
|
Merge remote branch 'origin/master'
|
2011-01-18 17:58:46 +08:00 |
walzer
|
29cf6fc66b
|
[iphone] fixed #301, add icon for info.plist
|
2011-01-18 17:58:21 +08:00 |
yangws
|
2e8f3a26f5
|
Modify template for uphone.
make it's helloworldscene code safely.
|
2011-01-18 15:32:29 +08:00 |
minggo
|
8d278a5f93
|
[iphone]fixed error: the use of rm is incorrect
|
2011-01-18 15:20:29 +08:00 |
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 |
yangws
|
5829ccd36e
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-01-18 12:00:09 +08:00 |
yangws
|
a007aa5f84
|
Modify the template for win32.
Make it like the HelloWorld project.
|
2011-01-18 11:45:22 +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
|
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 |
yangws
|
bc32209115
|
add libs for platform_support
|
2011-01-15 18:08:45 +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 |
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 |