Carlos Sessa
|
9d08f9582c
|
Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method
|
2011-05-04 11:18:26 -03:00 |
minggo
|
bb4fc1c446
|
[android] fixed #477: set default ndk version to ndk-r5
|
2011-04-29 09:59:05 +08:00 |
yangws
|
a5be05e50c
|
sync test and helloworld android java code.
|
2011-04-27 17:03:43 +08:00 |
yangws
|
e895d9d073
|
TextInputTest compile ok on android and merge last master code.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
Conflicts:
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/platform/android/Cocos2dJni.cpp
tests/test.android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
tests/test.android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
tests/test.ios/test.xcodeproj/project.pbxproj
tests/test.win32/test.win32.vcproj
|
2011-04-26 18:04:07 +08:00 |
yangws
|
a73ccaf0e3
|
Cocos2dxGLSurfaceView little modify.
|
2011-04-26 16:40:49 +08:00 |
minggo
|
99733c602d
|
[android] fixed #462: call applicationDidEnterBackground and applicationWillEnterBackground on android
|
2011-04-25 15:13:24 +08:00 |
moadib
|
85afa22195
|
[android] fixed typo in CCEGLView method name
|
2011-04-24 18:52:21 +04:00 |
yangws
|
252f3efe1a
|
CCIMEDispatcher works on android.
|
2011-04-22 16:33:41 +08:00 |
Walzer
|
3e643d73a3
|
Merge branch 'master' of https://github.com/flyingpacer/cocos2d-x into flyingpacer-master
|
2011-04-22 16:02:15 +08:00 |
RongHong
|
22316eeb11
|
Update the iOS template version and add cocosdension include directory to helloworld make file
|
2011-04-22 15:49:05 +08:00 |
natural-law
|
e2ce006db2
|
fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.
|
2011-04-22 10:57:46 +08:00 |
natural-law
|
acb4bb5a16
|
Merge branch 'master' into iss428
Conflicts:
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
|
2011-04-21 14:58:58 +08:00 |
natural-law
|
5d2ac1fc0c
|
fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
|
2011-04-21 14:46:15 +08:00 |
yangws
|
85027c40ca
|
CCIMEDispatcher works on ios.
|
2011-04-19 18:11:57 +08:00 |
minggo
|
4ffe24fc8e
|
Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374
|
2011-04-19 13:45:56 +08:00 |
minggo
|
37e7fad0d3
|
issue #456: add curl test & libcurl.so works ok on android
|
2011-04-15 17:15:05 +08:00 |
minggo
|
a165663b4c
|
[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld
|
2011-04-12 15:37:44 +08:00 |
minggo
|
d8115cacea
|
[android] fixed #453: cocosdenshion can replace the background music
|
2011-04-12 14:43:21 +08:00 |
minggo
|
0b7ca9c865
|
fixed #449: remove the code that suppots mac platform
|
2011-04-11 17:04:45 +08:00 |
minggo
|
e28d226f3a
|
synchronize Cocos2dxMusic.java from tests to HelloWorld
|
2011-04-07 16:16:48 +08:00 |
natural-law
|
1af4aa1138
|
[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.
|
2011-04-06 16:29:58 +08:00 |
Max Aksenov
|
804e264a66
|
[airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed.
|
2011-04-04 02:05:37 -07:00 |
walzer
|
cb65469103
|
[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk
|
2011-04-04 00:40:39 +08:00 |
minggo
|
9c768060b6
|
[android] implement keyPadDelegegate in HellloWorld
|
2011-04-01 17:26:12 +08:00 |
minggo
|
2c539a1df5
|
[android] fixed #440: CCMessage works ok on android
|
2011-04-01 11:35:26 +08:00 |
yangws
|
16254a2de1
|
fixed #440 CCMessageBox works on ios.
|
2011-03-31 11:08:46 +08:00 |
walzer
|
6d30c123d7
|
Merge branch 'issue_367' of https://github.com/minggo/cocos2d-x into minggo-issue_367
|
2011-03-29 15:53:11 +08:00 |
walzer
|
5811fb7c76
|
Merge branch 'issue_422' of https://github.com/minggo/cocos2d-x into minggo-issue_422
|
2011-03-29 15:50:28 +08:00 |
minggo
|
27d5a670b5
|
[android] fixed #367: make the compiling sequece of HelloWorld and tests don't depend on alphabet order
|
2011-03-29 15:26:50 +08:00 |
minggo
|
c686047f83
|
[android] fixed #422: multitouch for android
|
2011-03-29 14:20:05 +08:00 |
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
walzer
|
6cc09aa4dc
|
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
|
2011-03-28 21:08:56 +08:00 |
yangws
|
a5040e0ccb
|
issue 396 ios modified.
|
2011-03-28 13:41:14 +08:00 |
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
walzer
|
ef7fe5afd1
|
[airplay] issue #379, fix search header paths with cause compilation error on release build
|
2011-03-24 10:19:52 +08:00 |
walzer
|
ed492bbd1e
|
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
|
2011-03-23 22:16:20 +08:00 |
natural-law
|
09be3e8fe5
|
[ios]fix #419,Enable the depth test when EAGLView is created.
|
2011-03-21 17:15:20 +08:00 |
walzer
|
ffeb116542
|
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
|
2011-03-18 16:32:20 +08:00 |
minggo
|
7b71a565ed
|
fixed #400: change project.pbxproj of HelloWorld and test to include CCCamera.cpp
|
2011-03-18 16:09:21 +08:00 |
walzer
|
e62ff6c815
|
Merge branch 'issue_405' of https://github.com/minggo/cocos2d-x into minggo-issue_405
|
2011-03-18 14:08:52 +08:00 |
walzer
|
c15c1719ba
|
fixed #410, recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates
|
2011-03-18 14:06:04 +08:00 |
minggo
|
4893de18f3
|
[android] HelloWorld supports cocosdenshion
|
2011-03-18 11:01:27 +08:00 |
walzer
|
55987c9118
|
Merge branch 'issue_399' of https://github.com/minggo/cocos2d-x into minggo-issue_399
|
2011-03-17 12:01:49 +08:00 |
yangws
|
12254f95f0
|
fixed #395 Add initInstance code for all platform in msvc templates.
|
2011-03-17 11:27:51 +08:00 |
minggo
|
91094e7e28
|
[android] fixed #399: fix the bug that HelloWorld crashed when touching the screen.
|
2011-03-17 09:49:31 +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 |
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
|
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 |
minggo
|
4379a1c96f
|
Move ccxApplication to cocos2dx/platform on ios.
|
2011-03-02 17:05:22 +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
|
498e0072e1
|
[android] fixed #358: autoscale HVGA resource to WVGA
|
2011-02-26 15:52:57 +08:00 |
yangws
|
d78897da5e
|
CCImage initWithString support line breaks and wrapping.
CCLabelTTF support multi-text on win32 now.
|
2011-02-26 11:09:49 +08:00 |
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 |