minggo
|
1428480c7f
|
[android] fixed #338:refactor platform_support
|
2011-02-25 13:35:27 +08:00 |
minggo
|
0453eb0266
|
[android] issue #338:refactor platform_support
|
2011-02-24 19:42:45 +08:00 |
yangws
|
63cedd1317
|
Merge code of Platform_support for IOS.
|
2011-02-23 18:22:05 +08:00 |
minggo
|
36cb90aaa0
|
Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport
|
2011-02-23 14:13:48 +08:00 |
minggo
|
3dde0ebcf5
|
[android] fixed #353: support jpg on android
|
2011-02-23 13:43:45 +08:00 |
yangws
|
c43d1371a6
|
WVGA keep w/h rate scale test on uphone device ok.
|
2011-02-21 16:14:13 +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
|
8035fc366c
|
[uphone]Support read image file from zip file.
|
2011-02-17 16:16:50 +08:00 |
natural-law
|
e4063fd190
|
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
|
2011-02-17 14:31:52 +08: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 |
walzer
|
ead71525e2
|
[uphone] don't block when zip resources loading failed
|
2011-01-26 17:08:19 +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 |
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 |
yangws
|
04c48f59c1
|
commit ccxApplication files.
|
2011-01-22 16:27:08 +08:00 |
yangws
|
bc9bfdc30c
|
Move win32/CCXApplication to platform_support
|
2011-01-22 16:24:54 +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
|
dd979a4ed9
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
|
2011-01-21 16:29:13 +08:00 |
minggo
|
01a3e37db8
|
[android] fix bug of build_native.sh
|
2011-01-21 15:45:55 +08:00 |
minggo
|
459a34d51e
|
[android] make helloworld run on 2.1
|
2011-01-21 13:32:10 +08:00 |
walzer
|
a2b426047d
|
[android] make HelloWorld compatible on android 2.1 simulator
|
2011-01-21 08:44: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 |
yangws
|
ee50078b3e
|
implement FPS limitation on UPhone.
|
2011-01-20 10:49:30 +08:00 |
walzer
|
9347fadc71
|
[win32] fixed #322, FPS control on win32
|
2011-01-19 18:23:42 +08:00 |
walzer
|
9041d03d3b
|
[uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger.
|
2011-01-19 18:02:35 +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
|
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 |
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 |
natural-law
|
acff950860
|
[uphone]fixed #315,remove the way which use resource in ResourceMap.
|
2011-01-14 17:42:37 +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
|
1f08213563
|
HelloWorld runs ok on iphone
|
2011-01-07 11:27:42 +08:00 |
minggo
|
9a959c299f
|
fixed some errors of iphone platform
|
2011-01-07 09:35:27 +08:00 |
natural-law
|
4a64f899fe
|
update label_nodes to 0.99.5.
|
2010-12-24 17:07:31 +08:00 |
natural-law
|
4a765d33a3
|
rename the CCXXXAction files to CCActionXXX.
|
2010-12-22 15:15:04 +08:00 |
Walzer
|
e058e07d48
|
fix compile err & warnings at HelloWorld.iphone
|
2010-12-21 07:41:23 +08:00 |
Walzer
|
5c9aea9ee7
|
Merge branch 'minggo-master'
|
2010-12-20 15:03:32 +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
|
4c14ff2c2f
|
copy resources from top directory
|
2010-12-20 14:17:51 +08:00 |
Walzer
|
b9684cf123
|
issue #260, Helloworld.android will auto scale to WVGA resolution
|
2010-12-20 11:31:40 +08:00 |
minggo
|
8891394a4c
|
supporting compiled by ndk-r5
|
2010-12-20 10:01:12 +08:00 |
minggo
|
ddaa654333
|
fixed #260
|
2010-12-18 18:23:31 +08:00 |
Walzer
|
b12f20c834
|
[iphone-cpp] SDKROOT = "iphoneos" instead of "iphoneos4.1"
|
2010-12-18 10:15:07 +08:00 |
yangws
|
caf518f97d
|
fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error.
|
2010-12-17 17:20:39 +08:00 |
natural-law
|
95e697d316
|
fixed #262 Add namespace for the project CocosDenshion.
|
2010-12-15 18:28:18 +08:00 |
minggo
|
53753b65b5
|
merge bada platform
|
2010-12-15 18:05:02 +08:00 |
natural-law
|
2c84b167e0
|
fixed #258 Move FileUtils.h from path "support/file_support" to path "include".
|
2010-12-14 10:45:23 +08:00 |
natural-law
|
2706e3a003
|
fixed #251 CCKeypadDelegate implement
|
2010-12-13 14:10:39 +08:00 |
unknown
|
4d22e3b263
|
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
|
2010-12-08 18:03:35 +08:00 |
yangws
|
96115bc26e
|
fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device.
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.
Signed-off-by: yangws <yangws@cocos2d-x.org>
|
2010-12-03 15:27:55 +08:00 |
minggo
|
ad344d69fb
|
fixed #238, checked in xcodeproj file for HelloWorld & tests
|
2010-12-03 14:39:07 +08:00 |
Walzer
|
f98e745c1b
|
add HelloWorld_Prefix.pch for iphone
|
2010-11-29 14:15:47 +08:00 |
Walzer
|
b4152fa700
|
fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android
|
2010-11-27 18:25:31 +08:00 |
Walzer
|
6afe5752f2
|
rename directories
|
2010-11-18 12:32:01 +00:00 |
Walzer
|
6acbc6dc05
|
issue #198, merge test_uphone & test_win32
|
2010-11-12 08:25:14 +00:00 |
Walzer
|
94806c9194
|
merge with tag/0.99.4-uphone-0.9.0
|
2010-11-11 03:18:58 +00:00 |
yangws
|
60329478fa
|
modify .user files
|
2010-11-05 03:39:55 +00:00 |
Walzer
|
fb477f47f5
|
cleanup the heap when CCXEGLView::create failed
|
2010-10-29 09:27:15 +00:00 |
Walzer
|
d2d9375376
|
add ccdirector::pause for helloworld
|
2010-10-29 06:48:00 +00:00 |
Ming
|
a2816a5cec
|
|
2010-10-29 03:15:55 +00:00 |
Ming
|
a5eaf867c0
|
|
2010-10-29 03:14:45 +00:00 |
Walzer
|
bfe06e2502
|
commit vcproj.user files
|
2010-10-18 08:03:16 +00:00 |
Walzer
|
4ec20bb873
|
make HelloWorld easier
|
2010-10-13 09:37:55 +00:00 |
Walzer
|
01daec4d39
|
make HelloWorld easier
|
2010-10-13 04:07:47 +00:00 |
yangws
|
069d3507e8
|
unified CCXEGL code base on uPhoneEmuGlesPatch.zip
|
2010-09-17 04:02:23 +00:00 |
Walzer
|
314c42be89
|
skip warning in HelloWorld prj
|
2010-09-11 08:46:30 +00:00 |
natural-law
|
fd965f88d0
|
add code to exit the app
|
2010-09-11 04:02:43 +00:00 |
Walzer
|
8a2aabdb96
|
use the SDK gles header
|
2010-09-11 03:43:37 +00:00 |
Ming
|
ce0d6f33ce
|
issue #131
|
2010-09-07 08:30:18 +00:00 |
yangws
|
4a52e5aaf9
|
impliment CCXEGLView for uPhone device.
|
2010-09-06 10:35:24 +00:00 |
yangws
|
22b4f3206d
|
fixed bug : one click two pen down message on uphone platform.
|
2010-08-06 02:15:54 +00:00 |
yangws
|
f3af0c1c42
|
|
2010-08-06 01:55:37 +00:00 |
yangws
|
7598752a02
|
|
2010-08-06 01:48:18 +00:00 |
yangws
|
d6597735fc
|
write "helloworld" code in one file
|
2010-08-05 10:58:38 +00:00 |
yangws
|
833397163e
|
remove helloworld main form class code. create main window in application's EventHandler.
|
2010-08-05 09:20:24 +00:00 |
yangws
|
cde36d0de9
|
fixed #34 impliment setDeviceOrientation function.
|
2010-08-05 03:02:30 +00:00 |
natural-law
|
1534c5716a
|
issue #29
add virtual for the HelloWorld destruct function
|
2010-08-04 09:00:10 +00:00 |
natural-law
|
c22ddae5ce
|
issue #29
add namespace
|
2010-08-04 08:12:09 +00:00 |
natural-law
|
75cfd65f0b
|
fixed #29
submit the HelloWorld project of cocos2d-uPhone
|
2010-08-04 06:47:17 +00:00 |