James Chen
|
137679d369
|
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
|
2012-04-10 16:32:53 +08:00 |
minggo
|
355e27dada
|
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
|
2012-04-08 14:16:29 +08:00 |
James Chen
|
c6457dfed8
|
issue #1056: Updated ios project configuration.
|
2012-03-29 10:09:41 +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
|
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 |
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
|
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
|
528a769cf6
|
fixed #762: make label display on center on iOS
|
2012-03-02 11:15:44 +08:00 |
minggo
|
b0b6b85a79
|
fixed #946: HD image for both retina and normal
|
2012-02-16 10:47:16 +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 |
minggo
|
28d0737bf3
|
fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS
|
2011-12-20 14:18:53 +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 |
Leon
|
f108952595
|
Merge remote branch 'upstream/master'
Conflicts:
cocos2dx/support/CCPointExtension.cpp
|
2011-11-29 10:15:15 +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 |
minggo
|
4226fcf355
|
issue #854: add CCThread_ios.mm
|
2011-11-21 09:34:49 +08:00 |
minggo
|
522386a6b7
|
issue #854: pthread work ok on iOS
|
2011-11-18 09:55:47 +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 |
Walzer
|
47c9020b85
|
fixed #738: caculate label height if not set
|
2011-10-14 14:33:08 +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 |
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
|
ab2a6cb2bb
|
fixed #702 tests crashs at the start on wophone device
|
2011-08-30 15:59:06 +08:00 |
minggo
|
414791a684
|
issue #675: initialize acceleration_
|
2011-08-30 10:34:29 +08:00 |
minggo
|
b38105a70b
|
issue 675: dispatch accelerometer data to one delegate
|
2011-08-29 18:18:39 +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 |
Walzer
|
4244fdb62b
|
fixed #643, swap accelerometer input x/y according to the orientation (on ios devices)
|
2011-08-17 20:11:33 +08:00 |
Leon
|
771e2349c5
|
fix some warnings under xcode 4.0 llvm compiler
|
2011-08-10 22:39:02 +08:00 |
minggo
|
41ea2e98a1
|
fixed #642: CCRenderTexture::saveBuffer() works ok on iOS
|
2011-08-08 11:01:47 +08:00 |
minggo
|
76da5f2e84
|
fixed #656: remove unneeded methods & android can let user set resource path
|
2011-08-04 17:19:58 +08:00 |
minggo
|
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 |
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
|
d48c3fdfb1
|
upgrade to 1.0.0-final 07-11
|
2011-07-12 11:20:41 +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
|
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 |
natural-law
|
cfee246959
|
fixed #323, Add an interface to get the current language.
|
2011-06-17 10:49:02 +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 |
yangws
|
ec23d7ed55
|
fixed #508 Dynamic switch retina display support.
|
2011-05-23 16:21:31 +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 |
Walzer
|
249724f8d8
|
[ios] issue #371, fix the error when invoke CCImage::initWithString with null string ""
|
2011-05-12 08:24:29 +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 |
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 |
yangws
|
d73699aabb
|
[ios] tests add RootViewController for rotate with ui object.
|
2011-04-28 14:19:12 +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
|
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
|
85027c40ca
|
CCIMEDispatcher works on ios.
|
2011-04-19 18:11:57 +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 |
yangws
|
63801db3f6
|
fixed #440 Commit missing file last commit.
|
2011-03-31 11:23:58 +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 |
yangws
|
ba68a5b966
|
fixed #439 test OK.
|
2011-03-29 17:32:52 +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 |
natural-law
|
edc33952be
|
fixed #391,Add support on ios and airplay.
|
2011-03-29 12:50:25 +08:00 |
natural-law
|
1991a65b0b
|
Merge branch 'master' into iss391
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
|
2011-03-29 10:20:57 +08:00 |
walzer
|
6cc09aa4dc
|
Merge branch '396' of https://github.com/yangws/cocos2d-x into yangws-396
|
2011-03-28 21:08:56 +08:00 |
yangws
|
a5040e0ccb
|
issue 396 ios modified.
|
2011-03-28 13:41:14 +08:00 |
natural-law
|
cee82fe9fa
|
issue #434,refactor class CCFileUtils on android and ios.
|
2011-03-26 17:24:37 +08:00 |
natural-law
|
55143e3b9e
|
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
|
2011-03-24 10:38:08 +08:00 |
walzer
|
b56014c70f
|
issue #376, ios version compilation error when when COCOS2D_DEBUG = 1, fix CCLOG(@"...") to CCLOG("")
|
2011-03-18 15:17:15 +08:00 |
yangws
|
fc2818cf21
|
fixed #404 enableRitinaDisplay return false on iphone3
|
2011-03-17 11:10:50 +08:00 |
minggo
|
12981fac89
|
fixed #375
|
2011-03-09 16:19:20 +08:00 |
minggo
|
7aaf4be85f
|
move platform_support into cocos2dx/platform
|
2011-03-09 11:38:36 +08:00 |
minggo
|
4379a1c96f
|
Move ccxApplication to cocos2dx/platform on ios.
|
2011-03-02 17:05:22 +08:00 |