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

7828 Commits

Author SHA1 Message Date
minggo 8c1a639c59 Merge branch 'iss1689-add-CCLuaObjcBridge' of https://github.com/minggo/cocos2d-x into iss1689-add-CCLuaObjcBridge 2013-02-04 16:19:21 +08:00
minggo 8511e75745 fixed #1689:fixed a compiling error 2013-02-04 16:17:59 +08:00
minggo 1ea0570620 Merge pull request #1955 from minggo/iss1689-add-CCLuaObjcBridge 
modify lua samples to make them work correctly
 2013-02-03 23:12:10 -08:00
minggo 5163ef0d07 Merge pull request #5 from dumganhar/iss1689-add-CCLuaObjcBridge 
issue #1689: Adding some missing files for win32.
 2013-02-03 23:04:52 -08:00
James Chen 4506214cef issue #1689: Adding some missing files. 2013-02-04 15:01:44 +08:00
minggo 07cd6d2bb2 issue #1689:modify lua samples to make them work correctly 2013-02-04 14:50:45 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
minggo a771bc8183 issue #1689:modify lua Android.mk 2013-02-04 12:02:21 +08:00
dualface c13965c939 remove duplicate codes 2013-02-04 11:52:16 +08:00
James Chen 7f81db038c issue #1697: fixed two logical error in CCRenderTexture::initWithWithAndHeight. 2013-02-04 11:33:13 +08:00
minggo 744bfb3cb2 Merge pull request #1945 from dualface/add_CCLuaObjcBridge 
add CCLuaObjcBridge
 2013-02-03 19:32:17 -08:00
dualface 74e497bb2b restore CCLuaEngine missed methods 2013-02-04 11:28:09 +08:00
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