minggo
4f7e349c0a
set HelloWorld dependence and make it run ok on android emulator
2011-09-26 22:38:59 -07:00
dumganhar
5b28b0ac83
modify helloworld project setting for bada
2011-09-26 17:52:09 +08:00
dumganhar
5cd671651a
add helloworld lib folder for bada
2011-09-26 17:48:36 +08:00
laschweinski
0f7a15b1b3
recommit
...
modify eclipse project config
delete libs and use the folder eclipse generated instead.
2011-09-23 09:56:30 +08:00
zhangxiaoming
1cac9520cc
make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion
2011-09-21 02:27:42 -07:00
dumganhar
eb9b3e3787
modify makefile
2011-09-20 18:13:24 +08:00
dumganhar
eeb0956fb8
add linux makefiles
2011-09-20 14:38:12 +08:00
dumganhar
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
dumganhar
eb32cf9fe2
modify some files of bada project
2011-09-20 02:19:26 +08:00
dumganhar
ca2027fbad
modify bada project
2011-09-19 23:35:46 +08:00
dumganhar
edb2cbbad6
modify bada project files
2011-09-19 18:17:19 +08:00
minggo
5ff9bd0c9e
remame BitMapTotalHeight to bitmapTotalHeight
2011-09-19 18:15:47 +08:00
dumganhar
0e7fc78e4e
commit some files of bada project
2011-09-19 18:05:40 +08:00
dumganhar
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
seanlin
6d8225b7bd
fixed #724 , different results of CCLabelTTF on android & win32
2011-09-19 16:47:39 +08:00
dumganhar
3c795073e0
Merge branch 'master' into bada
...
Conflicts:
HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/CCamera.cpp
cocos2dx/cocoa/NSData.cpp
cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
cocos2dx/platform/CCFileUtils_platform.h
cocos2dx/platform/CCXApplication_platform.h
cocos2dx/platform/CCXCocos2dDefine_platform.h
cocos2dx/platform/CCXEGLView_platform.h
cocos2dx/platform/CCXMath.h
cocos2dx/platform/CCXUIAccelerometer_platform.h
cocos2dx/platform/CCXUIImage_platform.h
cocos2dx/platform/ccxCommon_platform.h
cocos2dx/platform/config_platform.h
cocos2dx/platform/platform.h
cocos2dx/support/base64.cpp
cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
tests/AppDelegate.cpp
tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
2011-09-19 13:42:08 +08:00
dumganhar
eadaba8930
modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp
...
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
2011-09-19 10:51:05 +08:00
minggo
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
minggo
194f47bc54
fixed #718 : get button value from string.xml & add copyright for java codes
2011-09-15 14:17:07 +08:00
Macarse
208bce312e
Replaced LinearLayout with FrameLayout
2011-09-13 20:25:07 -03:00
Macarse
afd1a7a6d9
External storage
2011-09-13 05:42:34 -03:00
laschweinski
8f5c327937
add all eclipse project files to the corresponding directory
2011-09-07 12:44:03 +08:00
laschweinski
310e79a491
delete the project configurations in base folder
2011-09-07 12:41:39 +08:00
laschweinski
1fc09448a4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
...
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
Augusto Souza
28b1f317f4
Revert "First version of unloadBackgroundMusic for android - Feature #687 "
...
This reverts commit a157b775f8
.
2011-08-30 09:30:12 -03:00
laschweinski
ffcbf4772f
helloworld debug release makefiles
2011-08-28 17:06:05 +08:00
laschweinski
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
laschweinski
1ac3fdebca
deleted: Box2D/Box2DConfig.cmake
...
deleted: Box2D/CMakeLists.txt
new file: CocosDenshion/.cproject
new file: CocosDenshion/.project
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidDebug/makefile
deleted: HelloCocos2dx/AndroidDebug/objects.mk
deleted: HelloCocos2dx/AndroidDebug/sources.mk
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidRelease/makefile
deleted: HelloCocos2dx/AndroidRelease/objects.mk
deleted: HelloCocos2dx/AndroidRelease/sources.mk
deleted: HelloCocos2dx/Classes/AppDelegate.cpp
deleted: HelloCocos2dx/Classes/AppDelegate.h
deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp
deleted: HelloCocos2dx/Classes/HelloWorldScene.h
deleted: HelloCocos2dx/Linux/main.cpp
deleted: HelloCocos2dx/Linux/main.h
deleted: HelloCocos2dx/Resource/CloseNormal.png
deleted: HelloCocos2dx/Resource/CloseSelected.png
deleted: HelloCocos2dx/Resource/HelloWorld.png
deleted: HelloCocos2dx/Resource/Icon.png
deleted: HelloCocos2dx/Resource/app.config.txt
deleted: HelloCocos2dx/android/AndroidManifest.xml
deleted: HelloCocos2dx/android/build.properties
deleted: HelloCocos2dx/android/build.xml
deleted: HelloCocos2dx/android/build_native.sh
deleted: HelloCocos2dx/android/default.properties
deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java
deleted: HelloCocos2dx/android/jni/helloworld/main.cpp
deleted: HelloCocos2dx/android/local.properties
deleted: HelloCocos2dx/android/proguard.cfg
deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png
deleted: HelloCocos2dx/android/res/layout/game_demo.xml
deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml
deleted: HelloCocos2dx/android/res/values/strings.xml
deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java
modified: HelloWorld/Classes/AppDelegate.cpp
deleted: HelloWorld/Linux/CloseNormal.png
deleted: HelloWorld/Linux/CloseSelected.png
deleted: HelloWorld/Linux/HelloWorld.png
deleted: HelloWorld/Linux/Icon.png
deleted: HelloWorld/Linux/Materhorn.ttf
deleted: HelloWorld/Linux/app.config.txt
deleted: HelloWorld/Linux/cocos2dx-hello
deleted: HelloWorld/Linux/libcocos2dx.so
modified: cocos2dx/.cproject
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Release/libcocos2d.so
modified: template/android/mycopy_files.sh
new file: tests/test.linux/.cproject
new file: tests/test.linux/.project
modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
2011-08-28 14:33:04 +08:00
Augusto Souza
a157b775f8
First version of unloadBackgroundMusic for android - Feature #687
2011-08-28 01:02:12 -03:00
Augusto Souza
32f8060c49
Prevent null point exception in preloadBackgroundMusic
2011-08-28 00:59:51 -03:00
Augusto Souza
3a0c2cb4fb
First version of a preloadBackgroundMusic for Android - Feature #687
2011-08-27 23:24:52 -03:00
laschweinski
0958b2aaf6
new file: HelloWorld/Classes/AppDelegate.cpp
...
new file: HelloWorld/Classes/AppDelegate.h
new file: HelloWorld/Classes/HelloWorldScene.cpp
new file: HelloWorld/Classes/HelloWorldScene.h
new file: HelloWorld/postCompiled.sh
2011-08-25 19:11:06 +08:00
laschweinski
a8f6f18705
new file: HelloWorld/.cproject
...
new file: HelloWorld/.project
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
cocos2dx/platform/third_party/linux/
installLinuxLib.sh
2011-08-25 19:06:42 +08:00
laschweinski
606c8803bc
modified: CocosDenshion/Linux/FmodAudioPlayer.cpp
...
modified: CocosDenshion/Linux/FmodAudioPlayer.h
deleted: HelloWorld/AppDelegate.cpp
deleted: HelloWorld/AppDelegate.h
deleted: HelloWorld/HelloWorldScene.cpp
deleted: HelloWorld/HelloWorldScene.h
modified: cocos2dx/.cproject
modified: cocos2dx/actions/CCActionInstant.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: lib/android/Debug/libcocos2d.so
modified: lib/android/Release/libcocos2d.so
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Debug/libcocosdenshion.so
modified: lib/linux/Release/libcocos2d.so
modified: lib/linux/Release/libcocosdenshion.so
HelloWorld/AndroidDebug/
HelloWorld/AndroidRelease/
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
cocos2dx/platform/third_party/linux/
installLinuxLib.sh
tests/Res/gui_close.WAV
2011-08-25 19:04:29 +08:00
root
11679d9723
Merge branch 'master' into LinuxPort
2011-08-23 11:49:46 +08:00
minggo
ae21fcaf48
[android] fixed #670 : pause & resume effect when app enter background & foreground
2011-08-22 16:58:54 +08:00
laschweinski
ff5222fff8
some files missiong(eclipse with git is too hard to play)
2011-08-21 19:00:26 +08:00
laschweinski
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
laschweinski
dbf3a94200
modified: HelloWorld/HelloWorldScene.cpp
...
modified: tests/AppDelegate.cpp
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 18:09:51 +08:00
laschweinski
5d20ebe24b
modified: HelloWorld/AppDelegate.cpp
...
modified: HelloWorld/HelloWorldScene.cpp
modified: cocos2dx/cocoa/CCNS.cpp
modified: cocos2dx/include/CCActionInstant.h
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
modified: cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
modified: cocos2dx/platform/CCAccelerometer_platform.h
modified: cocos2dx/platform/CCApplication_platform.h
modified: cocos2dx/platform/CCArchOptimalParticleSystem.h
modified: cocos2dx/platform/CCCommon.cpp
modified: cocos2dx/platform/CCEGLView_platform.h
modified: cocos2dx/platform/CCGL.cpp
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
modified: cocos2dx/platform/CCPlatformConfig.h
modified: cocos2dx/platform/CCPlatformMacros.h
modified: cocos2dx/platform/CCSAXParser.h
modified: cocos2dx/platform/CCStdC.h
modified: cocos2dx/support/CCUserDefault.cpp
modified: cocos2dx/support/data_support/ccCArray.h
modified: tests/AppDelegate.cpp
deleted: tests/Res/music.mid
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-17 11:36:54 +08:00
Walzer
286f92fc43
fix at smoke test, add arch=i386 into HelloWorld.xcodeproj, otherwise the proj cannot run in xcode4 + simulator
2011-08-17 11:09:12 +08:00
minggo
d386116255
[iOS]fixed #667 : call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground
2011-08-10 10:24:06 +08:00
minggo
ada4c2af80
[android] fixed #643 : swap axes according to the orientation
2011-08-09 15:50:42 +08:00
minggo
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
minggo
7fc0dae3d9
[android] fixed #655 : fix a bug that CCLabelTTF lost the last characters
2011-08-04 12:08:12 +08:00
minggo
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
minggo
21737d2ce0
issue #347 : update xcode3 template for ttf support
2011-07-29 10:27:49 +08:00
minggo
cfb3765035
issue #347 : iOS support font defined by ttf file
2011-07-29 10:15:10 +08:00
minggo
50038b7cc2
Merge https://github.com/cocos2d/cocos2d-x into iss347
2011-07-28 18:06:20 +08:00
minggo
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
natural-law
a7404dc2bf
fixed #639 , Initialize the m_tPosition of CCParticleSystem with the setter.
2011-07-28 16:16:51 +08:00
minggo
1bb9e8139a
issue 33: iOS & Android support looping playing effect
2011-07-26 15:52:41 +08:00
minggo
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
minggo
13a1629299
fixed #624 : insert white space in front of \n
2011-07-22 12:10:41 +08:00
minggo
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
minggo
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
minggo
fb436a6339
[Android] break string & wrap word
2011-07-11 15:02:41 +08:00
Max Aksenov
fd04420c9b
[airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator....
2011-07-09 13:04:29 -07:00
Walzer
80c819d8b6
Merge remote branch 'origin/master'
2011-07-04 16:25:29 +08:00
Walzer
d325f1991e
[ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build
2011-07-04 16:25:11 +08:00
natural-law
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
minggo
25b3b15151
Merge pull request #339 from minggo/iss549
...
[Android] fixed #549 : Add comments for playEffect()
2011-06-30 18:28:08 -07:00
minggo
67b85322ed
[Android] fixed #549 : Add comments for playEffect()
2011-07-01 09:24:40 +08:00
minggo
12f816687d
Merge pull request #336 from liswei/master
...
update wophone setup project (such as helloworld,tests)
2011-06-29 20:08:01 -07:00
liswei
39fb944297
update wophone setup project (such as helloworld,tests)
2011-06-30 09:36:51 +08:00
minggo
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
minggo
e8853583df
Merge pull request #329 from minggo/master
...
Fix some bug
2011-06-27 18:23:26 -07:00
yangws
3b6265aa58
Compile ok on vs2010
2011-06-27 17:02:58 +08:00
minggo
5e15545dbd
[Android] fix an error when string is
2011-06-27 16:01:25 +08:00
natural-law
72f17ecbdf
fixed #542 , Record the volume user specified though the background music is not playing.
2011-06-27 11:43:27 +08:00
Walzer
688131c958
[android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests
2011-06-25 12:11:40 +08:00
Walzer
00568c229a
[android] back to shared library link
2011-06-25 11:21:16 +08:00
minggo
a02f7c75d9
[Android] modify android template to work on new codes
2011-06-24 17:24:01 +08:00
minggo
e8fda66ccc
Merge https://github.com/cocos2d/cocos2d-x
2011-06-24 13:55:52 +08:00
minggo
8440d6a267
[android] fixed #364 : show string correct & line break ok
2011-06-24 13:55:00 +08:00
Walzer
8f770ec929
issue #540 for HelloWorld/ios, split main.m, add pause/resume/startAnimation/stopAnimation controls
2011-06-24 11:22:11 +08:00
minggo
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
minggo
71c13b34bf
Merge https://github.com/cocos2d/cocos2d-x into iss535
2011-06-22 17:00:11 +08:00
minggo
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
yangws
01f277674e
Add icon for Helloworld and tests on Android.
2011-06-22 13:59:31 +08:00
yangws
4d8596169e
Sync java code in Helloworld and tests.
2011-06-22 11:37:42 +08:00
minggo
4f7db6b134
fixed #528 : modify HelloWorld to works ok
2011-06-22 10:18:51 +08:00
Walzer
175e9394bc
Merge https://github.com/minggo/cocos2d-x into lua
2011-06-21 15:22:00 +08:00
minggo
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
natural-law
cfee246959
fixed #323 , Add an interface to get the current language.
2011-06-17 10:49:02 +08:00
minggo
25de09e34b
lua support ok on win32
2011-06-15 15:50:16 +08:00
minggo
732f64901c
HelloWorld remove lua support on Android
2011-06-15 14:31:51 +08:00
minggo
f7f6371666
HelloWorld remove lua support on iOS
2011-06-15 14:28:57 +08:00
minggo
92b22c7ad0
HelloWorld remove support on win32
2011-06-15 14:04:26 +08:00
minggo
49f1518893
fix a bug when compile in android
2011-06-14 15:43:45 +08:00
minggo
a7a22e528b
remove the usage of NDController
2011-06-14 14:46:39 +08:00
minggo
83e1e0ebd1
tests run ok when it don't enable lua
2011-06-01 20:29:05 +08:00
minggo
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
minggo
dedbd638d3
lua runs ok on Android
2011-06-01 14:35:28 +08:00
minggo
5f5dc0a04b
HelloWorld with lua works ok on ios
2011-05-31 15:39:54 +08:00
minggo
0d27381cdd
format the file
2011-05-31 14:49:05 +08:00
minggo
697368cf20
support lua
2011-05-31 14:04:14 +08:00
yangws
7e2d1d5c48
fixed #490 Text input on android use a different way, TextInputTest OK now.
2011-05-30 16:36:12 +08:00
Walzer
58a63f7ec0
[airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration.
2011-05-30 14:14:19 +08:00
yangws
476d86283f
Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.
2011-05-26 14:35:44 +08:00
Walzer
78f87f1207
Merge remote branch 'origin/master'
2011-05-26 10:29:43 +08:00
Walzer
03b1bb6c52
fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp
2011-05-26 10:08:05 +08:00
minggo
8d76a4103b
fixed #509 : let UI rotate HelloWorld to landscape
2011-05-24 18:16:05 +08:00
minggo
a5c294ed69
fixed #501 : let UI rotate HelloWorld to landscape
2011-05-24 18:13:54 +08:00
yangws
d93a2f046e
android can input number form soft keyboard.
2011-05-23 16:30:45 +08:00
unknown
97142d4a59
Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010
2011-05-19 21:11:29 +08:00
unknown
b940676cab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-19 20:55:39 +08:00
minggo
ff1017d86f
Merge pull request #276 from minggo/iss496
...
[android] fixed #496 fixed #497
2011-05-18 23:18:37 -07:00
minggo
073260e0a9
[android] fixed #496 fixed #497 : tests and HelloWorld work ok on Android3.0
2011-05-19 11:26:57 +08:00
minggo
6cf0a9d4f4
[android] fixed #494 : fix a wrong function name
2011-05-18 10:54:52 +08:00
yangws
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
minggo
8e44d5bc40
[android] fixed #488 : synchrolize code to HelloWorld
2011-05-12 18:34:16 +08:00
yangws
21c8628e68
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2
...
Conflicts:
cocos2dx/platform/wophone/CCApplication_wophone.h
tests/tests/tests.h
2011-05-10 16:09:26 +08:00
minggo
da64909963
[iOS] fixed #477 : force exit HelloWorld when x button is clicked
2011-05-09 10:17:00 +08:00
yangws
3f8293dffb
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input
...
Conflicts:
HelloWorld/wophone/HelloWorld.wophone.vcproj
tests/test.wophone/copy_res.bat
2011-05-06 17:45:39 +08:00
minggo
bfcee3e2ae
fixed #455 : add CCUserDefault to HelloWorld
2011-05-06 17:09:35 +08:00
yangws
ced029257f
temp commit
2011-05-06 16:38:09 +08:00
natural-law
846b529e49
[wophone] fixed #482 , Modify the resource data path for the new WoPhone-SDK.
2011-05-06 10:13:12 +08:00
yangws
0fe61642f6
issue #478 text input ok.
2011-05-05 18:17:50 +08:00
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