minggo
|
9a67fa6df1
|
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
|
2011-03-10 17:16:15 +08:00 |
yangws
|
3fc701f1d2
|
fixed #300 Cocos2d-win32 application wizard for vs ok.
|
2011-03-10 12:00:29 +08:00 |
minggo
|
06f014604a
|
[iOS] fixed #388
|
2011-03-10 11:59:17 +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 |
yangws
|
fa7f15982f
|
issue 300 Modify CCAppWiz to adapt 0.8. Add Install wizard scripts for VS2010 VC2010Express VC2008Express.
|
2011-03-09 15:35:06 +08:00 |
yangws
|
b54de8a3ef
|
fixed #360 Modify CCXAppWiz for win32, add initInstance function in class AppDelegate
|
2011-03-01 14:28:39 +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 |
natural-law
|
e73e291a71
|
[uphone & win32]Fix the bug of new project wizard.
|
2011-01-27 15:01:38 +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 |
walzer
|
d97c40875e
|
[win32 & uphone] add COCOS2D_DEBUG=1 into PreprocessorDefinitions of templates in MSVC. ref to this post http://www.cocos2d-x.org/boards/12/topics/392
|
2011-01-22 15:26:10 +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
|
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 |
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 |
yangws
|
2e8f3a26f5
|
Modify template for uphone.
make it's helloworldscene code safely.
|
2011-01-18 15:32:29 +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
|
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 |
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 |
yangws
|
aa521489a0
|
template for vs2008 add CocosDenshion namespace.
|
2010-12-25 15:44:26 +08:00 |
natural-law
|
4a64f899fe
|
update label_nodes to 0.99.5.
|
2010-12-24 17:07:31 +08:00 |
yangws
|
c4d0a45f3d
|
add feature header file in CCXAppWiz HelloWorldScene.h
|
2010-12-11 09:50:46 +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 |
yangws
|
462a8baf33
|
fixed #225 Create new project from main menu ok.
Signed-off-by: yangws <yangws@cocos2d-x.org>
|
2010-11-26 17:30:34 +08:00 |
yangws
|
1eb86dc0b9
|
Wizard Work OK On VS2008 CHS
Signed-off-by: yangws <yangws@cocos2d-x.org>
|
2010-11-26 15:36:44 +08:00 |
yangws
|
852c57d2c6
|
add CCLOG support on win32 and uphone
|
2010-11-23 18:20:46 +08:00 |
yangws
|
3d4793b090
|
issue #186 uphone vs wizard add to Setup script.
|
2010-11-19 07:56:32 +00:00 |
yangws
|
011203e4eb
|
issue #186 uphone vs wizard add to Setup script.
|
2010-11-19 07:56:15 +00:00 |
yangws
|
384970d4b4
|
issue #186 uphone vs wizard add TCOM Register files Template.
|
2010-11-19 06:56:57 +00:00 |
yangws
|
b09c43eb56
|
issue #186 uphone vs wizard add Uphone Resource files Templates.
|
2010-11-19 06:43:13 +00:00 |
yangws
|
af3bbcbc7c
|
issue #186 uphone vs wizard add sample image.
|
2010-11-18 09:47:28 +00:00 |
yangws
|
bba9049130
|
issue #186 uphone vs wizard build OK.
|
2010-11-18 07:46:59 +00:00 |
yangws
|
7cadac921c
|
issue #186 add vs wizard project for uphone.
|
2010-11-18 02:39:59 +00:00 |
yangws
|
4a432f3125
|
change win32 porject name after test ok.
|
2010-11-17 03:13:37 +00:00 |
yangws
|
c74e987af1
|
|
2010-11-16 08:36:52 +00:00 |
yangws
|
e0f8553551
|
|
2010-11-16 08:36:23 +00:00 |
yangws
|
7a698c1945
|
issue #186 add new wizard icon
|
2010-11-16 08:15:21 +00:00 |
Walzer
|
fb25984f12
|
rename getShared methods to shared
|
2010-11-16 07:12:09 +00:00 |
yangws
|
2587114512
|
issue #186 add template/CCXAppWiz.vs to cocos2dx.
|
2010-11-16 03:25:33 +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 |
natural-law
|
c774653018
|
change the comment from Chinese to English.
|
2010-10-29 03:49:54 +00:00 |
natural-law
|
2d650eeb73
|
Pause the game when the application is unactived,and resume when the game is active again.
|
2010-10-27 08:25:02 +00:00 |