James Chen
c296ab363f
issue #1687 : Comments some logs output for CCFileUtils.
2013-02-01 11:53:05 +08:00
James Chen
63778570d2
issue #1687 : [Marmalade] If the font name wasn't end with `.ttf`, skip making a full path.
2013-02-01 11:40:55 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
xyhl515
3316f8c961
Update extensions/GUI/CCControlExtension/CCControlSwitch.cpp
...
implement setOn(isOn,false)
2013-01-31 22:12:37 +08:00
James Chen
9b5d0bd251
Merge pull request #1935 from moadib/bb_eglview_event_handler
...
fixed #1015 : Added CCEGLView::EventHandler class for Blackberry platform.
2013-01-30 22:31:03 -08:00
James Chen
eb7cae93fd
Merge pull request #1937 from dumganhar/revert-ttf-update
...
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-30 22:28:48 -08:00
James Chen
da59570214
Reverted the logic of CCLabelTTF::updateTexture.
2013-01-31 14:26:45 +08:00
James Chen
e84aeb97dc
Merge pull request #1936 from dumganhar/win32-editbox
...
fixed #1634 : Added the very first implementation of CCEditBox for Win32.
2013-01-30 22:08:52 -08:00
James Chen
157e229f8c
fixed #1634 : Added the very first implementation of CCEditBox for Win32.
2013-01-31 14:04:49 +08:00
James Chen
3bdfb82e9c
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
...
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-01-30 22:31:19 +08:00
moadib
4d271e782b
Added CCEGLView::EventHandler class for Blackberry platform
...
Added CCEGLView ::getWindowGroupId() method for Blackberry platform
2013-01-30 18:28:06 +04:00
James Chen
ba3b2b7aa6
Update AUTHORS
2013-01-30 14:26:56 +08:00
James Chen
6b0417902c
Merge pull request #1932 from Weeds/feature_linux-font-alignment
...
fixed #1689 : [Linux] fixed horizontal font alignment.
2013-01-29 22:22:01 -08:00
James Chen
a38bd38dd8
Merge pull request #1931 from Weeds/feature_linux-load-ttf
...
fixed #1688 : [Linux] fixed loading truetype fonts from resource directory.
2013-01-29 22:18:43 -08:00
Andre Rudlaff
9b8f3ca01e
[Linux] fixed horizontal font alignment
...
kAlignTop and kAlignBottom should center text horizontally
2013-01-30 02:04:59 +01:00
Andre Rudlaff
5959c24b80
[Linux] fixed loading truetype fonts from resource directory
...
We should use CCFileUtils to get the full path to font resources.
Additionally the input font is converted to lowercase for checking if it is
a ttf file. So we can also load .TTF or .tTf files.
2013-01-30 01:43:21 +01:00
Nat Weiss
9b98e4548f
Added TMX polygon parsing.
2013-01-29 14:45:41 -08:00
James Chen
e02bc8ad30
Merge pull request #1929 from dumganhar/master
...
Updating JS Tests.
2013-01-29 06:33:02 -08:00
James Chen
8192735577
Updating JS Tests.
2013-01-29 22:30:01 +08:00
minggo
99f8a029fc
Merge pull request #1928 from minggo/master
...
set build option to -O1 for js xcode project when building with debug option
2013-01-29 05:00:51 -08:00
minggo
c071620951
set build option to -O1 for js xcode project when building with debug option
2013-01-29 20:58:34 +08:00
minggo
67a2ff5199
Merge pull request #1927 from dumganhar/master
...
Comments some logs in CCFileUtils.
2013-01-29 03:16:01 -08:00
James Chen
bb431c54ed
Comments some logs in CCFileUtils.
2013-01-29 19:12:55 +08:00
James Chen
5e7ca24335
Updating win32 project configurations.
2013-01-29 19:04:57 +08:00
minggo
4d9877617b
Merge pull request #1863 from rohankuruvilla/gles20
...
Adding Readme for CocosPlayer
2013-01-29 02:51:18 -08:00
minggo
fb1a32e696
Merge pull request #1923 from dumganhar/master
...
Updating doxygen comments for CCFileUtils.h.
2013-01-29 02:50:16 -08:00
James Chen
c2dd135785
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x
2013-01-29 18:49:07 +08:00
James Chen
e1f6c37c2f
Updating file search logic for CocosDragonJS.
2013-01-29 18:48:19 +08:00
minggo
aa306d637e
Merge pull request #1926 from minggo/master
...
Synchronize from upstream
2013-01-29 02:16:29 -08:00
minggo
f8d6ee0b83
update codes from upstream
2013-01-29 18:15:49 +08:00
minggo
de7dfdbc2c
Merge pull request #1925 from minggo/master
...
update js-tests codes from upstream and fix a logical bug of CCRect
2013-01-29 02:08:08 -08:00
minggo
eb72ac3b50
update js-tests codes from upstream
2013-01-29 18:05:30 +08:00
Rohan Kuruvilla
af86f534dc
Adding readme file for CocosPlayer for Android
2013-01-29 01:45:16 -08:00
James Chen
2ca28d7e3d
Updating comments for CCFileUtils.h.
2013-01-29 16:45:11 +08:00
James Chen
632b91ee08
Updating comments for CCFileUtils.h.
2013-01-29 16:31:28 +08:00
James Chen
0cd9efcf6d
Updating comments for CCFileUtils.h.
2013-01-29 16:28:59 +08:00
James Chen
3cff253446
Updating comments for CCFileUtils.h.
2013-01-29 16:10:18 +08:00
James Chen
558a4bb3cc
Updating comments for CCFileUtils.h.
2013-01-29 16:07:50 +08:00
James Chen
0bd2e11d75
Updating comments for CCFileUtils.h.
2013-01-29 15:56:08 +08:00
James Chen
0141b7856d
Updating comments for CCFileUtils.h.
2013-01-29 15:52:33 +08:00
James Chen
13c494ad69
Updating doxygen comments for CCFileUtils.h.
2013-01-29 15:50:57 +08:00
James Chen
d14ccdf417
Merge pull request #1922 from dumganhar/master
...
Updating Android Template. Updating CCFileUtils.cpp for BlackBerry.
2013-01-28 23:11:49 -08:00
James Chen
170fb32b6c
Updating CCFileUtils.cpp for BlackBerry.
2013-01-29 15:07:36 +08:00
James Chen
f0c2d310ee
Updating Android Template.
2013-01-29 15:03:36 +08:00
James Chen
b4b2ab4f24
Merge pull request #1921 from dumganhar/master
...
Adding CrystalCraze to vs2012 solution.
2013-01-28 22:39:26 -08:00
James Chen
4c3cf23bda
Adding CrystalCraze to vs2012 solution.
2013-01-29 14:37:54 +08:00
minggo
fbcb33eefd
make CCRect accept width<0 and height<0
2013-01-29 14:03:03 +08:00
James Chen
dd3435c953
Merge pull request #1920 from dumganhar/master
...
Updating JS Test, Removing wav files in Published-Android.
2013-01-28 21:34:44 -08:00
James Chen
c1d0f29f6c
Updating JS Test, Removing wav files in Published-Android.
2013-01-29 13:33:49 +08:00
James Chen
fac6f6cf31
Merge pull request #1919 from dumganhar/master
...
Fixed a bug in TestCpp/EffectsAdvancedTest. Adding getPosition method for Len3DTarget.
2013-01-28 21:02:08 -08:00