Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,366 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

7366 Commits

Author SHA1 Message Date
James Chen b5bd48eaee Merge pull request #1948 from dumganhar/master 
Using new api of CCFileUtils for SimpleGame.
 2013-02-02 23:40:29 -08:00
James Chen a22986bc82 Using new api of CCFileUtils for SimpleGame. 2013-02-03 15:38:44 +08:00
James Chen 46902ee399 Merge pull request #1947 from CocosRobot/updategeneratedsubmodule_1359874540 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-02 23:00:06 -08:00
CocosRobot d3086850c7 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-03 14:55:53 +08:00
James Chen fe4d3adfdd Merge pull request #1946 from dumganhar/master 
issue #1687: Updating iOS template after refactoring CCFileUtils.
 2013-02-02 21:59:09 -08:00
James Chen 23acb3eacd issue #1687: Updating iOS template after refactoring CCFileUtils. 2013-02-03 13:56:44 +08:00
minggo 64a107d2f6 Update AUTHORS 2013-02-03 11:19:35 +08:00
minggo 7f594f00b8 Merge pull request #1930 from NatWeiss/tmxpolygons 
Added TMX polygon parsing.
 2013-02-02 19:17:44 -08:00
minggo ae3c771865 Merge pull request #1941 from dumganhar/iss1687-refactor 
issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms.
 2013-02-02 19:11:31 -08:00
James Chen a0bf0d8655 issue #1687: Moving the implementation of NS2CC.mm to CCFileUtilsIOS(MAC).mm. 2013-02-03 10:56:59 +08:00
dualface f8c372ca9b fix CCLuaLog() 2013-02-02 15:05:30 +08:00
dualface c58a63aa92 fix for android 2013-02-02 14:56:09 +08:00
dualface 84e18cc06e merge upstream 2013-02-02 12:24:19 +08:00
dualface d6686fe57c Merge branch 'upstream_master' into add_webp_support 2013-02-02 12:24:05 +08:00
dualface 7839ceb45b add CCLuaObjcBridge 2013-02-02 02:05:52 +08:00
James Chen e25c79f1ec issue #1687: CCFileUtils::isFileExist now support relative path. 2013-02-01 22:19:58 +08:00
James Chen c362f7e439 issue #1687: Adding new test - Checking whether file exists. 2013-02-01 22:18:43 +08:00
James Chen ae0b973cf1 issue #1687: Moving the global function( ccFileUtils_dictionaryWithContentsOfFileThreadSafe, ccFileUtils_arrayWithContentsOfFileThreadSafe) to the CCFileUtils class. 
)
 2013-02-01 18:48:44 +08:00
James Chen 1acdf1c957 issue #1687: Updating the comments for CCFileUtils. 2013-02-01 17:16:33 +08:00
James Chen 357da4f2fc issue #1687: Updating the comments for CCFileUtils. 2013-02-01 16:46:15 +08:00
James Chen 15002030c2 Update AUTHORS 2013-02-01 16:11:58 +08:00
James Chen e345a098ee Merge pull request #1939 from xyhl515/master 
fixed #1691: CCControlSwitch::setOn(isOn,false) doesn't work.
 2013-02-01 00:08:02 -08:00
James Chen a110778739 issue #1687: Updating comments for CCFileUtils. 2013-02-01 15:41:41 +08:00
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