3a287db954
issue #1056 : Update ActionsTest.
2012-03-22 10:27:28 +08:00
b1607b2106
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into test_sync
2012-03-22 09:41:03 +08:00
e8b7bc7c7e
issue #1056 : LabelTest
2012-03-22 09:40:32 +08:00
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +08:00
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
e75e35b23f
issue #1506 : add ShaderTest source code
2012-03-21 17:27:13 +08:00
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
159b677dc0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 16:09:26 +08:00
8ad598241f
issue #1056 : Update Tests project for ios platform.
2012-03-21 16:05:24 +08:00
9b4a42c494
issue #1056 : Update Box2dTest and ChipmunkAccelTouchTest.
2012-03-21 15:54:48 +08:00
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
bb908f5a5e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into ActionsEaseTest
2012-03-21 13:36:51 +08:00
f6c113993a
issue #1506 : rename CocosNodeTest to NodeTest and SC
2012-03-21 13:36:24 +08:00
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
a3441a39e7
issue #1056 : rename EaseTatinosTest to ActionsEaseTest and SC
2012-03-20 18:07:42 +08:00
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07:00
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
68809fd5ed
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-19 13:54:34 +08:00
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
41fad74017
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-15 10:05:42 +08:00
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
6336df4024
Fix test to match newer API
2012-03-13 23:07:42 -07:00
7321d33aaf
Added support files for Accelerometer Simulation for iPhone Simulator and
...
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
2012-03-08 11:23:47 +00:00
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
7890333505
fixed #721 : cocosdenshion can play local file on android
2012-03-06 16:56:30 +08:00
d3dedd19f2
fixed #995 : Modify project configure for marmalade port after adding extension support and refactor resource folder.
2012-03-01 17:38:31 +08:00
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
7daeb5cd86
fixed #984 : Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.
2012-02-28 14:59:46 +08:00
6d97e3e381
fixed #972 : update ios project configures.
2012-02-16 11:48:09 +08:00
2c599d31b5
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
2012-02-15 17:02:47 +08:00
ac98d22367
update ios project configures for ios, and modify xcode4's template
2012-02-15 16:59:47 +08:00
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
e75dbf2bd9
Merge pull request #724 from minggo/iss957_text_input
...
fixed #957 : avoid to go to background when inputting test
2012-02-14 00:07:51 -08:00
fd9f73f43e
fixed #957 : avoid to go to background when inputting test
2012-02-14 16:02:41 +08:00
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
65b1b20c8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
...
Conflicts:
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
tests/test.win32/test.win32.vcxproj.filters
2012-02-14 11:43:04 +08:00
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
3c41164b23
Merge pull request #716 from minggo/iss971_rtti
...
build cocos2dx as static lib and remove some unneeded codes
2012-02-09 18:35:28 -08:00
6ae40fc12f
fixed #971 : build cocos2dx as static lib
2012-02-10 10:31:56 +08:00
481f1c2532
fix a typo error
2012-02-09 18:17:25 +08:00
357c825fa5
issue #971 : set JavaVM at JNI_Onload()
2012-02-09 16:27:15 +08:00
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
ee08c4629e
Merge pull request #714 from minggo/ndk_module
...
fixed #970 : use modules in the android ndk build
2012-02-07 19:16:01 -08:00
52de292e20
fixed #970 : use modules in the android ndk build
2012-02-08 11:14:47 +08:00
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
ee2139023a
Merge pull request #708 from Wartortle/master
...
fixed #969 : Addition of Accelerometer Simulation for Win32.
2012-02-06 18:57:41 -08:00
a7c96b5371
fixed #954 : correct accelerometer data when set orientation to portrait in tablet
2012-02-07 10:19:40 +08:00
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
1ae8f001b8
Merge pull request #702 from minggo/iss947_closed_loop
...
fixed #947 : fixed a closed loop
2012-02-01 02:22:02 -08:00
5e39489c71
fixed #947 : fixed a closed loop
2012-02-01 18:18:31 +08:00
56677be235
Merge pull request #701 from minggo/iss964_label
...
fixed #964 : compute correct height of a charactor
2012-02-01 02:05:50 -08:00
7b67c04f2f
fixed #964 : compute correct height of a charactor
2012-02-01 18:04:12 +08:00
64c892de79
Merge pull request #697 from dducharme/dalebranch
...
fixed #962 : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
6c2277757a
fixed #958 : delete SelectorProtocol and implement it in CCObject
2012-01-30 17:47:47 +08:00
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
9e180e9c01
Added true type fonts file for Marmalade version
2012-01-17 10:53:47 +01:00
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
df668c9785
Merge pull request #675 from minggo/test
...
fixed #930 : linux supports jpg format file
2012-01-12 01:51:16 -08:00
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
3905e5a47b
Merge pull request #670 from minggo/test
...
fixed #941 : limit background music volume in [0, 1.0]
2012-01-11 01:57:27 -08:00
40b1798f41
fixed #941 : limit background music volume in [0, 1.0]
2012-01-11 17:56:11 +08:00
4848dc9c46
fix a bug in SimpleAudioEngine.cpp on bada platform
...
use float value to change volume
2012-01-11 17:24:46 +08:00
86997d6709
fixed #940 : replace icons and background pictures
2012-01-10 16:45:49 +08:00
317f23f498
fixed #939 : Add create_qnx_project.vbs and add project references
2012-01-09 19:06:49 +08:00
1bd3601b11
fixed #937 : use gnustl_static instead of stlport_static to resolve compiling error on android x86 platform
2012-01-04 18:02:32 +08:00
08e0be754b
fixed #926 : retain/release in Paddle
2011-12-28 15:13:02 +08:00
d82471478d
add run permition
2011-12-23 11:17:20 +08:00
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
b7fbd4fc13
issue #919 : supporting global variable
2011-12-20 16:50:39 +08:00
857ce1d505
fixed #921 : fix a bug that accelerometer axes inverted in android tablet
2011-12-19 16:29:26 +08:00
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
8298e0b6ff
Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
...
Conflicts:
tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
0f8da500c2
Restored Accidentally removed marmalade line from CocosDenshion Test
2011-12-15 02:05:25 +08:00
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
f5d41d21b2
Added CDT Project and Modifying CocosDenshion for QNX
2011-12-14 21:26:47 +08:00
7d01aa0c74
HelloWorld, Test and HelloLua can succefully compiled by xcodebuild commenline with -sdk iphonesimulator4.3 now. The key is GCC_VERSION="", you can not skip this null value, otherwise the commendline will use GCC4.2 as default, can generate tons of errors.
2011-12-13 22:25:51 +08:00
4b9cbb85ff
#issue 908: Merge marmalade to latest cocos2d-x source
...
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
2011-12-12 17:46:21 +08:00
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dea2713f51
fixed #907 : add blackberry port
...
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-12 11:49:49 +08:00
95b43ac563
Merge pull request #614 from minggo/issue892_RTTI
...
Use RTTI to simplify codes
2011-12-11 19:40:34 -08:00
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
b1cdb6543d
Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language
...
Added tests for Marmalade and enabled language and font testing
2011-12-11 17:18:01 -08:00
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
1c9ecabd89
modify all projects config
2011-12-09 17:03:11 +08:00
5dea9b8205
fix a crash bug in SimpleAudioEngine.cpp
...
update helloworld and tests main.cpp and AppDelegate.cpp files
2011-12-09 15:54:35 +08:00
34759f4411
Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used.
2011-12-08 20:47:42 -08:00
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
c5b0a76742
Added support to play more than one sound fx at once
2011-12-08 19:27:20 +01:00
0a7a000c2d
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:21:48 +01:00
b11bcacea8
modify Device-Debug project setting, finished running on device!
2011-12-08 18:22:06 +08:00
1eb8ba656e
Added marmalade folder
2011-12-08 11:15:20 +01:00
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
a3986a9e21
issue 892: add cpp flag to support rtti on android
2011-12-07 16:51:54 +08:00
96d400d918
Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2
...
Refactored Accelerometer to match other platforms
Updated SimpleAudioEngine.cpp with new functions. (NOT tested).
Updated app.icf for latest Marmalade
Update deprecated function calls.
Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
2011-12-06 18:32:36 -08:00
520e3365c1
modify some project settings
2011-12-06 16:17:49 +08:00
dfbf2c0cdb
add tests project for blackberry
2011-12-06 15:03:14 +08:00
2f6fb5b189
Merge pull request #602 from minggo/master
...
change file structure in xcode view
2011-12-01 00:28:17 -08:00
d92bdcc40d
change file structure in xcode view
2011-12-01 16:27:11 +08:00
6973525319
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-12-01 14:19:07 +08:00
ef8e34f9a1
fix a bug in ZwoptexTest.
...
step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.
2011-12-01 14:15:10 +08:00
ec70d1d240
Merge pull request #600 from dumganhar/master_base
...
fix a bug in IntervalTest
2011-11-30 22:05:07 -08:00
f02ce4b15a
fix a bug in IntervalTest
2011-12-01 13:56:20 +08:00
34d10fb3db
Merge pull request #598 from dumganhar/master_base
...
DemoModernArt test crash on bada
2011-11-30 20:45:36 -08:00
cddaa3fea2
fixed #885 : make SimpleAudioEngine::setEffectVolume() take effect immediately on android
2011-12-01 12:12:14 +08:00
bdddc188aa
fix a bug that DemoModernArt crash on bada
2011-12-01 12:04:43 +08:00
0ae54cc0fd
comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer.
2011-11-30 17:37:09 +08:00
262d5969c3
fixed #883 : fix a bug in SpriteTest.
2011-11-30 17:29:16 +08:00
adfec68577
fixed #850 : update Box2d for linux
2011-11-29 17:12:21 +08:00
c99d254c01
issue #850 : update box2d for iOS and android
2011-11-29 15:16:16 +08:00
5a984bcc29
Merge branch 'master_base' into box2d2.2.1
2011-11-28 18:32:38 +08:00
3442d17dbe
fixed #880 : implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define.
2011-11-28 18:05:38 +08:00
cad4ff05f3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2011-11-28 15:43:13 +08:00
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
10f5082a83
update box2d to version2.2.1
2011-11-25 18:30:27 +08:00
bd595516b8
issue #781 : add new functions for sound
2011-11-25 09:56:06 +08:00
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
07da67f253
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
bc60ed7856
issue #854 : optimize CCTextureCache::addImageAsync()
2011-11-22 16:47:24 +08:00
efa9275d7f
save the codes for testing
2011-11-21 12:04:21 +08:00
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
775c7ff847
Merge pull request #573 from minggo/iss854_pthread
...
support pthread
2011-11-17 18:40:30 -08:00
0676714436
issue #854 : add TextureCacheTest into makefile
2011-11-17 18:32:52 -08:00
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
81b8fc0ce8
fixed #854 : fix a bug of CCTextureCache
2011-11-17 14:34:41 +08:00
cb75465913
issue #854 : add test case for CCTextureCache
2011-11-17 10:10:13 +08:00
dd8a2deeaf
fixed #758 : fix the bug that TTF fonts cause low memory on android
2011-11-16 11:40:24 +08:00
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
e9a2818d0d
use wvga setting, add SYSTEM_SERVICE
2011-11-02 01:11:06 +08:00
012052b089
modify project configure
2011-10-25 14:32:26 +08:00
4b653c89d1
modify project configure
2011-10-25 14:12:42 +08:00
146d3e1536
modify project config
2011-10-24 14:22:09 +08:00
2c87e5e17e
use default manifest.xml
2011-10-24 11:01:39 +08:00
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
59a14973ef
change splash and icon to cocos2d
2011-10-24 10:54:08 +08:00
eb901be664
project config change
2011-10-21 09:49:57 +08:00
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
67bbbb2800
1. relative to bug #754 , FontTest should use "fonts/abc.ttf" as external ttf name
...
2. fixed a tiny bug, FontTest can show font name on the top correctly
2011-10-20 14:56:39 +08:00
707e22a2c8
fixed bug #754 , particle test crashes on ios 4.3.3 & 5.0. Adding "fonts' into Resoures as "group" instead of "folder" cause this bug, but it can work on 4.3 and lower version.
2011-10-19 22:20:13 +08:00
e3c39fe835
fixed #753 , visual orientation is wrong on ios5 simulator
2011-10-19 21:43:25 +08:00
8aa014d3cd
Merge pull request #558 from minggo/iss755
...
fixed #743
2011-10-19 05:05:23 -07:00
2490388f28
remove unneeded packages
2011-10-19 20:03:18 +08:00
68d03de677
fixed #743 : let nativeInit() get correct screensize when running on device with software android buttons
2011-10-19 19:55:23 +08:00
7e8e7c7e87
Merge pull request #557 from minggo/iss755
...
fixed #755
2011-10-19 02:03:19 -07:00
2d3bfd4a1a
fixed #755 : get x y coordinate from existing array to avoid crashing on sunsumg devices
2011-10-19 17:01:35 +08:00
e9c133351d
Merge pull request #554 from minggo/master
...
make script more strongable
2011-10-18 23:27:56 -07:00
cc1c29c0ca
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2011-10-18 23:21:53 -07:00
3a17163897
make script more strongable
2011-10-18 23:21:39 -07:00
ae411f9503
fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h
2011-10-18 17:41:19 +08:00
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
43d64360cf
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2011-10-17 14:22:53 +08:00
1ccfcc1e94
change effect file
2011-10-17 14:22:10 +08:00
9a834585bb
modify the path to relative path in project setting
2011-10-16 20:53:48 -07:00
80cd3266df
make HelloWorld and tests work ok on linux with eclipse
2011-10-16 02:21:17 -07:00
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
a56145d613
change include path of HelloWorld vs2010 configuration, add CurrentLanguageTest into tests of vs2010 configuration
2011-10-16 12:00:44 +08:00
be1f4e3042
fixed #749 : fix the crash of SpriteNilTexture, a test case of SpriteTest.
2011-10-11 15:36:18 +08:00
f8617bc372
update project
2011-10-10 14:33:29 +08:00
6a878daa89
change params of glOrthof
2011-10-10 14:33:18 +08:00
eb9cb31ca4
use shared lib for cocos2dx project
2011-10-09 18:15:31 +08:00
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
fdea17b4f9
don't use DeviceOrientation, save orientation before running DirectorTest
2011-10-08 18:17:01 +08:00
f97de356e7
add release version
2011-10-08 11:47:32 +08:00
beaa489406
add scale support
2011-09-30 17:19:16 +08:00
78a06652e3
modify cocosDenshionTest resouce path
2011-09-30 09:43:23 +08:00
a7b8610c62
delete gbk_uni_tb.dat
2011-09-30 09:39:45 +08:00
9ff00c7c83
use utf-8 for displaying chinese
...
remove Gbk_Unicode.c Gbk_Unicode.h
2011-09-29 17:29:38 +08:00
db4d51496e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada
...
Conflicts:
cocos2dx/platform/CCAccelerometer_platform.h
cocos2dx/platform/CCApplication_platform.h
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/CCEGLView_platform.h
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/platform/CCSAXParser.h
cocos2dx/platform/CCStdC.h
tests/AppDelegate.cpp
tests/tests/Box2DTestBed/Tests/EdgeShapes.h
2011-09-29 16:03:37 +08:00
bd2266fe4c
use timer as gameloop, can change FPS by using setAnimationInterval
...
modify some project setting
2011-09-29 15:52:16 +08:00
c681889e05
add test.bada 1.2 project
2011-09-29 10:25:24 +08:00
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
8c63344c16
merge cocos2d-x master
2011-09-28 15:32:30 +08:00
3912be7f9d
not get value of ok button from xml file
2011-09-28 15:27:31 +08:00
446bd86fce
make HelloWorld and tests runs ok on linux
2011-09-27 22:56:06 -07:00
4b02dc3e45
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-09-27 20:37:58 -07:00
4ad422defd
make tests run ok on linux android
2011-09-27 20:36:21 -07:00
7cc86e741d
delete old cocosDenshion and tests project
2011-09-28 09:47:58 +08:00
d31859d8d3
add test.bada/sdk2.0
2011-09-28 09:41:58 +08:00
9f97e9473d
add lib folder for Target-Release
2011-09-28 09:40:16 +08:00
223e32f17c
add lib folder for Target-Debug and Target-Release
2011-09-28 09:39:46 +08:00
260c2fc920
move old 1.2 project to sdk1.2 folder
...
add sdk2.0 project
2011-09-28 09:36:18 +08:00
7b423eb708
remove unneened link
2011-09-27 17:51:13 +08:00
f0f780a84f
add empty lib folder for test project
2011-09-27 17:32:51 +08:00
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
6e08502e9d
fixed #736 : remove android:installLocation in AndroidManifest.xml
2011-09-27 16:56:45 +08:00
13e17ab80e
make tests build ok on linux android
2011-09-27 01:51:29 -07:00
c7f75fc570
make box2d build ok on linux
2011-09-26 23:30:40 -07:00
5a4ad2f11e
modify test project setting for bada
2011-09-26 17:52:32 +08:00
88905c4a16
add box2d and chipmunk eclipse project
...
do the similar modification in project configuration in test.
2011-09-23 12:07:09 +08:00
eeb0956fb8
add linux makefiles
2011-09-20 14:38:12 +08:00
c93be8b828
modify <cstdio> to <stdio.h>
...
delete old project files
2011-09-20 12:39:44 +08:00
8cb568f7fa
add some files for bada test project
2011-09-20 12:38:05 +08:00
cac08c8f1e
add tests project for bada
2011-09-20 10:29:07 +08:00
5ff9bd0c9e
remame BitMapTotalHeight to bitmapTotalHeight
2011-09-19 18:15:47 +08:00
c94adc58b9
changed bada projects directory, add bada macro
2011-09-19 17:53:45 +08:00
6d8225b7bd
fixed #724 , different results of CCLabelTTF on android & win32
2011-09-19 16:47:39 +08:00
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
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
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
a4bfa976b3
change the base resource path
2011-09-16 10:23:57 +08:00
b9ce266ee3
the same as the last one
2011-09-15 18:25:06 +08:00
ae403153c7
fixed #719 : update java code to HelloLua & tests
2011-09-15 16:18:50 +08:00
194f47bc54
fixed #718 : get button value from string.xml & add copyright for java codes
2011-09-15 14:17:07 +08:00
208bce312e
Replaced LinearLayout with FrameLayout
2011-09-13 20:25:07 -03:00
afd1a7a6d9
External storage
2011-09-13 05:42:34 -03:00
53227073a7
fixed #696 to modify some end() usilization
2011-09-06 11:43:09 +08:00
91f8ed7eb4
CCParticleSystemPoint now derive from CCParticleSystemQuade in linux
2011-09-05 11:57:10 +08:00
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
ab2a6cb2bb
fixed #702 tests crashs at the start on wophone device
2011-08-30 15:59:06 +08:00
b0660dd578
update eclipse project file
2011-08-29 10:28:00 +08:00
f86cba983f
test debug and release
2011-08-28 17:09:40 +08:00
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
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
11679d9723
Merge branch 'master' into LinuxPort
2011-08-23 11:49:46 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
ae21fcaf48
[android] fixed #670 : pause & resume effect when app enter background & foreground
2011-08-22 16:58:54 +08:00
ff5222fff8
some files missiong(eclipse with git is too hard to play)
2011-08-21 19:00:26 +08:00
abc856ac6d
add box2d test
2011-08-19 15:37:57 +08:00
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
0a9f6c1f09
Merge pull request #478 from minggo/iss684
...
add test for displaying current language
2011-08-18 23:19:00 -07:00
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
ad305648c0
modified: cocos2dx/misc_nodes/CCRenderTexture.cpp
...
modified: cocos2dx/platform/CCGL.h
modified: cocos2dx/platform/CCImage.cpp
CocosDenshion/Linux/
CocosDenshion/third_party/
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-19 13:07:50 +08:00
11e9acb7c8
fixed #684 : add test for displaying current language
2011-08-19 11:32:30 +08:00
733e582d12
fixed #684 : add test for displaying current language
2011-08-19 11:26:14 +08:00
e3ea2bd136
modified: tests/tests/CocosDenshionTest/CocosDenshionTest.cpp
...
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
CocosDenshion/Linux/
CocosDenshion/third_party/
HelloWorld/Linux/
cocos2dx/.settings/
cocos2dx/platform/Linux/
tests/test.linux/
2011-08-18 22:11:19 +08:00
edb8b4639d
fixed #685 : add label test for displaying Chinese characters
2011-08-18 18:40:24 +08:00
ab781654d7
all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt
2011-08-17 18:24:36 +08:00
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
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
0881668cc2
fixed #661 . Thanks to GMTDev's previous resolvtion. And I fix the compilation error in the his patch: add float m_fContentScaleFactor declaration into CCTMXLayer.h, fix tile->setPositionIn to tile->setPosition. I just run TiledMapTest in retina mode, it works well
2011-08-15 12:10:11 +08:00
9a884ffda6
[iOS] fixed #668 : CCLabelBMFont looks ok in retina mode
2011-08-10 15:07:34 +08:00
d386116255
[iOS]fixed #667 : call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground
2011-08-10 10:24:06 +08:00
5e5151b41e
Merge pull request #459 from minggo/iss643
...
[android] swap axes according to the orientation
2011-08-09 00:55:34 -07:00
ada4c2af80
[android] fixed #643 : swap axes according to the orientation
2011-08-09 15:50:42 +08:00
08797014e9
fix a bug that cause error when loading libtest.so on android
2011-08-09 13:56:09 +08:00
945e5fde00
issue #633 , add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.
2011-08-08 21:40:33 +08:00
2b5635898a
fixed #665 : add test of RenderTextureSave
2011-08-08 14:06:03 +08:00
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
5f08bb24fe
Merge branch 'master' into 608
2011-08-05 10:59:40 +08:00
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
ee0c6e56d7
Merge pull request #447 from minggo/master
...
[android] fixed #655 : fix a bug that CCLabelTTF lost the last characters
2011-08-03 21:13:12 -07:00
7fc0dae3d9
[android] fixed #655 : fix a bug that CCLabelTTF lost the last characters
2011-08-04 12:08:12 +08:00
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
90f403d8a2
Merge pull request #441 from liswei/issue347
...
issue #347 add ttf support in wophone
2011-08-02 03:16:06 -07:00
79cf8167dc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue347
2011-08-02 18:04:23 +08:00
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
906e6ba519
issue #645 : fix a bug of animation test
2011-08-02 15:57:04 +08:00
09dc164fff
issue #645 : update to v1.0.1
2011-08-02 15:45:27 +08:00
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
c1fdf9afb5
issue #608 rendertexture disappears after going to background
2011-07-28 17:32:09 +08:00
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
8afa3a9be1
fixed #619 CCFadeTo may crashed on android
2011-07-27 16:21:00 +08:00
657fe9a17d
[android] fixed #625 : remove gz file in assets & use uncompressed pvr file instead
2011-07-27 11:51:19 +08:00
d446702f14
issue #633 : revert CocosDenshionTest
2011-07-26 16:16:34 +08:00
1bb9e8139a
issue 33: iOS & Android support looping playing effect
2011-07-26 15:52:41 +08:00
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
13a1629299
fixed #624 : insert white space in front of \n
2011-07-22 12:10:41 +08:00
eb2cf3afd0
[win32] add Texture2DTest to vs2010
2011-07-20 16:00:21 +08:00
32e7ee6e2f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-20 15:35:52 +08:00
6a8b563feb
fixed #621 , Add Texture2dTest in tests project.
2011-07-20 15:35:20 +08:00
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
bc44855091
issue #536 , integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
2011-07-19 15:14:59 +08:00
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
679f4afe06
fixed #604 . When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!!
2011-07-13 18:04:53 +08:00
1a25dd83a5
Merge pull request #398 from natural-law/master
...
fixed #599
2011-07-13 01:35:41 -07:00
8ad7236ca2
fixed #599 , Resolve the wrong orientation when exit the TouchesTest.
2011-07-13 16:17:50 +08:00
62b52b37be
Merge remote branch 'origin/master'
2011-07-13 16:13:20 +08:00
1b1fd7446c
[maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade
2011-07-13 16:00:22 +08:00
692d8450c2
Merge pull request #397 from minggo/master
...
fix a bug of orientation
2011-07-13 00:36:52 -07:00
a26fb13604
fix a bug of orientation
2011-07-13 15:32:03 +08:00
9755ff59aa
When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina.
2011-07-13 14:37:06 +08:00
d5850224e4
[win32] modify configuration of vs2101 release version
2011-07-13 12:05:02 +08:00
fcb2006fdc
Merge pull request #392 from natural-law/master
...
fixed #599
2011-07-12 03:10:27 -07:00
faa1c8ee16
Merge pull request #393 from minggo/master
...
[win32] modify for vs2010
2011-07-12 03:09:44 -07:00
760ec3201e
[win32] modify for vs2010
2011-07-12 18:05:44 +08:00
7b10874d5e
The menu of BugsTest position is wrong when exit one bug test.
2011-07-12 18:02:40 +08:00
d4e575c4b2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-12 17:47:24 +08:00
e6bc8d7c98
fixed #599 , Resolve the wrong orientation when exit the TouchesTest.
2011-07-12 17:46:57 +08:00
21ce679992
resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest.
2011-07-12 17:35:15 +08:00
e8ac968b3b
Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp.
2011-07-12 15:56:42 +08:00
8b5282a0cf
fixed #603 , The test case TMXGIDObjectsTest in TileMapTest not crash any more.
2011-07-12 14:21:29 +08:00
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
58733417e0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-11 15:17:24 +08:00
fcbe0443be
Resolve a bug in ZipUtils.cpp. And modify the Makefile of tests on wophone.
2011-07-11 15:16:29 +08:00
21b1af5f1c
Merge pull request #377 from minggo/master
...
[Android] break string & wrap word
2011-07-11 00:09:43 -07:00
fb436a6339
[Android] break string & wrap word
2011-07-11 15:02:41 +08:00
28bf48f665
issue #569 #601 , fix ChipmunkTest/Sensors crash after update to Chipmunk v5.3.5
2011-07-11 11:21:11 +08:00
aa12ea838e
Merge remote branch 'origin/master'
2011-07-11 10:34:47 +08:00
63ffc574d7
fixed #601 , update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now.
2011-07-11 10:34:03 +08:00
7bc3983f04
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-11 10:12:07 +08:00
36474b2131
Add DirectorTest and BugsTest on wophone.
2011-07-11 10:11:40 +08:00
4e12ba3015
Merge pull request #374 from axmx/master
...
[airplay] fix - it solves the problems related to incorrect memory allocation..
2011-07-10 00:44:30 -07:00
7f07574630
[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:05:22 -07:00
2066cebd08
Merge pull request #371 from natural-law/master
...
Add DirectorTest and BugsTest on android.
2011-07-08 03:49:30 -07:00
487ba5c02d
merge confict
2011-07-08 18:29:03 +08:00
87adeb6f92
upgrade xcode3 template
2011-07-08 18:24:58 +08:00
1ffa7fbc19
Add DirectorTest and BugsTest on android.
2011-07-08 18:13:03 +08:00
e39fca389f
Merge remote branch 'origin/master'
2011-07-08 18:01:52 +08:00
944b03df5c
issue #599 orientation is wrong in ios tests. Most test cases are ok now, but it still have problem when TouchesTest back to MainMenu.
2011-07-08 18:01:28 +08:00
1bdce00740
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/include/ccConfig.h
2011-07-08 17:08:57 +08:00
6c37f42414
Merge pull request #368 from minggo/master
...
fixed #586
2011-07-08 01:46:54 -07:00
4e5306a46b
fixed #596
2011-07-08 16:27:13 +08:00
cba538d5d0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 15:58:14 +08:00
602c5f1894
fixed #595
2011-07-08 15:57:46 +08:00
5c8b04bc25
fixed #585
2011-07-08 14:48:25 +08:00
08b26402d5
fixed #594 , but find a new bug #597
2011-07-08 14:27:37 +08:00
0cb3b0ce06
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-07-08 11:23:03 +08:00
ca4281904a
fixed #574 , Add bugs test case.
2011-07-08 11:22:35 +08:00
b08788d810
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
2011-07-07 15:41:42 +08:00
8ca8f4d9bc
fixed #569 : change the free sequence to avoid bug
2011-07-07 15:20:13 +08:00
26513d6b7e
issue #574 , Add DirectorTest for win32.
2011-07-07 14:55:11 +08:00
211878dc44
add animation
2011-07-07 10:24:01 +08:00
ff50997eb0
issue #574
2011-07-06 14:56:05 +08:00
80c819d8b6
Merge remote branch 'origin/master'
2011-07-04 16:25:29 +08:00
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
7d7f3a9241
fixed #562 , Upgrade folder sprite_nodes to rc3.
2011-07-01 16:11:31 +08:00
4d5dab4a40
fixed #558 , Upgrade folder layers_scenes_transitions_nodes to rc3.
2011-07-01 11:26:26 +08:00
25b3b15151
Merge pull request #339 from minggo/iss549
...
[Android] fixed #549 : Add comments for playEffect()
2011-06-30 18:28:08 -07:00
67b85322ed
[Android] fixed #549 : Add comments for playEffect()
2011-07-01 09:24:40 +08:00
12f816687d
Merge pull request #336 from liswei/master
...
update wophone setup project (such as helloworld,tests)
2011-06-29 20:08:01 -07:00
2a39fe0aa4
Merge pull request #335 from minggo/iss547
...
[Android] fixed #547 : line wrap OK on Android
2011-06-29 19:46:25 -07:00
39fb944297
update wophone setup project (such as helloworld,tests)
2011-06-30 09:36:51 +08:00
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
b23409a942
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
...
reset glOrthof param value in wophone
2011-06-29 15:24:04 +08:00
e8853583df
Merge pull request #329 from minggo/master
...
Fix some bug
2011-06-27 18:23:26 -07:00
7099b24ccb
Merge pull request #326 from liswei/issue521
...
issue #521 set depthtest value for true ,then set depthtest value for false
2011-06-27 18:20:10 -07:00
3b6265aa58
Compile ok on vs2010
2011-06-27 17:02:58 +08:00
5e15545dbd
[Android] fix an error when string is
2011-06-27 16:01:25 +08:00
bb59728543
issue #521 set depthtest value for true ,then set depthtest value for false
2011-06-27 15:34:26 +08:00
686b9ae179
fix the test title
2011-06-27 15:22:55 +08:00
72f17ecbdf
fixed #542 , Record the volume user specified though the background music is not playing.
2011-06-27 11:43:27 +08:00
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
00568c229a
[android] back to shared library link
2011-06-25 11:21:16 +08:00
8440d6a267
[android] fixed #364 : show string correct & line break ok
2011-06-24 13:55:00 +08:00
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
71c13b34bf
Merge https://github.com/cocos2d/cocos2d-x into iss535
2011-06-22 17:00:11 +08:00
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
96996d4d52
Merge pull request #311 from yangws/master
...
Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..
2011-06-22 01:11:49 -07:00
1485a35338
update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4
2011-06-22 15:36:53 +08:00
01f277674e
Add icon for Helloworld and tests on Android.
2011-06-22 13:59:31 +08:00
4d8596169e
Sync java code in Helloworld and tests.
2011-06-22 11:37:42 +08:00
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
25de09e34b
lua support ok on win32
2011-06-15 15:50:16 +08:00
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
f600846d4b
Merge http://github.com/flyingpacer/cocos2d-x , resolve conflicts in cocos2dx/CCScheduler.cpp
2011-06-08 11:08:29 +08:00
67eb87abfe
To fix the crash when the gles version is too low
2011-06-08 10:02:07 +08:00
a13e8ae859
1.修正gles版本过低时会崩溃的问题
...
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
2011-06-03 15:22:50 +08:00
49410a2a07
Merge branch 'XXX'
2011-06-03 10:52:19 +08:00
54780b8cb7
fixed #521 , Fix the effect of PageTurn3D.
2011-06-03 10:51:21 +08:00
83e1e0ebd1
tests run ok when it don't enable lua
2011-06-01 20:29:05 +08:00
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +08:00
7e2d1d5c48
fixed #490 Text input on android use a different way, TextInputTest OK now.
2011-05-30 16:36:12 +08:00
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
11c401e3ea
[ios] setDepthTest(false) for EffectsTest
2011-05-26 21:01:16 +08:00
bf95e4e7a5
Merge pull request #286 from natural-law/master
...
[android] fixed #510
2011-05-26 01:39:11 -07:00
7e716f9d80
[android] fixed #510 , Delete the onDestroy method override in TestsDemo.java
2011-05-26 16:34:10 +08:00
476d86283f
Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java.
2011-05-26 14:35:44 +08:00
dfbb0096e8
Merge pull request #283 from natural-law/master
...
Compile tests OK on wophone.
2011-05-24 18:45:18 -07:00
8ab7057fe6
Resolve the memory leak of tests.
2011-05-24 18:00:59 +08:00
f89a93fcf8
Compile tests OK on wophone.
2011-05-24 17:52:24 +08:00
c757dd4aeb
fixed #503 new chipmunk code compiled ok on vs2010.
2011-05-24 16:18:47 +08:00
d93a2f046e
android can input number form soft keyboard.
2011-05-23 16:30:45 +08:00
ec23d7ed55
fixed #508 Dynamic switch retina display support.
2011-05-23 16:21:31 +08:00
533949a736
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-23 10:11:13 +08:00
6b24b6fb8d
issue #503 , i forget to add chipmunk_private.h into xcodeproj
2011-05-21 21:35:05 +08:00
e8835ee4c2
issue #503 , add chipmunk new files into win32 vcproj
2011-05-21 17:10:29 +08:00
335d02a556
issue #503 , android version build & run ok.
2011-05-21 16:45:55 +08:00
a9027574eb
issue #503 , ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok
2011-05-21 16:19:01 +08:00
c9f66665ec
temp commit.
2011-05-20 17:47:06 +08:00
b940676cab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489
2011-05-19 20:55:39 +08:00
ff1017d86f
Merge pull request #276 from minggo/iss496
...
[android] fixed #496 fixed #497
2011-05-18 23:18:37 -07:00
073260e0a9
[android] fixed #496 fixed #497 : tests and HelloWorld work ok on Android3.0
2011-05-19 11:26:57 +08:00
2dd11490ad
Merge pull request #274 from yangws/master
...
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
2011-05-18 18:51:38 -07:00
5173738f37
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-18 11:08:44 +08:00
7a6a891242
fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.
2011-05-18 11:08:18 +08:00
6cf0a9d4f4
[android] fixed #494 : fix a wrong function name
2011-05-18 10:54:52 +08:00
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
c7fb183dcb
[airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now.
2011-05-12 21:58:11 +08:00
4da5a0eb71
[android] move the TextField position to visable while soft keyboard popup
2011-05-12 21:32:57 +08:00
f17a8f6226
Merge pull request #271 from minggo/iss488
...
[Android] CCUserDefault works ok on android2.2
2011-05-12 05:40:15 -07:00
d8f3b0c25b
[android] CCUserDefault works ok on android2.2
2011-05-12 18:32:13 +08:00
bf04194877
Merge pull request #269 from yangws/master
...
center CCTextField in TextInputTest
2011-05-12 01:59:39 -07:00
7874ec5305
Merge pull request #270 from yangws/vs2010
...
compile ok in vs2010
2011-05-12 01:59:24 -07:00
c73c1a9ab6
compile ok in vs2010
2011-05-12 16:15:10 +08:00
01c5048203
set TextInputTest CCTextField to center.
2011-05-12 14:45:44 +08:00
2855a9cefb
Fix the bug discovered by wophone test:
...
1. Can't play music & effect on wophone device.
2. UserDefaultTest is in the wrong path in test.wophone.vcproj.
2011-05-12 14:19:58 +08:00
a50fe1b95b
Merge pull request #267 from natural-law/master
...
Modify the TextInputTest code to clean the memory leak.
2011-05-11 20:01:23 -07:00
cc6367a835
Modify the TextInputTest code to clean the memory leak.
2011-05-12 10:54:33 +08:00
7f0c35b158
Merge remote branch 'origin/master'
2011-05-12 10:52:33 +08:00
10d94fb170
fixed #486 , setDepthTest(true) in TileMapTest, while setDepthTest(false) in TransitionsTest. TransitionFlip will not flickers any more :)
2011-05-12 10:52:10 +08:00
a7db186d06
Modify the test code for the right device orientation.
2011-05-12 10:11:58 +08:00
58e9876124
change the position of TextField in TextInputTest
2011-05-11 22:15:51 +08:00
074e127756
Merge pull request #265 from yangws/master
...
fixed a bug: TextInputTestWithAction crash.
2011-05-11 05:22:38 -07:00
7dad88c556
fixed a bug: TextInputTestWithAction crash.
2011-05-11 18:45:53 +08:00
d0ff1f274e
Merge pull request #264 from yangws/master
...
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
2011-05-11 03:28:16 -07:00
60f1468f57
Merge pull request #263 from yangws/input_android
...
fixed a bug: delete twice when delete button click once.
2011-05-11 03:27:45 -07:00
b8a9db98dc
fixed a bug: TextInputTextWithAction can't stop CCTextFieldTTF's action when click enter button.
2011-05-11 18:22:55 +08:00
e436e177de
fixed a bug: delete twice when delete button click once.
2011-05-11 17:33:59 +08:00
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
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
6c69107f33
fixed #455 : CCUserDefault works ok on iOS
2011-05-06 17:01:41 +08:00
ced029257f
temp commit
2011-05-06 16:38:09 +08:00
7e40957e04
Merge https://github.com/cocos2d/cocos2d-x into iss455
2011-05-06 16:29:44 +08:00
80f739942d
issue #455 : compile CCUserDefault on iOS
2011-05-06 16:29:35 +08:00
33648a9e9b
issue #455 : add compile CCUserDefault to WoPhone, but not test, because the path will change later
2011-05-06 16:14:07 +08:00
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +08:00
b95ef2f242
chipmunk test ok.
2011-05-06 12:30:52 +08:00
846b529e49
[wophone] fixed #482 , Modify the resource data path for the new WoPhone-SDK.
2011-05-06 10:13:12 +08:00
0fe61642f6
issue #478 text input ok.
2011-05-05 18:17:50 +08:00
dcdad9a81a
Merge pull request #250 from yangws/481
...
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 00:53:10 -07:00
c7e25d305a
Merge pull request #248 from yangws/input
...
Split TextInputTest to Default test and Action test. Compile ok on vs2010
2011-05-05 00:50:48 -07:00
7c5a6d779c
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 11:51:13 +08:00
9d08f9582c
Added the possibility of extending Cocos2dxGLSurfaceView and providing a initView() method
2011-05-04 11:18:26 -03:00
a5da2bd226
Split TextInputTest to Default test and Action test. Compile ok on vs2010.
2011-05-04 14:13:15 +08:00
5dc7ef2ffc
sort the TestCases alphabetically in project.pbxproj
2011-05-03 14:48:25 +08:00
2b8799d3ac
Merge pull request #246 from yangws/input.
...
Modify tests doesn't change orientation every test scene.
2011-05-02 23:00:35 -07:00
e723a424d8
Modify tests doesn't change orientation every test scene.
2011-05-03 11:37:30 +08:00
0db248e1f1
Merge pull request #245 from yangws/input.
...
TextInputTest on on ios.
2011-05-02 18:48:48 -07:00
2b94d7d9ce
TextInputTest on on ios.
2011-04-29 18:09:54 +08:00
170933b4c5
CCTextFieldTTF test code ok on win32.
2011-04-29 16:46:29 +08:00
b00c54dc64
Merged pull request #243 from minggo/iss477.
...
[android] fixed #477 : set default ndk version to ndk-r5
2011-04-28 19:29:15 -07:00
bb4fc1c446
[android] fixed #477 : set default ndk version to ndk-r5
2011-04-29 09:59:05 +08:00
031a750f95
[ios] issue #456 , add curl into header search path for Release build.
2011-04-29 09:39:35 +08:00
d73699aabb
[ios] tests add RootViewController for rotate with ui object.
2011-04-28 14:19:12 +08:00
323c065934
make test can compile on wophone and airplay.
2011-04-28 10:31:51 +08:00
f8dc140840
change CCLabelTTF accept string from gb2312 to utf8.
2011-04-27 18:19:47 +08:00
73a3f776f0
android lanscope keyboard ok.
2011-04-27 17:01:27 +08:00
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
a73ccaf0e3
Cocos2dxGLSurfaceView little modify.
2011-04-26 16:40:49 +08:00
9b08f4add6
keyboard notification message on ios and TextFieldTTF test code OK.
2011-04-26 16:33:20 +08:00
1c248b9955
Merge branch 'iss462' of https://github.com/minggo/cocos2d-x
2011-04-25 16:07:16 +08:00
f11acc5e31
[android] pause/resume gl render thread when the activity is paused or remused
2011-04-25 15:53:08 +08:00
99733c602d
[android] fixed #462 : call applicationDidEnterBackground and applicationWillEnterBackground on android
2011-04-25 15:13:24 +08:00
6a11f73999
Merge branch 'iss468' of https://github.com/natural-law/cocos2d-x
2011-04-25 14:44:21 +08:00
7231120b16
fixed #468 , Implement CCProfiler & CCProfilingTimer. And use them in PerformanceNodeChildrenTest.
2011-04-25 14:30:30 +08:00
85afa22195
[android] fixed typo in CCEGLView method name
2011-04-24 18:52:21 +04:00
252f3efe1a
CCIMEDispatcher works on android.
2011-04-22 16:33:41 +08:00
df00c32d5b
fixed #466 . [wophone] Modify the template and the Makefile.ARM file for wophone.
2011-04-22 11:49:14 +08:00
e2ce006db2
fixed #466 . [wophone] Refactor the CCFileUtils for the new packing approach.
2011-04-22 10:57:46 +08:00
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
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
e5441a4fc2
fixed #450 : can set default pixel format other than RGBA8888
2011-04-20 15:34:33 +08:00
4ffe24fc8e
Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374
2011-04-19 13:45:56 +08:00
c38af3c28d
fixed #456 : integrate libcurl into cocos2dx
2011-04-19 10:57:44 +08:00
a4e9f1c18d
libcurl works ok on ios
2011-04-18 14:12:41 +08:00
37e7fad0d3
issue #456 : add curl test & libcurl.so works ok on android
2011-04-15 17:15:05 +08:00
a165663b4c
[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld
2011-04-12 15:37:44 +08:00
8e85f56f97
Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews
2011-04-12 15:12:48 +08:00
d8115cacea
[android] fixed #453 : cocosdenshion can replace the background music
2011-04-12 14:43:21 +08:00
0b7ca9c865
fixed #449 : remove the code that suppots mac platform
2011-04-11 17:04:45 +08:00
0203141aaf
Now the size depends on the GLView size
2011-04-11 00:28:12 -03:00
da78032542
Added the possibility of inflating Cocos2dxGLSurfaceView from an xml
2011-04-10 17:57:17 -03:00
0173d0c3b7
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2011-04-07 16:57:58 +08:00
1f6bbacb0a
[android] fix a bug of cocosdenshion::rewindBackgroundMusic()
2011-04-07 15:59:01 +08:00
63f323456c
Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x
2011-04-07 15:16:30 +08:00
b72b5306d2
Fix problems discovered when test:
...
1. Add include file in ccConfig.h
2. Resolve the memory leak in PerformanceSpriteTest.
3. Delete the 2048 * 2048 texture test case in PerformanceTextureTest.
2011-04-07 14:30:35 +08:00
455ec071b3
VC2010 compile ok.
2011-04-07 14:20:04 +08:00
1af4aa1138
[android] fixed #374,Modify the approach of cache the textures when EGL rendering context lost.
2011-04-06 16:29:58 +08:00
290367c867
[airplay] fix screen orientation bugs (pointer not properly worked) on devices ( checked on IOS IPad/IPhone), when orientation was changed.
2011-04-04 01:54:34 -07:00
cb65469103
[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk
2011-04-04 00:40:39 +08:00
3a16b76d00
remove duplicate frameworks in test.xcodeproj
2011-04-03 10:13:06 +08:00
28fbfb04dc
Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349
2011-04-03 09:30:26 +08:00
72f11cb421
[ios]fixed #349,Modify the method of parse *.plist files in order to deal with *.plist files in binary format.
2011-04-02 11:32:15 +08:00
8fbfc2773a
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
2011-04-01 17:19:30 +08:00
ac84278dae
[android] #443 implemented CCKeypadDelegate on android
2011-04-01 11:27:06 +04:00
2c539a1df5
[android] fixed #440 : CCMessage works ok on android
2011-04-01 11:35:26 +08:00
James Chen