minggo
5ad2bec3d8
Merge pull request #946 from minggo/gles20
...
fix some bug
2012-05-30 03:33:19 -07:00
minggo
a698f9bf69
fix some bug
2012-05-30 18:31:20 +08:00
James Chen
6be44ad7b0
fixed #1279 : NodeNonOpaqueTest can't be shown correctly.
2012-05-30 18:30:11 +08:00
minggo
80389d0611
Merge pull request #941 from minggo/gles20
...
fix some bugs
2012-05-30 00:44:22 -07:00
minggo
4428810fd5
fixed some bugs
2012-05-30 15:42:29 +08:00
James Chen
895de701ba
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat.
2012-05-30 14:24:59 +08:00
James Chen
ad50d6ee57
fixed #1270 : Fixed some warning on win32.
2012-05-29 17:11:33 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
5f5af82254
fixed #1177 : Moved CCStdC.h/.cpp to relevant platform folder.
2012-05-29 15:51:13 +08:00
James Chen
14a218c8cc
Merge pull request #922 from dumganhar/gles20
...
fixed #1240 : Added static libraries of tiff for android.
2012-05-28 01:07:08 -07:00
James Chen
785c3c5d60
fixed 1240# : Added static libraries of tiff for android.
2012-05-28 16:05:52 +08:00
James Chen
6e59d5eab4
fixed #1264 : CCLabelTTF: wrong string alignment when using utf-8 encoded text.
2012-05-28 14:27:32 +08:00
James Chen
99dcb4de86
issue #1263 : Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.
2012-05-28 14:14:19 +08:00
James Chen
c902e884f4
fixed #1240 : Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.
2012-05-25 16:52:47 +08:00
James Chen
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
James Chen
0b8a75e982
fixed #1240 : Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.
2012-05-25 10:58:28 +08:00
Walzer
df98ed4792
Merge pull request #914 from walzer/gles20
...
javascript binding!
2012-05-24 03:48:14 -07:00
Walzer
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
minggo
c258e1e43a
fixed #1247 : add profile lib
2012-05-24 17:47:46 +08:00
James Chen
e5443d22c1
issue #1240 : Added libtiff for android.
2012-05-24 12:00:06 +08:00
James Chen
6a37158100
issue #1240 : Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format.
2012-05-23 18:20:51 +08:00
James Chen
c2591f1e9e
issue #1240 : Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed.
2012-05-23 17:26:06 +08:00
James Chen
c7359ba1a0
fixed #1252 : Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
2012-05-23 11:57:43 +08:00
James Chen
f7ffdd757c
fixed #1244 : deleted unused method "release" of CCImage class.
2012-05-23 11:22:17 +08:00
James Chen
d998b54269
fixed #1224 : Memory leak in CCParticleSystem::initWithDictionary()
2012-05-23 11:18:04 +08:00
minggo
683c91bbfa
fixed #1236 : return empty string when parameter is null
2012-05-16 14:17:37 +08:00
minggo
1d18c6607a
fixed #1237 : correct line number output by CCAssert
2012-05-16 14:10:27 +08:00
minggo
ff6abd1d8c
fixed #1230 : fix a bug in calculating string width
2012-05-07 10:15:57 +08:00
Walzer
f70855e959
fixed #1229 , reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.
2012-05-05 10:06:41 +08:00
minggo
27b5fb8074
merge commit of issue 1216
2012-05-03 16:30:13 +08:00
James Chen
7cdb11b668
fixed #1215 : fixed a bug in retina support for win32.
2012-05-03 15:05:19 +08:00
James Chen
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
James Chen
ca5ef69d50
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
2012-05-02 18:44:30 +08:00
minggo
4bcf67078d
fixed #1201 : add prebuilt libs
2012-05-02 18:37:37 +08:00
James Chen
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
James Chen
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
James Chen
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
minggo
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
James Chen
db92c9c1dc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 14:32:27 +08:00
minggo
741f219f16
issue 1201: remove module to prebuilt
2012-05-02 10:45:21 +08:00
minggo
57d6884757
rename modules to prebuilt
2012-05-02 10:44:40 +08:00
Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
James Chen
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
minggo
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
minggo
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
James Chen
2bffd3a565
issue #931 : dynamically allocate array(row_pointers) in CCImage::_initWithPngData.
2012-04-26 18:17:57 +08:00
minggo
602d34ec78
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-04-26 17:36:59 +08:00
minggo
7ecbd8ea6c
issue #931 : refactor CCImage and CCTexture2D
2012-04-26 17:36:32 +08:00
James Chen
f5ffe8249e
issue #1190 : Updated ios lua project.
2012-04-26 13:05:05 +08:00
James Chen
8d63e9f1bd
issue #1190 : Updated some files for android port.
2012-04-26 11:52:21 +08:00
James Chen
edfb8c1f9c
issue #1190 : used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.
2012-04-26 11:39:49 +08:00
James Chen
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
James Chen
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
James Chen
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
e8b826b7a6
fixed #1187 : spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
2012-04-25 10:55:59 +08:00
James Chen
062ae1756d
fixed #1177 : updated project configuration for android and ios platforms.
2012-04-24 17:35:36 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
5e0682ed77
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
2012-04-23 15:41:01 +08:00
James Chen
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
James Chen
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
James Chen
5b77e6e80e
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
cocos2dx/platform/CCEGLViewProtocol.h
2012-04-23 14:39:27 +08:00
James Chen
24515f009e
issue #1177 : Updated ios project configuration.
2012-04-23 14:35:41 +08:00
James Chen
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
James Chen
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
James Chen
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
minggo
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
James Chen
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
9ace0d2fdc
Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.
2012-04-16 10:57:37 +08:00
James Chen
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
James Chen
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
minggo
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
James Chen
137679d369
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
2012-04-10 16:32:53 +08:00
James Chen
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
minggo
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
minggo
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
minggo
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
James Chen
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +08:00
James Chen
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
James Chen
394bb24cf5
issue #1056 : Reverted opengles emulator version to 2.09, because there are some issues in v2.10.
2012-03-27 14:11:28 +08:00
James Chen
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
James Chen
cef41dfbc5
issue #1056 : Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.
2012-03-27 13:42:35 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
minggo
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
James Chen
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
James Chen
35d93328b9
issue #1056 : 1.Fixed a bug of double delete TouchDispatcher.
...
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
2012-03-21 21:53:03 +08:00
James Chen
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
James Chen
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
minggo
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
minggo
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
minggo
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
James Chen
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
James Chen
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
James Chen
f67ac20639
Merge pull request #775 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 02:59:21 -07:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
86a1acc0d8
Merge pull request #774 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-15 22:45:20 -07:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
673a1ca238
Merge pull request #771 from dumganhar/gles20-dev
...
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 03:15:38 -07:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
James Chen
d0f93d38f4
Merge pull request #769 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 00:00:57 -07:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
Paolo Giangrandi
4f2f403827
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
2012-03-12 14:22:48 +01:00
Paolo Giangrandi
7820be7841
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
2012-03-12 14:22:39 +01:00
James Chen
bd59979495
add gles2.0 libraries for win32.
...
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
2012-03-12 15:22:03 +08:00
minggo
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
Wartortle
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
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
minggo
a0f0971782
fixed #1017 : improve win32 timing accuracy
2012-03-06 14:12:57 +08:00
James Chen
74b4b14ee3
Merge pull request #730 from moadib/qnx_eventhandler
...
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
2012-03-05 18:07:20 -08:00
James Chen
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
James Chen
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
minggo
796ba89e9d
Merge pull request #742 from minggo/iss762_label_position
...
compute correct text rect and display it on center
2012-03-01 22:24:04 -08:00
minggo
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
minggo
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
minggo
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
minggo
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
minggo
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
James Chen
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
James Chen
05bf647ec3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib
2012-02-28 15:00:18 +08:00
James Chen
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
moadib
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
moadib
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
minggo
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
James Chen
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
James Chen
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
James Chen
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
James Chen
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
James Chen
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
minggo
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
minggo
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
minggo
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
minggo
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
Wartortle
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
Wartortle
ffc4457991
On Win32 platform, there's now support for simulating the Accelerometer
...
using the up/down/left/right/comma/period keys.
2012-02-06 11:29:28 +00:00
YuLei Liao
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
moadib
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
YuLei Liao
47d88bfbba
* add macro defines for Lua engine
2012-02-02 10:37:21 +08:00
martinezgerman
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
martinezgerman
acdd00f03b
Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application
2012-01-31 21:38:44 -08:00
martinezgerman
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
martinezgerman
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
Dale Ducharme
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
folecr
b0b5790e06
Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7.
...
* Uses NDK modules as the basis of the build system for Android NDK
* Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
* The dependencies of this module are also Android NDK modules
* ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
* Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
2012-01-29 09:52:38 -08:00
folecr
e6fddbc047
Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.
2012-01-29 09:33:17 -08:00
gzito
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
gzito
b400570265
Workaround for issue #635 . Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator
2012-01-17 10:57:31 +01:00
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
dumganhar
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
dumganhar
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
minggo
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
minggo
0ee582e887
fixed #917 : add header files to resolve compiling errors
2012-01-09 17:36:57 +08:00
minggo
b1aee8f9eb
Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils
2012-01-09 17:12:46 +08:00
dumganhar
4cc1658d45
fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.
2012-01-09 14:15:49 +08:00
dumganhar
259aaf42a6
Fixed: get extension function from eglGetProcAddress on bada platform
2012-01-09 14:15:18 +08:00
dumganhar
30a02030b0
make the property function to virtual
2012-01-09 11:07:45 +08:00
dumganhar
2f1c313d12
Merge pull request #658 from gzito/master
...
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
2012-01-04 22:09:22 -08:00
gzito
65ddb88000
Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)
2012-01-04 23:34:48 +01:00
minggo
c6da8d2fbd
call correct java method
2012-01-04 10:14:46 +08:00
gzito
2acea5f7af
libxml2.mkf for both Windows and Mac Marmalade versions
2012-01-03 00:39:31 +01:00
gzito
083d0015a3
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-02 22:32:29 +01:00
minggo
37915cfed6
remove unneeded function, and make protocol an abstract class
2011-12-28 14:46:49 +08:00
gzito
28562c3fb9
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2011-12-27 16:14:19 +01:00
dumganhar
a09bebb32b
fixed #903 : 1.pass 'id' parameter to setTouchInfo function;
...
2.when double press happens, deal with it as single press.
2011-12-23 20:33:42 +08:00
minggo
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
minggo
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
minggo
bb4b1d02bb
Merge pull request #608 from GMTDev/patch-2
...
issue #903 : Update CCTouch to include the ID/PID of the touch
2011-12-20 21:48:30 -08:00
gzito
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
gzito
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00
gzito
298f12e7a3
Removed libxml2 (precompiled version)
2011-12-20 22:05:01 +01:00
minggo
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
gzito
59bccb6bf8
Added last loaded font caching & minor fixes
2011-12-19 23:08:35 +01:00
gzito
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
gzito
e389ae5469
Optimized CCImage and fixed alpha value
2011-12-19 22:56:44 +01:00
dumganhar
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
dumganhar
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
dumganhar
f3b7b519fc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619
2011-12-15 11:38:15 +08:00
minggo
8813d94257
Merge pull request #617 from minggo/issue906
...
remove unneeded code in CCImage_android.cpp
2011-12-14 18:08:24 -08:00
Didiet Noor
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
dumganhar
625d299717
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
2011-12-13 10:01:29 +08:00
gzito
d4ea6d4ef5
Rollback changes about CCDirector::sharedInstance as pointer
...
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
2011-12-12 14:50:35 +01:00
dumganhar
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
minggo
ba462e99a6
fixed #906 : remove unneeded code in CCImage_android.cpp
2011-12-12 17:02:21 +08:00
dumganhar
baf3755142
remove some '__QNX__' macros
2011-12-12 16:14:12 +08:00
dumganhar
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
minggo
8c5c3300aa
Merge pull request #612 from dumganhar/issue904
...
Issue904
2011-12-11 19:33:07 -08:00
styck
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
gzito
47e108a8c5
Added marmalade support, removed airplay
2011-12-11 10:19:41 +01:00
styck
f3b662a5a8
marmalade updates
2011-12-10 22:29:39 -08:00
styck
dc6476ebe0
marmalade updates
2011-12-10 21:54:07 -08:00
styck
9fc2061c6b
mamarlade updates
2011-12-10 21:20:15 -08:00
styck
bcf63d0e96
Merged from gitbub.gom/gzito, marmalade support, remove airplay
2011-12-10 20:59:48 -08:00
gzito
2be5240a5d
Fixed CCFileUtils::getWriteblePath on Marmalade
2011-12-10 16:34:54 +01:00
gzito
f27f9180ff
Merge remote-tracking branch 'remotes/styck/master'
2011-12-10 11:10:59 +01:00
Giovanni Zito
287f480c97
Added initWithString (TTF) and jpeg support
2011-12-09 22:05:12 +01:00
Giovanni Zito
af29be2d26
Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit
2011-12-09 22:04:35 +01:00
Giovanni Zito
362a82f41c
mainloop modified to handle correctly quit requests
2011-12-09 22:03:38 +01:00
Giovanni Zito
5584039f47
libFreeType and libJpeg for Marmalade
2011-12-09 21:58:32 +01:00
dumganhar
6d2a298035
Merge branch 'bbf' into blackberry
2011-12-09 15:58:16 +08:00
dumganhar
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
styck
7350fa9bb5
Updated based on G.Zito feedback
2011-12-08 19:51:19 -08:00
dumganhar
190fbb60a7
Merge branch 'Forf_2' into bbf
2011-12-09 10:39:27 +08:00
dumganhar
b398d75e21
modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx
2011-12-09 10:32:00 +08:00
Giovanni Zito
0c1b058629
Changed symbols from "airplay" to "marmalade", added files and folders for marmalade
2011-12-08 12:16:32 +01:00
Giovanni Zito
7b0cb1bc8b
Accelerometer stuff
2011-12-08 10:48:03 +01:00
Giovanni Zito
e077107575
Used CONSTANT definitions for touch
2011-12-08 09:30:18 +01:00
Giovanni Zito
8b4b802839
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cocos2dx/platform/CCSAXParser.h
2011-12-08 08:41:16 +01:00
GavT
3d86583818
Update cocos2dx/platform/android/jni/TouchesJni.cpp
2011-12-07 20:25:51 -08:00
dumganhar
fa07d16f73
switch to WVGA
2011-12-08 11:07:17 +08:00
Giovanni Zito
b60eac2505
integrating libXml2
2011-12-07 23:49:52 +01:00
dumganhar
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +08:00
dumganhar
2c94bcc075
add some files for qnx
2011-12-07 16:22:40 +08:00
GavT
190891bab7
Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751
...
Files Modified: Eagleview.mm, CCTouch.h
2011-12-06 20:06:38 -08:00
styck
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
Giovanni Zito
97967ffcb3
Specific classes for Marmalade platform
2011-12-07 00:08:04 +01:00
dumganhar
6d7baa9684
add platform files for qnx
2011-12-06 17:19:36 +08:00
dumganhar
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +08:00
Walzer
70d5a088f1
fixed #887 , define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7
2011-12-04 20:18:17 +08:00
dumganhar
3f97e7db44
fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp
2011-11-30 09:26:45 +08:00
dumganhar
0fff92236f
add f project
2011-11-29 12:38:20 +08:00
minggo
266f0ee7ab
Merge pull request #586 from leon-li/master
...
Fix some minor bugs.
2011-11-28 18:27:38 -08:00
Leon
f108952595
Merge remote branch 'upstream/master'
...
Conflicts:
cocos2dx/support/CCPointExtension.cpp
2011-11-29 10:15:15 +08:00
dumganhar
d108f4f456
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-28 23:13:02 +08:00
dumganhar
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
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
dumganhar
112ec42670
fixed #854 : support bada pthread and semaphore
2011-11-28 16:07:17 +08:00
dumganhar
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
dumganhar
20455bf164
fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly.
2011-11-28 14:27:48 +08:00
Leon
6f99f7efde
1. fix multi touch index.
...
2. swap.
3. create gl view.
2011-11-26 22:37:36 +08:00
minggo
f5bbad5833
issue #854 : implement CCImage::initWithImageFileThreadSafe for iOS
2011-11-25 10:09:29 +08:00
dumganhar
79e204abad
add semaphore support on bada
2011-11-25 10:06:26 +08:00
dumganhar
c138d7e258
update CCAccelerometer on bada platform
2011-11-24 18:04:25 +08:00
dumganhar
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
dumganhar
aeb56495a6
add user truetype font support, fix a bug in CCTextureCache.cpp
2011-11-24 15:15:23 +08:00
dumganhar
07da67f253
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/menu_nodes/CCMenu.cpp
2011-11-24 11:52:16 +08:00
dumganhar
4612e6e1d6
update pthread.cpp
2011-11-24 11:37:59 +08:00
dumganhar
42775d4ec5
update pthread implement
2011-11-24 10:58:09 +08:00
dumganhar
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
dumganhar
cfa42fa8a1
Merge branch 'newest' into master_base
2011-11-23 21:47:21 +08:00
dumganhar
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
dumganhar
15e3a6b1cf
update CCFileUtils_bada.cpp and CCImage_bada.cpp
2011-11-23 18:40:36 +08:00
minggo
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
minggo
bc60ed7856
issue #854 : optimize CCTextureCache::addImageAsync()
2011-11-22 16:47:24 +08:00
minggo
51eb56075b
Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread
2011-11-21 09:36:55 +08:00
minggo
4226fcf355
issue #854 : add CCThread_ios.mm
2011-11-21 09:34:49 +08:00
minggo
d48da20b0f
synchrolize to master
2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm
d84b6c25be
issue #223 : merge bada branch and fix some error
2011-11-18 18:45:05 +08:00
minggo
50a2e2d5e9
Merge pull request #574 from minggo/iss854_pthread
...
remove unneeded files
2011-11-17 18:59:03 -08:00
minggo
5d8043ce7e
issue854: remove unneeded files
2011-11-18 10:54:36 +08:00
minggo
a7d6c90adb
Merge pull request #571 from jbyu/master
...
fix memory-leak for lua engine
2011-11-17 18:53:14 -08:00
minggo
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
minggo
cc79e533a3
issue #854 : add pthread for win32 and implement CCTextureCache::addImageAsync()
2011-11-16 11:04:29 +08:00
Phenix Yu
786feb6a8d
Merge remote-tracking branch 'remotes/upstream/master'
...
Conflicts:
HelloLua/Classes/AppDelegate.cpp
HelloLua/Resource/hello.lua
HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
HelloLua/win32/HelloLua.win32.vcproj
HelloLua/win32/HelloLua.win32.vcxproj.filters
cocos2dx/include/ccMacros.h
cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
lua/cocos2dx_support/LuaCocos2d.cpp
lua/cocos2dx_support/LuaEngineImpl.cpp
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
tests/test.win32/test.win32.vcxproj.filters
2011-11-15 14:43:55 +08:00
Phenix Yu
441f8e6da9
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
...
Conflicts:
cocos2dx/CCScheduler.cpp
lua/cocos2dx_support/LuaEngine.cpp
lua/cocos2dx_support/LuaEngine.h
2011-11-15 14:00:52 +08:00
minggo
5273819e83
offer a thread safe function to read contents of xml file, and the engine use it internal
2011-11-15 10:41:18 +08:00
dumganhar
0fa48e2cfb
Update cocos2dx/platform/CCPlatformMacros.h
2011-11-14 11:35:04 +08:00
dumganhar
7cb27a76ae
modify accelerometer and Platform Functions
2011-11-13 22:45:41 +08:00
dumganhar
d8de253542
add messagebox support
2011-11-13 01:13:25 +08:00
dumganhar
5704fdc146
Merge branch 'testMP_static_lib' into newest
2011-11-13 01:05:22 +08:00
dumganhar
ea3b57ea2c
modify multi touch support
2011-11-13 00:54:44 +08:00
dumganhar
8fd2917888
fixed a bug that Accelerometer value error if use HVGA resource in WVGA device
2011-11-13 00:54:05 +08:00
dumganhar
2abe0c0d32
CCAssert will show system messagebox, this easy for debuging code.
2011-11-10 16:49:05 +08:00
dumganhar
ca3b91855a
debug issue #852
2011-11-10 16:44:58 +08:00
dumganhar
920b41271d
add TextInput support
2011-11-08 15:59:04 +08:00
dumganhar
0d6ea61b76
fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof
2011-11-07 18:18:10 +08:00
dumganhar
7d2a26ec10
comment some applog
2011-11-07 00:28:09 +08:00
dumganhar
16fba505b6
add multitouch support
2011-11-05 11:36:27 +08:00
dumganhar
2998726364
revert language
2011-11-02 01:23:07 +08:00
dumganhar
240aa4c077
add russian language support
2011-11-01 23:32:26 +08:00
dumganhar
cf3cecc108
revert to normal version
2011-11-01 23:02:26 +08:00
dumganhar
cff6437b76
revert to normal ccLanguageType
2011-11-01 17:12:39 +08:00
dumganhar
f43530c010
Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada
...
Conflicts:
CocosDenshion/proj.bada/sdk1.0/.cproject
CocosDenshion/proj.bada/sdk2.0/.cproject
cocos2dx/platform/bada/CCApplication_bada.cpp
2011-10-31 09:34:40 +08:00
dumganhar
853126036d
add ogg source for cocosDenshion project
2011-10-29 15:38:15 +08:00
dumganhar
fd90641c49
merge testf branch
2011-10-29 14:47:13 +08:00
Leon
b7f0385a2b
bundle 64 bit linux static libs
2011-10-28 12:19:26 +08:00
Leon
1b42b1d801
Merge remote branch 'upstream/master'
2011-10-28 11:37:02 +08:00
dumganhar
d061e8323d
modify project configure
2011-10-27 19:22:14 +08:00
dumganhar
5db8a24389
fixed one issue in cocosdenshion
2011-10-26 18:38:27 +08:00
dumganhar
dd73456576
Merge branch 'bada' into f
2011-10-25 17:40:20 +08:00
dumganhar
3aef823bd5
rename sdk1.2 to sdk1.0
2011-10-24 11:00:11 +08:00
laschweinski
5589335d3a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1
2011-10-22 19:27:35 +08:00
laschweinski
04633242ba
fix a bug in audio player
2011-10-22 19:10:50 +08:00
dumganhar
eb901be664
project config change
2011-10-21 09:49:57 +08:00
dumganhar
da794c1613
Merge branch 'master' into bada
2011-10-21 09:28:29 +08:00
Leon
5c4a3c3fda
Merge remote branch 'upstream/master'
2011-10-20 18:34:10 +08:00
dumganhar
fdbb989ce5
make sdk1.2 to sdk1.0
2011-10-20 18:31:10 +08:00
Walzer
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
dumganhar
6451d8b6bf
use ceil to compute viewport
2011-10-20 13:44:21 +08:00
Leon
70a4942ea6
fix some warning
2011-10-19 15:24:19 +08:00
dumganhar
3c4c4e515a
modify project settings
2011-10-18 11:11:09 +08:00
dumganhar
064014aeae
make some special configure
2011-10-16 22:44:29 +08:00
dumganhar
ee53c29e5c
switch to 2.0 WVGA
2011-10-16 13:23:48 +08:00
dumganhar
1ffd3a4350
add language support
2011-10-14 15:54:18 +08:00
Walzer
47c9020b85
fixed #738 : caculate label height if not set
2011-10-14 14:33:08 +08:00
dumganhar
3f89f3088b
remove mouse test log
2011-10-14 09:21:03 +08:00
dumganhar
fd3f496b76
use system orientation
2011-10-13 11:55:48 +08:00
moadib
5feee662e7
More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration .
...
Added support for detect russian language.
2011-10-12 09:32:59 +04:00
moadib
0283a4b254
Added dll-export macro to CCSaxParser declaration
2011-10-11 22:44:18 +04:00
dumganhar
64388023f6
Merge branch 'master' into bada
2011-10-10 13:47:16 +08:00
dumganhar
f162a5fcaa
add m_pAccelDelegate != NULL to avoid crash
2011-10-10 10:24:52 +08:00
dumganhar
eb9cb31ca4
use shared lib for cocos2dx project
2011-10-09 18:15:31 +08:00
minggo
9695b6df86
fixed #745 : export CCTime to dll
2011-10-09 10:19:12 +08:00
dumganhar
2f00b8ff1c
update to sdk2.0.2
2011-10-09 01:11:33 +08:00
dumganhar
fdea17b4f9
don't use DeviceOrientation, save orientation before running DirectorTest
2011-10-08 18:17:01 +08:00
dumganhar
beaa489406
add scale support
2011-09-30 17:19:16 +08:00
dumganhar
1830b4e2e9
add default file path = /Res
2011-09-30 10:02:37 +08:00
dumganhar
1b5365282a
add accelerometer support
2011-09-29 18:12:08 +08:00
dumganhar
9ff00c7c83
use utf-8 for displaying chinese
...
remove Gbk_Unicode.c Gbk_Unicode.h
2011-09-29 17:29:38 +08:00
dumganhar
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
dumganhar
bd2266fe4c
use timer as gameloop, can change FPS by using setAnimationInterval
...
modify some project setting
2011-09-29 15:52:16 +08:00
dumganhar
cda492593c
modify gameloop method
...
modify some project setting
2011-09-29 02:32:01 +08:00
dumganhar
de545096de
modify bada project setting
2011-09-28 18:21:17 +08:00
dumganhar
800940dd82
fixed some bug in bada port
2011-09-28 09:49:18 +08:00
dumganhar
a54ab3c293
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:09:14 +08:00
dumganhar
cd18394b09
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:06:11 +08:00
minggo
d4283b1f11
Merge branch 'linux_port'
2011-09-27 17:01:51 +08:00
dumganhar
294c796e55
add bada 2.0 project
...
move 1.2 project to sdk1.2 folder
2011-09-27 17:00:13 +08:00
dumganhar
6cf5592499
modify Gbk_Unicode.c
2011-09-26 17:50:31 +08:00
dumganhar
c78a4cb485
modify cocos2dx project setting for bada
2011-09-26 17:50:05 +08:00
dumganhar
13b091fb15
modify CCImage, make text being showed correctly
2011-09-26 15:40:56 +08:00
moadib
267cce29a9
Added testing ability for case when application enters background and returns in foreground on windows platform.
...
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().
Also break; forgotten in WM_KEYDOWN.
2011-09-22 13:11:51 +04:00
moadib
0ad5ec3557
fixed typo for win32 keypad testing ability
2011-09-22 10:27:10 +04:00
moadib
5537ba7e9e
Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing
2011-09-21 16:21:11 +04:00
minggo
762e342b4d
fixed #727 : invoke DeleteLocalRef() to resolve memory leak
2011-09-20 14:25:16 +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
81243eecdf
modify libpng version to 1.4.5
...
modify libjpeg txt mode to windows \r\n style
2011-09-20 02:17:44 +08:00
dumganhar
8ad2125139
add source code of libjpeg ,libpng ,zlib for bada
2011-09-20 02:16:20 +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
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
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
laschweinski
717698bf65
fix some compiling mistake
2011-09-05 10:12:14 +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
minggo
018036eb28
Merge pull request #498 from minggo/iss703
...
fixed #703 : refactor Accelerometer
2011-08-31 18:30:22 -07:00
minggo
f61fde764b
fixed #703 : refactor Accelerometer
2011-08-31 17:14:29 +08:00
Walzer
1402350870
fixed #676 , add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet.
2011-08-31 14:20:33 +08:00
liswei
dd90e8ce86
issue #702 add invalid point judgement
2011-08-30 16:40:57 +08:00
liswei
ab2a6cb2bb
fixed #702 tests crashs at the start on wophone device
2011-08-30 15:59:06 +08:00
minggo
0cfbf4344a
fix a compiling error on wophone
2011-08-30 10:54:32 +08:00
minggo
414791a684
issue #675 : initialize acceleration_
2011-08-30 10:34:29 +08:00
minggo
92f741aa73
issue #675 : remove unneeded header file
2011-08-30 09:49:55 +08:00
minggo
c7fd375539
issue #675 : make wophone support only one accelerometer delegate
2011-08-30 09:45:11 +08:00
minggo
b38105a70b
issue 675: dispatch accelerometer data to one delegate
2011-08-29 18:18:39 +08:00
laschweinski
c977f3e07c
commit debug and release makefile
2011-08-28 16:44:20 +08:00
laschweinski
e0fa5fdd78
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftconfig.h
...
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftheader.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftmodule.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftoption.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/config/ftstdlib.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/freetype.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftadvanc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbbox.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbitmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftbzip2.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcache.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftchapters.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrdef.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fterrors.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgasp.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftglyph.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftgzip.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftimage.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftincrem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlcdfil.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlist.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftlzw.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmac.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmodapi.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftmoderr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftoutln.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftrender.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsizes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsnames.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftstroke.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsynth.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftsystem.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttrigon.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/fttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ftxf86.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/autohint.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftcalc.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdebug.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftdriver.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftgloadr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftmemory.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftobjs.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftpic.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftrfork.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftserv.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftstream.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/fttrace.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/ftvalid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/internal.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/psaux.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/pshints.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svbdf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svcid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgldict.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svgxval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svkern.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svmm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svotval.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpfr.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpostnm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpscmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svpsinfo.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svsfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttcmap.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svtteng.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svttglyf.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svwinfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/services/svxf86nm.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/sfnt.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/t1types.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/internal/tttypes.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/t1tables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttnameid.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttables.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/tttags.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/freetype/ttunpat.h
new file: cocos2dx/platform/third_party/linux/libfreetype2/ft2build.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cderror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/cdjpeg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jconfig.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jdct.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jerror.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jinclude.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmemsys.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jmorecfg.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpegint.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jpeglib.h
new file: cocos2dx/platform/third_party/linux/libjpeg/jversion.h
new file: cocos2dx/platform/third_party/linux/libjpeg/transupp.h
new file: cocos2dx/platform/third_party/linux/libpng/PngFile.h
new file: cocos2dx/platform/third_party/linux/libpng/cexcept.h
new file: cocos2dx/platform/third_party/linux/libpng/config.h
new file: cocos2dx/platform/third_party/linux/libpng/png.h
new file: cocos2dx/platform/third_party/linux/libpng/pngconf.h
new file: cocos2dx/platform/third_party/linux/libpng/pngpriv.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng.h
new file: cocos2dx/platform/third_party/linux/libpng/readpng2.h
new file: cocos2dx/platform/third_party/linux/libpng/resource.h
new file: cocos2dx/platform/third_party/linux/libpng/writepng.h
new file: cocos2dx/platform/third_party/linux/libraries/libfreetype.a
new file: cocos2dx/platform/third_party/linux/libraries/libjpeg.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng.a
new file: cocos2dx/platform/third_party/linux/libraries/libpng15.a
new file: cocos2dx/platform/third_party/linux/libraries/libxml2.a
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/DOCBparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLparser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/HTMLtree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.am
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/Makefile.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/SAX2.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/c14n.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/catalog.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/chvalid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/debugXML.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/dict.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/encoding.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/entities.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/globals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/hash.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/list.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanoftp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/nanohttp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parser.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/parserInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/pattern.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/relaxng.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schemasInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/schematron.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/threads.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/tree.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/uri.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/valid.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xinclude.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xlink.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlIO.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlautomata.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlerror.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlexports.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmemory.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlmodule.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlreader.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlregexp.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlsave.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemas.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlschemastypes.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlstring.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlunicode.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlversion.h.in
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xmlwriter.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpath.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpathInternals.h
new file: cocos2dx/platform/third_party/linux/libxml2/libxml/xpointer.h
HelloWorld/Classes/
HelloWorld/android/assets
HelloWorld/postCompiled.sh
installLinuxLib.sh
2011-08-25 19:08:55 +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
minggo
e26eaae5e1
[android] fixed #688 : support reading file other than apk
2011-08-25 11:24:31 +08:00
minggo
66b453edc9
[iOS] fixed #693 : CCLabelTTF support line break with \n
2011-08-23 16:19:31 +08:00
root
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
laschweinski
60e794fcc8
add files include test and cocosDenshion
2011-08-19 14:43:19 +08:00
laschweinski
871abb4a32
Merge branch 'master' into LinuxPort
2011-08-19 13:20:23 +08:00
laschweinski
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
minggo
5087f6ddb2
[android] fixed #683 : remove unneeded includes
2011-08-18 16:19:36 +08:00
minggo
b4ab3f6b75
[android] fixed #683 : remove unneeded includes
2011-08-18 16:18:26 +08:00
minggo
1640e48d5a
[android] fixed #683 : let getCurrentLanguageJNI() & getPackageNameJNI() return valid pointer
2011-08-18 16:09:49 +08:00
Phenix Yu
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
moadib
a8d87a9976
Non-trivial arguments passed by reference now.
...
Removed unnecessary cocos2d:: prefix inside namespace.
2011-08-17 17:26:26 +04:00
Walzer
4244fdb62b
fixed #643 , swap accelerometer input x/y according to the orientation (on ios devices)
2011-08-17 20:11:33 +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
6d3941ebc1
Merge pull request #464 from leon-li/master
...
fix some warnings under xcode 4.0 llvm clang
2011-08-10 19:32:16 -07:00
Leon
771e2349c5
fix some warnings under xcode 4.0 llvm compiler
2011-08-10 22:39:02 +08:00
Walzer
6eba0b658f
fixed #651 , add CCFileUtils to doxygen api document
2011-08-08 23:05:47 +08:00
minggo
7a0e8b4a0a
Merge pull request #457 from minggo/iss642
...
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-07 20:08:16 -07:00
minggo
41ea2e98a1
fixed #642 : CCRenderTexture::saveBuffer() works ok on iOS
2011-08-08 11:01:47 +08:00
liswei
70e19d7245
fixed #347 fixed 'AddFontResource' path error!
2011-08-08 10:32:21 +08:00
minggo
016c463659
Merge pull request #449 from flyingpacer/savecrash
...
fixed #657 Latest git version was broken
2011-08-04 02:39:33 -07:00
minggo
76da5f2e84
fixed #656 : remove unneeded methods & android can let user set resource path
2011-08-04 17:19:58 +08:00
RongHong
4745b85af9
fixed #657 Latest git version was broken
2011-08-04 16:37:43 +08:00
liswei
bbc4bbeb6c
issue #347 lost [] in 'delete array'
2011-08-04 13:47:21 +08:00
liswei
897dd54b12
fixed #347 add ttf support in win32
2011-08-04 11:23:59 +08:00
minggo
78642a39ac
[android] fixed #652 : refactor JniHelper::jstringtochar()
2011-08-03 10:44:39 +08:00
liswei
188b168d30
issue #347 add ttf support in wophone
2011-08-02 18:02:27 +08:00
minggo
895d4992e4
issue #347 : FontTest runs ok on iOS
2011-08-01 18:22:47 +08:00
minggo
a3b4043755
issue #347 : add tests for FontTest & it works ok on android
2011-07-29 15:57:27 +08:00
minggo
cfb3765035
issue #347 : iOS support font defined by ttf file
2011-07-29 10:15:10 +08:00
minggo
648117ebb5
issue #347 : android can use ttf file
2011-07-28 17:20:37 +08:00
RongHong
0f94423b9b
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-28 10:52:09 +08:00
RongHong
a253909030
fixed #630 To realize the buffer-saving function in CCRenderTexture
2011-07-27 16:55:04 +08:00
minggo
b308effdc5
[android] fixed #631 : Send \n to engine when user input nothing
2011-07-26 11:41:28 +08:00
minggo
ab4ef0f180
Merge https://github.com/cocos2d/cocos2d-x into iss623
2011-07-25 14:13:20 +08:00
minggo
b105b6005e
[android] fixed #623 : refactor Cocos2dJni.cpp
2011-07-25 14:12:30 +08:00
Walzer
b43d233c08
issue #629 , pass eImgFmt param to initWithImageData. But still haven't add test case for this.
2011-07-24 09:04:08 +08:00
minggo
62ea6a2d46
issue #623 : create JniHelper and use it somewhere
2011-07-22 18:14:29 +08:00
minggo
0c495628ea
Merge pull request #405 from minggo/iss618
...
invoke java code(System.exit()) to finish programe
2011-07-19 02:20:36 -07:00
Leon
d2d02e0c52
fix compile error with android-ndk-r6
2011-07-19 16:54:42 +08:00
minggo
640d811809
[android] fixed #618 : invoke java code(System.exit()) to finish programe
2011-07-19 16:01:22 +08:00
Walzer
768bfa9a9b
issue #536 , add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.
2011-07-19 15:22:13 +08:00
Walzer
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
minggo
9bbab7897a
fixed #615 : CCLog may crash when invoke lua function
2011-07-14 17:52:56 +08:00
minggo
d48c3fdfb1
upgrade to 1.0.0-final 07-11
2011-07-12 11:20:41 +08:00
Max Aksenov
90564fac49
[airplay] fix : incorrect calculation of the bit depth
2011-07-07 08:40:29 -07:00
Walzer
94ac50bad0
fixed #582 , use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution.
2011-07-07 14:45:59 +08:00
minggo
7603665165
fix merging confict of CCDirector.cpp
2011-07-05 14:54:41 +08:00
natural-law
7107c6612b
fixed #563 , Upgrade folder support to rc3.
2011-07-05 12:05:19 +08:00
minggo
ad3bad964f
fixed #567
2011-07-05 11:36:46 +08:00
minggo
2a39fe0aa4
Merge pull request #335 from minggo/iss547
...
[Android] fixed #547 : line wrap OK on Android
2011-06-29 19:46:25 -07:00
minggo
6c47f53b13
[Android] fixed #547 : line wrap OK on Android
2011-06-29 15:45:30 +08:00
minggo
bb90fbfb1e
[iOS] fixed #546 : CCLabelTTF:initWithString() will crash when the height is 0
2011-06-28 15:24:58 +08:00
yangws
59f37ddb5d
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
2011-06-27 10:55:45 +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
liswei
0c5f28fc11
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-24 09:29:55 +08:00
liswei
4793713daa
fixed #539 call unzOpen, then may not call unzClose(WVGA)
2011-06-23 18:24:32 +08:00
Walzer
156dfa8859
Merge remote branch 'origin/master'
2011-06-23 16:31:52 +08:00
Walzer
9e74b1f50d
fixed #534 , use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios.
2011-06-23 16:31:04 +08:00
minggo
53eafa77ff
Merge https://github.com/cocos2d/cocos2d-x into iss364
2011-06-23 14:45:25 +08:00
minggo
10cdd7f798
[android] fixed #364 : line break ok on Android
2011-06-23 14:44:20 +08:00
yangws
2c22cf0621
fixed #537 update to version 2.8 r1 (2.08.28.0634)
2011-06-22 17:55:03 +08:00
minggo
1122a7c7d0
[android] use Android widget Bitmap other than skia to drawstring
2011-06-22 16:58:50 +08:00
Walzer
175e9394bc
Merge https://github.com/minggo/cocos2d-x into lua
2011-06-21 15:22:00 +08:00
minggo
d72d8a52f4
Merge https://github.com/cocos2d/cocos2d-x
2011-06-21 13:53:04 +08:00
natural-law
49a4481473
fixed #323 , Remove the #include <map> in CCApplication_win32.cpp.
2011-06-21 12:01:59 +08:00
natural-law
960ef65f53
fixed #323 , Modify the implement of getCurrentLanguage method on win32.
2011-06-21 11:58:10 +08:00
minggo
022e2b9998
issue #528 : refactor ok on win32
2011-06-20 17:31:38 +08:00
natural-law
fae0498b3c
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-06-17 10:49:25 +08:00
natural-law
cfee246959
fixed #323 , Add an interface to get the current language.
2011-06-17 10:49:02 +08:00
yangws
19eaefab72
CCImage_win32 hasn't release font resource in Destructor.
2011-06-16 10:55:57 +08:00
minggo
738f0b3426
Merge https://github.com/cocos2d/cocos2d-x into lua
2011-06-15 15:32:09 +08:00
natural-law
5d70774b4f
fixed #524 , Parse the special format of plist files on ios & airplay.
2011-06-14 16:15:20 +08:00
natural-law
214e86a5b6
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
...
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
2011-06-14 15:05:52 +08:00
natural-law
489fb7824b
fixed #524 , Parse the special format of plist files.
2011-06-14 14:53:00 +08:00
minggo
8003de7468
update to latest code and merge
2011-06-14 11:01:38 +08:00
liswei
1591c7edc8
fixed #512 fix warnings in /Wall flag
2011-06-10 17:51:37 +08:00
minggo
a8b6b850de
use precompile macro to cantrol if enable lua support
2011-06-01 17:51:08 +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
yangws
ec23d7ed55
fixed #508 Dynamic switch retina display support.
2011-05-23 16:21:31 +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
Walzer
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
minggo
822016e375
[android] fixed #495 : fix a memory leak
2011-05-18 13:56:35 +08:00
yangws
8e07ab7dc9
Modify CCLog out utf-8 string on win32 and wophone emulator.
2011-05-18 11:25:54 +08:00
yangws
5173738f37
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-05-18 11:08:44 +08:00
yangws
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
natural-law
95a46bd5f8
[ios] fixed #493 , The return value of CCFileUtils::getWriteablePath() should be end with '/'.
2011-05-17 10:44:56 +08:00
natural-law
0466166935
[win32] fixed #492 , Consider the path separated by '\' in function CCFileUtils::fullPathFromRelativeFile().
2011-05-16 17:13:15 +08:00
yangws
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
Walzer
1340bbf842
[android] fix a compilation error in CCFileUtils_android.cpp, getWritablePath() method
2011-05-12 21:12:15 +08:00
minggo
91bc9a3f7a
[android] fixed #488 : fix memory leak
2011-05-12 18:55:32 +08:00
minggo
d8f3b0c25b
[android] CCUserDefault works ok on android2.2
2011-05-12 18:32:13 +08:00
Walzer
249724f8d8
[ios] issue #371 , fix the error when invoke CCImage::initWithString with null string ""
2011-05-12 08:24:29 +08:00
yangws
8fa1b97149
fixed a bug by bin: when reopen the keyboard can't delete the text which inputed before.
2011-05-10 18:08:07 +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
yangws
167f4c206b
issue #478 KeyBoard can run on wophone. but too slow.
2011-05-10 15:48:26 +08:00
yangws
fc01bada97
input from sencond twindow named input view.
...
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
2011-05-09 16:59:26 +08:00
natural-law
dd309fe862
[wophone] fixed #487 , Implement the function CCFiltUtils::getWriteablePath() on wophone.
2011-05-09 10:03:43 +08:00
minggo
e27452dd8a
Merge pull request #253 from minggo/iss455
...
Implement CCUserDefault
2011-05-08 18:37:33 -07:00
Walzer
3d17a650bf
Merge pull request #254 from natural-law/master
...
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
2011-05-06 03:04:45 -07:00
natural-law
42b3ad676e
[wophone] Use Sys_SchedYield to control the FPS, instead of Sys_Sleep.
2011-05-06 18:00:43 +08:00
minggo
e14040730b
fixed #455 : release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly
2011-05-06 17:46:19 +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
6c69107f33
fixed #455 : CCUserDefault works ok on iOS
2011-05-06 17:01:41 +08:00
yangws
ced029257f
temp commit
2011-05-06 16:38:09 +08:00
minggo
7e40957e04
Merge https://github.com/cocos2d/cocos2d-x into iss455
2011-05-06 16:29:44 +08:00
minggo
80f739942d
issue #455 : compile CCUserDefault on iOS
2011-05-06 16:29:35 +08:00
minggo
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
Walzer
857141eef3
[ios] issue #371 , compatible with ios 4.1 4.2 4.3. switching different input methods will not cause crash
2011-05-06 15:43:36 +08:00
minggo
2c0bd49513
issue #455 : CCUserDefault ok on win32 & Android
2011-05-06 15:31:51 +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
Walzer
dcdad9a81a
Merge pull request #250 from yangws/481
...
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 00:53:10 -07:00
yangws
6eb24cafee
fixed #481 remove KeyLock control code.
2011-05-05 14:00:36 +08:00
yangws
7c5a6d779c
fixed #481 DisableKeyLock and DisableBackLightAutoTurnOff when BackLightTurnOn.
2011-05-05 11:51:13 +08:00
Walzer
b61c019b2c
[android] fixed #475 , CCImage::initWithString return true even if the bitmap hasn't been initialized. Thanks to Isaac Ashdown's fix on the forum.
2011-04-28 15:14:59 +08:00
yangws
d73699aabb
[ios] tests add RootViewController for rotate with ui object.
2011-04-28 14:19:12 +08:00
yangws
f8dc140840
change CCLabelTTF accept string from gb2312 to utf8.
2011-04-27 18:19:47 +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
9b08f4add6
keyboard notification message on ios and TextFieldTTF test code OK.
2011-04-26 16:33:20 +08:00
Walzer
b3f76a81a4
[win32] issue #471 , CCFileUtils::fullPathFromRelativeFile mustn't calculate realtive path twice
2011-04-26 14:53:57 +08:00
minggo
99733c602d
[android] fixed #462 : call applicationDidEnterBackground and applicationWillEnterBackground on android
2011-04-25 15:13:24 +08:00
Walzer
38ee881876
Merge branch 'master' of https://github.com/natural-law/cocos2d-x
2011-04-25 09:52:13 +08:00
natural-law
7337119501
issue #466 , Modify the interface to fit the refactor of CCFileUtils.
2011-04-25 09:40:10 +08:00
moadib
85afa22195
[android] fixed typo in CCEGLView method name
2011-04-24 18:52:21 +04:00
Walzer
386005ef79
issue #466 , Bin forget to modify CCFileUtils_ios.mm to fit the refactor, which cause compilation error.
2011-04-24 15:44:00 +08:00
yangws
252f3efe1a
CCIMEDispatcher works on android.
2011-04-22 16:33:41 +08:00
natural-law
e2ce006db2
fixed #466 . [wophone] Refactor the CCFileUtils for the new packing approach.
2011-04-22 10:57:46 +08:00
minggo
8458058f26
Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393
2011-04-20 17:19:03 +08:00
minggo
fd45cbea77
[android] fixed #393 : use new version of libxml2, it supports xpath and xslt
2011-04-20 17:08:50 +08:00
minggo
7b51fa8e9b
[android] fixed #393 : use new version of libxml2, it supports xpath and xslt
2011-04-20 16:11:18 +08:00
minggo
e5441a4fc2
fixed #450 : can set default pixel format other than RGBA8888
2011-04-20 15:34:33 +08:00
yangws
85027c40ca
CCIMEDispatcher works on ios.
2011-04-19 18:11:57 +08:00
minggo
0db048de73
Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456
2011-04-19 11:36:00 +08:00
minggo
c38af3c28d
fixed #456 : integrate libcurl into cocos2dx
2011-04-19 10:57:44 +08:00
yangws
d11bd85d00
CCTextFieldTTF works on win32.
2011-04-19 09:32:33 +08:00
minggo
a4e9f1c18d
libcurl works ok on ios
2011-04-18 14:12:41 +08:00
walzer
eb4b31e4da
update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox
2011-04-16 15:21:50 +08:00
minggo
37e7fad0d3
issue #456 : add curl test & libcurl.so works ok on android
2011-04-15 17:15:05 +08:00
minggo
3d6fd051ab
issue #449 : refactor CCTransition
2011-04-11 16:09:14 +08:00
minggo
37bb33d9e5
fixed #452 : refactor CCDirector CCNode CCGrid
2011-04-11 15:10:09 +08:00
natural-law
d4dbedca4d
fixed #451,remove the code of support mac platform.
...
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
2011-04-11 11:24:10 +08:00
yangws
b1ab937ec3
fix MouseEvent bug
2011-04-07 11:05:44 +08:00
Max Aksenov
b33aeac164
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:58:07 -07:00
Max Aksenov
6927dae38f
[airplay] renamed "CCEGLView::setFrameWitdAndHeight" to "CCEGLView::setFrameWidthAndHeight".
...
reformatted CCEGLView::setMotionTouch for unification with other functions of "setTouche".
2011-04-04 01:56:15 -07:00
walzer
de81120b6a
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-04-03 09:51:01 +08:00
walzer
28fbfb04dc
Merge branch 'iss349' of https://github.com/natural-law/cocos2d-x into natural-law-iss349
2011-04-03 09:30:26 +08:00
minggo
0aa8eb2892
fixed #350 : transitionfade flickers on both android and iphone
2011-04-02 16:16:19 +08:00
natural-law
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
minggo
39b60291ed
Merge branch 'issue_441' of https://github.com/minggo/cocos2d-x into minggo-issue_441
2011-04-01 17:34:17 +08:00
minggo
8fbfc2773a
Merge branch 'issue_440' of https://github.com/minggo/cocos2d-x into minggo-issue_440
2011-04-01 17:19:30 +08:00
minggo
7d52161804
fixed #441 : Initialize pointer in contruction & detect pointer value in destruction
2011-04-01 16:06:53 +08:00
Marat Yakupov
ac84278dae
[android] #443 implemented CCKeypadDelegate on android
2011-04-01 11:27:06 +04:00
minggo
2c539a1df5
[android] fixed #440 : CCMessage works ok on android
2011-04-01 11:35:26 +08:00
yangws
63801db3f6
fixed #440 Commit missing file last commit.
2011-03-31 11:23:58 +08:00
yangws
20539d4b89
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
2011-03-31 10:51:00 +08:00
yangws
f8a5a4ecf3
CCMessageBox works on ios.
2011-03-31 10:36:53 +08:00
walzer
70eb85e6df
Merge branch 'yangws-439'
2011-03-30 11:47:10 +08:00
yangws
7e81c56231
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 439
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils_ios.mm
2011-03-30 11:05:23 +08:00
walzer
35d94eb3a5
Merge branch 'iss411' of https://github.com/natural-law/cocos2d-x into natural-law-iss411
2011-03-30 10:44:34 +08:00
yangws
ba68a5b966
fixed #439 test OK.
2011-03-29 17:32:52 +08:00
natural-law
87ea85a986
fixed #411,support .plist format generated by zwoptex in the last version.
2011-03-29 16:59:50 +08:00
yangws
48d57b88e2
issue #439 ios and airplay midified.
2011-03-29 15:59:37 +08:00
yangws
1887417472
issue #439 ios and airplay midified.
2011-03-29 15:56:55 +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
yangws
6c5cf577b7
issue #439 wophone and android modified.
2011-03-29 15:05:53 +08:00
minggo
c686047f83
[android] fixed #422 : multitouch for android
2011-03-29 14:20:05 +08:00
natural-law
334786c633
fixed #391,Add implement of CCNS on airplay.
2011-03-29 13:59:10 +08:00
natural-law
edc33952be
fixed #391,Add support on ios and airplay.
2011-03-29 12:50:25 +08:00
natural-law
5f7357bf09
fixed #391,CCSpriteFrameCache support *.plist files with format value is not 0.
2011-03-29 11:56:14 +08:00
yangws
041953151a
issue #439 CCFileData and imageWithImageFile modified on win32.
2011-03-29 11:41:44 +08:00
natural-law
1991a65b0b
Merge branch 'master' into iss391
...
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
walzer
6cc09aa4dc
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
2011-03-28 21:08:56 +08:00
yangws
6b66affbab
fixed #396 wophone modified.
2011-03-28 17:20:39 +08:00
yangws
a9f85a2daa
issue #396 airplay modified.
2011-03-28 17:10:05 +08:00
natural-law
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
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
2011-03-28 17:06:32 +08:00
natural-law
ed2566e201
issue #434,Refactor class CCFileUtils on platform airplay.
2011-03-28 16:27:26 +08:00
yangws
a5040e0ccb
issue 396 ios modified.
2011-03-28 13:41:14 +08:00
yangws
814b66b089
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 396
2011-03-28 11:11:50 +08:00
yangws
dceff2d179
issue #396 android modified.
2011-03-28 11:09:49 +08:00
yangws
4b86cec4be
issue #396 win32 modifyed.
2011-03-28 10:44:14 +08:00
walzer
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +08:00
natural-law
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +08:00
walzer
f568ad8487
issue #379 , fix a bug caused by airplay port integration, which makes android port unable to load resources by zlib.
2011-03-26 14:09:42 +08:00
natural-law
28a940ab57
issue #434,refactor class CCFileUtils on win32 and wophone.
2011-03-26 13:52:33 +08:00
yangws
2015e468ca
fixed #417 When mouse pressed, capture it in EGLView.
2011-03-26 11:34:18 +08:00
walzer
95d672a858
add copyright & author name for airplay port
2011-03-25 15:30:10 +08:00
walzer
9b8bc8373b
fixed #431 , manually merge the WenSheng's work
2011-03-25 14:20:53 +08:00
walzer
fa5e71916b
issue #431 , manually merge WenSheng's work
2011-03-25 14:16:58 +08:00
walzer
ff91c91ea9
issue #427 android HelloWorld ok
2011-03-25 12:01:56 +08:00
walzer
799fb0994f
issue #427 , airplay port ok
2011-03-24 18:17:35 +08:00
walzer
db4fb7cc9c
issue #427 , refactor ios port ok.
2011-03-24 17:51:29 +08:00
walzer
b9c56f1728
issue #427 , try to add CCSAXParser.h
2011-03-24 16:16:49 +08:00
natural-law
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
walzer
ed492bbd1e
[airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution!
2011-03-23 22:16:20 +08:00
walzer
81fa070125
fixed #418 , add copyright of original authors, merge Bin's commit
2011-03-19 14:45:51 +08:00
walzer
d8c28d3754
Merge branch 'issue_409' of https://github.com/minggo/cocos2d-x into minggo-issue_409
2011-03-18 15:59:01 +08:00
walzer
b56014c70f
issue #376 , ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")
2011-03-18 15:17:15 +08:00
minggo
47173778cc
fixed #409 : rename NSArray UIAlignment
2011-03-18 14:31:29 +08:00
walzer
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
minggo
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
walzer
b4d757ce9e
fixed #408 @5m , fix memory leak in CCImage::_initWithPngData
2011-03-17 14:26:36 +08:00
yangws
fc2818cf21
fixed #404 enableRitinaDisplay return false on iphone3
2011-03-17 11:10:50 +08:00
yangws
61e2f56439
Add Retina display resource for tests.
...
Modify CCDrawingPrimitives.cpp for retina display support.
2011-03-15 15:12:50 +08:00
minggo
89db0334a3
revert the modification of CCNode_mobile.cpp and CCSprite.cpp
2011-03-15 10:27:16 +08:00
minggo
4b61e713e5
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 10:20:56 +08:00
natural-law
0c75af0f97
[android]fixed #356,CCLabelTTF::initWithString not crashed anymore.
2011-03-14 18:29:15 +08:00
yangws
1e67709e34
fixed #392 CC_SPRITE_DEBUG_DRAW OK.
2011-03-12 15:20:26 +08:00
natural-law
dd675f8cf1
[wophone]Resolve the memory leak of CCAccelerometer.
2011-03-11 17:41:19 +08:00
yangws
f0661a2679
fix 4 bugs:
...
1 call CCTextureCache::purgeSharedTextureCache() to release cached texture when enableRetinaDisplay is called.
2 enableRetinaDisplay performence correctly.
3 Modify libcocos2d project pre-link event performence corretly when the source in the path which contain white blacks.
4 Modify HiResTest, that can switch resouce dynamicly now.
2011-03-11 11:04:22 +08:00
minggo
a45125dafe
Merge branch 'issue385' of https://github.com/yangws/cocos2d-x into yangws-issue385
2011-03-10 17:20:32 +08:00
yangws
8335e30aef
fixed #385 Impliment CCLog on ios.
2011-03-10 17:08:38 +08:00
natural-law
93aebbc469
[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
2011-03-10 14:24:13 +08:00
minggo
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
natural-law
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
minggo
12981fac89
fixed #375
2011-03-09 16:19:20 +08:00
minggo
19470fda34
Merge branch 'iss383' of https://github.com/natural-law/cocos2d-x into natural-law-iss383
2011-03-09 14:55:45 +08:00
minggo
15368e6169
Merge branch 'issue373' of https://github.com/yangws/cocos2d-x into yangws-issue373
2011-03-09 14:53:51 +08:00
minggo
75e2ecc16d
issue #387 : move platform_support into cocos2dx/platform
2011-03-09 14:40:05 +08:00
minggo
63d283d3e8
delete ccxString.h
2011-03-09 12:00:04 +08:00
minggo
7aaf4be85f
move platform_support into cocos2dx/platform
2011-03-09 11:38:36 +08:00
natural-law
4c0ace849a
[wophone]fixed #383
...
1. Modify the approach of handle left soft-key clicked.
2. Fix some compile error.
2011-03-09 11:26:13 +08:00
yangws
151a0096fa
fixed #373 Hide PVRFrame window on win32.
...
Modify the PVR registry "hide_gui" false in CCApplication_win32.cpp.
2011-03-09 10:39:08 +08:00
minggo
1aafd4fc56
issue #375 : fix some compile error
2011-03-09 10:21:29 +08:00
minggo
f1d13ca2e1
issue #375 : android compiled ok
2011-03-08 13:49:58 +08:00
minggo
837b8c04bf
issue #375 : rename some macros
2011-03-08 09:29:41 +08:00
minggo
7a331e1e14
issue #375 : wophone compiled ok
2011-03-07 18:20:48 +08:00
minggo
b5a99f90df
issue #375 : rename file names and object names
2011-03-07 17:11:57 +08:00
minggo
632cf39a8a
fix a bug when merging master into dev
2011-03-07 10:34:42 +08:00
minggo
aaf898cb72
merge master into dev
2011-03-07 09:52:45 +08:00
minggo
661bae2797
merge natural-law-iss370
2011-03-04 16:32:54 +08:00
natural-law
aef83b2660
[uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication.
2011-03-02 17:45:04 +08:00
minggo
4379a1c96f
Move ccxApplication to cocos2dx/platform on ios.
2011-03-02 17:05:22 +08:00
minggo
f7b401163b
Merge branch 'multitouchController' of https://github.com/Macarse/cocos2d-x into Macarse-multitouchController
2011-03-02 09:38:23 +08:00
minggo
89b4d07ed8
[android] fixed #368 : move Application code to cocos2dx/platform/ccxApplication
2011-03-01 19:53:39 +08:00
minggo
fc75306402
[android] fix a bug when run in HVGA
2011-03-01 18:34:06 +08:00
minggo
b65d84551b
resolve confict when merging branch yangws-issue366
2011-03-01 14:08:18 +08:00
yangws
7bc7d32001
fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication
2011-03-01 12:41:57 +08:00
minggo
1b6602f582
Merge branch 'WVGA_scale_android' of https://github.com/minggo/cocos2d-x into minggo-WVGA_scale_android
2011-02-28 10:00:55 +08:00
minggo
f504211e56
merge natural-law-iss332 to dev
2011-02-28 09:48:14 +08:00
minggo
498e0072e1
[android] fixed #358 : autoscale HVGA resource to WVGA
2011-02-26 15:52:57 +08:00
minggo
0453eb0266
[android] issue #338:refactor platform_support
2011-02-24 19:42:45 +08:00
yangws
03e946a34f
Delete unused files.
2011-02-23 18:24:29 +08:00
yangws
63cedd1317
Merge code of Platform_support for IOS.
2011-02-23 18:22:05 +08:00
natural-law
949c1000a8
update tests to 0.99.5.
2011-02-23 16:47:25 +08:00
minggo
36cb90aaa0
Merge branch 'jpgsupport' of https://github.com/minggo/cocos2d-x into minggo-jpgsupport
2011-02-23 14:13:48 +08:00
minggo
3dde0ebcf5
[android] fixed #353 : support jpg on android
2011-02-23 13:43:45 +08:00
natural-law
4362a5f381
[uphone]issue #316,Resolution auto adjustment.
2011-02-19 17:44:43 +08:00
natural-law
60e9ae873c
Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316
...
Conflicts:
HelloWorld/AppDelegate.cpp
tests/AppDelegate.cpp
2011-02-19 10:19:14 +08:00
yangws
85b9c9ae21
Retina display support and scale with keep w/h rate ok on win32.
2011-02-18 18:30:22 +08:00
Macarse
4267593bf9
Used an array approach
2011-02-17 23:23:36 -03:00
natural-law
8035fc366c
[uphone]Support read image file from zip file.
2011-02-17 16:16:50 +08:00
natural-law
e4063fd190
[uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device.
2011-02-17 14:31:52 +08:00
natural-law
0f52839efb
[uphone]support wrap when the dimensions is specified in CCLabelTTF.
2011-02-16 11:03:32 +08:00
walzer
693a8f049b
[iphone] test alignment in labels, ref to the post http://www.cocos2d-x.org/boards/6/topics/588?r=589#message-589 Thanks to Slaz
2011-02-14 11:51:56 +08:00
walzer
626a3f8b74
[uphone] fixed #348 , text drawing blur if color=white and fontSize<24
2011-02-12 22:42:42 +08:00
yangws
8458476597
Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
.gitignore
2011-02-12 16:42:47 +08:00
minggo
81848f19e6
Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345
2011-02-12 11:29:27 +08:00
minggo
eef0bd4578
[iphone] fixed bug #345 : remove init invoking
2011-02-11 16:06:09 +08:00
Macarse
8d5995d5a6
First approach
2011-02-06 17:05:56 -03:00
Macarse
66038230eb
Added logic to disable sensors from the c++ code
2011-02-05 20:17:24 -03:00
Macarse
284c330569
Added code from walzer's comment
2011-02-01 00:11:42 -03:00
Macarse
fce540989d
First approach
2011-01-30 20:05:30 -03:00
yangws
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
yangws
76ea63da7f
Change prefix CCX to ccx.
2011-01-27 17:07:36 +08:00
walzer
3260eddd75
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-26 17:11:39 +08:00
walzer
ead71525e2
[uphone] don't block when zip resources loading failed
2011-01-26 17:08:19 +08:00
minggo
a0ecaed1ef
[android] define s_bPopupNotify
2011-01-26 16:45:27 +08:00
minggo
54dc660f6b
[android] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:44:58 +08:00
minggo
39165142b8
[iphone] change the declaration of s_bPopupNotify from public to private and define it
2011-01-26 16:44:12 +08:00
minggo
31d287a77d
[uphone]change the declaration of s_bPopupNotify from public to private
2011-01-26 16:42:48 +08:00
minggo
072ed1651e
[win32] change the declaration of s_bPopupNotify from public to private
2011-01-26 16:41:59 +08:00
walzer
a732665b85
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2011-01-26 15:48:02 +08:00
natural-law
3746af1d63
fixed #328.Modify the function and parameter name.
2011-01-26 15:43:12 +08:00
natural-law
7015e85918
fixed #328.By default,pop up a err dialog when loading textures failed.
2011-01-26 11:50:13 +08:00
walzer
950a284b94
[iphone] fixed #289 , clear a warning.
2011-01-26 11:31:01 +08:00
minggo
9e2587c26c
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-25 17:09:11 +08:00
natural-law
6a1b8d64aa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-25 15:09:34 +08:00
natural-law
d56575dd5a
[uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath.
2011-01-25 14:26:26 +08:00
walzer
462ac4823f
bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422
2011-01-25 11:33:03 +08:00
minggo
9eff0da20a
fix warning when building on android
2011-01-24 10:51:30 +08:00
yangws
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
minggo
e23c1eb2f6
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-22 16:45:26 +08:00
yangws
bc9bfdc30c
Move win32/CCXApplication to platform_support
2011-01-22 16:24:54 +08:00
minggo
4a4c0d3485
[android] fixed #321 : Frame control of android. It is not so accuracy.
2011-01-22 15:10:18 +08:00
minggo
9d8f0f4b17
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2011-01-21 18:18:13 +08:00
minggo
882b473291
[iphone]: font support
2011-01-21 18:15:12 +08:00
minggo
cb7a0e553a
[iphone]: frame control
2011-01-21 17:33:15 +08:00
natural-law
6bde512cbe
[android]issue #268,support more fonts on cocos2d-android.
2011-01-21 17:32:11 +08:00
natural-law
31fc6c0039
[uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground().
2011-01-20 13:55:45 +08:00
natural-law
f7107fb015
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
...
Conflicts:
cocos2dx/platform/uphone/CCXApplication_uphone.h
2011-01-20 13:47:01 +08:00
natural-law
3d225465c0
[uphone]fixed #308,BGM is paused when press power key to make uphone sleep.
2011-01-20 13:41:58 +08:00
yangws
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
yangws
ee50078b3e
implement FPS limitation on UPhone.
2011-01-20 10:49:30 +08:00
walzer
b7e109f6e6
fixed iphone/android/uphone compilation errors brought by the prevous commit of #322
2011-01-19 22:29:57 +08:00
walzer
9347fadc71
[win32] fixed #322 , FPS control on win32
2011-01-19 18:23:42 +08:00
walzer
e404a6aeb9
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2011-01-19 18:11:21 +08:00
yangws
d627608ff4
win32 platform fps limitation support.
2011-01-19 17:59:20 +08:00
walzer
816deced9e
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-19 16:41:47 +08:00
walzer
a0c50d3edb
[iphone] support UTF8 Chinese chars
2011-01-19 16:26:55 +08:00
yangws
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
yangws
79b711a758
move CCXBitmapDC from cocos2d/platform to platform_support.
2011-01-19 14:23:26 +08:00
natural-law
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
natural-law
c682dd7084
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-18 10:16:35 +08:00
natural-law
acb4a6a369
[uphone]fixed #293,modify the absolute path method in CCFileUtils.
2011-01-18 10:14:44 +08:00
walzer
e399a77369
fixed #306 , invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval.
2011-01-17 22:01:15 +08:00
walzer
ad5ee3c9f6
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
2011-01-17 16:21:11 +08:00
yangws
67c0ad6332
add platform support project on win32.
...
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
2011-01-15 18:05:35 +08:00
natural-law
acff950860
[uphone]fixed #315,remove the way which use resource in ResourceMap.
2011-01-14 17:42:37 +08:00
minggo
6043008a11
Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track
2011-01-13 13:52:20 +08:00
natural-law
5fe891408c
[win32]fixed #314,when function CCDirector::setDeviceOrientation() be called calculate the Projection and window size again.
2011-01-13 10:14:32 +08:00
natural-law
d1c6c466d3
fixed #312,fix the bug of CCXBitmapDC in cocos2d-win32.
2011-01-12 15:48:36 +08:00
natural-law
00a9615e0f
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-10 18:08:57 +08:00
natural-law
237042f7dd
fixed #309,App will not crash any more when surface re-created.
2011-01-10 17:54:44 +08:00
minggo
d405d3a1ba
fixed #310 :
2011-01-10 16:03:53 +08:00
minggo
7e30615d02
issue #304 Remove codes for controlling frame rate.
2011-01-10 15:13:30 +08:00
Walzer
653cb2d76d
[uphone] fixed #308 , BGM can be paused after power key pressed to make uphone sleep.
2011-01-10 11:03:58 +08:00
minggo
78a7329054
Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5
2011-01-08 09:27:58 +08:00
natural-law
c02a9a4dd5
Setting apk file path at runtime in cocos2d-android.
2011-01-07 16:29:06 +08:00
natural-law
ec7fbd0e69
Fix bugs.
...
1. Run tests and HelloWorld in cocos2d-android.
2. Modify the makefile of cocos2d-uphone.
2011-01-07 11:30:19 +08:00
minggo
1f08213563
HelloWorld runs ok on iphone
2011-01-07 11:27:42 +08:00
minggo
a391c8ef99
fixed some errors for iphone platform
2011-01-07 10:25:32 +08:00
minggo
99dd33f94a
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into upto-0.99.5
2011-01-07 09:33:09 +08:00
minggo
9a959c299f
fixed some errors of iphone platform
2011-01-07 09:35:27 +08:00
natural-law
e0570d43ad
Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful.
2011-01-06 14:04:03 +08:00
natural-law
0d2d746aec
Fix bugs.Run tests in cocos2d-uphone successful.
2011-01-05 17:01:08 +08:00
natural-law
1b37dd27ad
Fix bugs.Run HelloWorld successful.
2011-01-05 11:24:52 +08:00
natural-law
25e9721678
fix bugs.
2011-01-04 17:46:23 +08:00
Walzer
4a6989b6ff
[uphone] add keyMenuBack to CCKeypadDelegate
2010-12-31 18:15:30 +08:00
natural-law
711f3a2906
modify YES to true,and No to false.
2010-12-31 17:56:46 +08:00
Walzer
56f8bf3c40
[uphone] use a shared TWindow to draw bitmaps and texts, this optimization promotes the performance on uphone about 5%~6%
2010-12-31 16:07:52 +08:00
minggo
d0a16a246e
fixed comipling error and link error of upto-0.99.5
2010-12-31 14:56:24 +08:00
natural-law
3dfd530b38
Merge branch 'iss295' into upto-0.99.5
2010-12-31 09:48:48 +08:00
natural-law
34f45c8faa
Implement CCEventDispatcher.
2010-12-31 09:36:53 +08:00
Walzer
eac572b2c9
[uphone] remove CfgGetScreenStatus call from EVENT_WinPaint, this api is out-of-process & inefficient
2010-12-30 15:42:11 +08:00
minggo
8af9edbcf8
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 14:44:34 +08:00
minggo
88de01d915
update some files in platfomr/iphone to 0.99.5
2010-12-30 14:22:25 +08:00
minggo
b0e5c06d37
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2010-12-30 10:36:17 +08:00
minggo
da00d82117
fix some error in CCGrid and CCDirector.h
2010-12-30 10:28:13 +08:00
minggo
7b804d985b
merge yangws-upto-0.99.5 into upto-0.99.5
2010-12-30 10:25:35 +08:00
minggo
dc55c164ba
fixed #292
2010-12-29 18:01:37 +08:00
Li Lirong
e58ba468ee
fix some warnings under android
2010-12-29 10:30:42 +08:00
yangws
0edf124e4f
issue #281 CCParticleExamples upto-0.99.5
2010-12-28 14:04:28 +08:00
yangws
5e377f9368
issue #281 CCParticleSystemPoint.h upto-0.99.5
2010-12-28 11:09:40 +08:00
minggo
b2b8591b26
fixed #279
2010-12-28 10:23:14 +08:00
minggo
33ad2881b7
merge mingo-upto-0.99.5 to upto-0.99.5
2010-12-27 11:06:44 +08:00
minggo
28a3857f95
Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5
2010-12-27 10:59:03 +08:00
minggo
4e35a660dc
Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5
2010-12-27 10:55:59 +08:00
minggo
4cd3e59e2b
fixed #278
2010-12-27 10:26:56 +08:00
natural-law
01cd90f2cc
update layers_scenes_transition_nodes to 0.99.5.
2010-12-27 09:40:45 +08:00
yangws
c142070c2c
misc_node upto-0.99.5.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-25 15:09:42 +08:00
natural-law
6ee16ce878
update menu_nodes to 0.99.5
2010-12-25 11:15:19 +08:00
minggo
e7231f232c
fixed #276
2010-12-24 15:53:51 +08:00
minggo
d6fb209861
merged from minggo-upto-0.995 to upto-0.99.5
2010-12-24 15:21:57 +08:00
minggo
f92b0d514e
fixed #273
2010-12-24 15:04:26 +08:00
minggo
6d98bc7b5d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-23 16:22:37 +08:00
minggo
7e4d8b9d1c
set up base environment
2010-12-23 16:16:11 +08:00
minggo
3692d01c5a
fixed #288
2010-12-23 14:18:08 +08:00
Walzer
f65a6eb90b
[iphone-cpp] load image from buffer, support some PD formats
2010-12-20 18:46:58 +08:00
Walzer
639d75e6eb
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-18 16:36:08 +08:00
yangws
6d71a5b0f2
if defined COCOS2D_DEBUG, show messagebox when UIImage can't find resource file on disk.
2010-12-18 15:00:26 +08:00
natural-law
792781f5d6
fixed #266 fix a bug of message box in cocos2d-uphone pop-up at the wrong time.
2010-12-18 14:44:24 +08:00
Leon
96f4f5c9fd
fix some compiling warning for iOS
2010-12-17 23:44:19 +08:00
Walzer
988d7289b8
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-17 20:40:16 +08:00
Walzer
63bfa195db
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-17 20:36:24 +08:00
yangws
53bc90f634
fix UImage Constructor error
2010-12-17 18:16:31 +08:00
minggo
e287466c2f
fixed #246
2010-12-17 11:39:25 +08:00
Walzer
c8989c7941
fix a memory leak when invoking png_destroy_read_struct, for uphone & andorid platform
2010-12-17 10:14:56 +08:00
unknown
31951603a4
Fixed a memory leak in the Win32 version of the PNG reading code.
...
The png_info struct wasn't being properly free'd (leaving behind row data).
(looks like it might also apply to the 'uphone' version but I have no way of testing)
2010-12-16 12:23:27 +00:00
minggo
53753b65b5
merge bada platform
2010-12-15 18:05:02 +08:00
natural-law
b8b5c2e8cd
fixed #258 Modify the files which include FileUtils.h.
2010-12-14 14:05:35 +08:00
natural-law
2576bbe5b4
Merge branch 'master' into iss258
2010-12-14 13:53:25 +08:00
Walzer
02e95f6b06
issue #243 fix a memory leak point of iphone-cpp version. but the leaks isn't completely clear yet.
2010-12-14 11:21:44 +08:00
natural-law
2c84b167e0
fixed #258 Move FileUtils.h from path "support/file_support" to path "include".
2010-12-14 10:45:23 +08:00
natural-law
8cb331994d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2010-12-13 17:55:02 +08:00
natural-law
2706e3a003
fixed #251 CCKeypadDelegate implement
2010-12-13 14:10:39 +08:00
minggo
1f34709c03
Merge branch 'master' of https://github.com/minggo/cocos2d-x
2010-12-11 13:40:16 +08:00
minggo
562930f816
fixed #252
2010-12-11 13:33:53 +08:00
Walzer
9737e908ab
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
2010-12-11 09:49:59 +08:00
Walzer
dec419be71
Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master
2010-12-10 10:34:41 +08:00
natural-law
6c1eb5d5c0
fixed #227 integrate multi-touch support on uphone
2010-12-09 18:28:16 +08:00
minggo
f3126de646
Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master
2010-12-09 13:59:02 +08:00
yangws
1151cea7dd
fixed 233 keep the backlight on when the cocos2d-game at foreground.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-09 11:41:32 +08:00
minggo
6b37bc97d4
fixed #220 : run tests on android
2010-12-09 10:50:02 +08:00