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

17581 Commits

Author SHA1 Message Date
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash 
Crash while clicking close button on desktop platforms
 2014-03-14 18:26:34 +08:00
James Chen c4fc97a20c Merge pull request #5799 from samuele3hu/develop_3_fix 
fix: Make `Close Menu` of lua_tests invisible for iOS platform
 2014-03-14 18:13:56 +08:00
James Chen 70d534bf41 Update CHANGELOG [ci skip] 2014-03-14 18:08:58 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label 
closed #4377: LabelAtlas::setColor takes no effect.
 2014-03-14 18:07:36 +08:00
minggo cd9e57f577 Merge pull request #5801 from minggo/lua-template-linux 
copy lua files
 2014-03-14 18:03:29 +08:00
minggo 1aedf01590 copy lua files 2014-03-14 18:01:53 +08:00
minggo 1ab6856cd2 Merge pull request #5800 from minggo/lua-template-linux 
add websockets link
 2014-03-14 17:51:35 +08:00
minggo 3c96ef9394 add websockets link 2014-03-14 17:46:18 +08:00
samuele3hu 0eb1903811 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix 2014-03-14 17:39:59 +08:00
samuele3hu a05d6a55e2 fix: Make Close Menu invisible for iOS platform 2014-03-14 17:38:58 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color. 
MenuItem:using Label to replace LabelTTF.
 2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
minggo 5e2eb24b1d Merge pull request #5797 from minggo/lua-template-linux 
lua tempalte support for linux
 2014-03-14 16:59:57 +08:00
minggo 7bddf7f36a lua tempalte support for linux 2014-03-14 16:58:33 +08:00
James Chen 4cbad19dfe Merge pull request #5796 from CocosRobot/update_lua_bindings_1394786638 
[AUTO]: updating luabinding automatically
 2014-03-14 16:52:58 +08:00
CocosRobot a090729b6e [AUTO]: updating luabinding automatically 2014-03-14 08:44:57 +00:00
James Chen 5c3069b4ec Merge pull request #5794 from Dhilan007/develop_label 
update Lua binding for label.
 2014-03-14 16:27:24 +08:00
Dhilan007 2089dd9ccd update Lua binding for label. 2014-03-14 16:21:56 +08:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
James Chen d4efcb32af Merge pull request #5792 from CocosRobot/update_lua_bindings_1394783744 
[AUTO]: updating luabinding automatically
 2014-03-14 15:57:37 +08:00
CocosRobot 189733abac [AUTO]: updating luabinding automatically 2014-03-14 07:56:39 +00:00
James Chen 8c7bc11931 Merge pull request #5790 from dumganhar/warning-fix-and-project-update 
Warning fix and update VS project to fix compilation errors when building in Release mode
 2014-03-14 15:48:55 +08:00
James Chen cc929f42cd Merge pull request #5788 from Dhilan007/develop_label 
Label:fixed text display incorrect when come to foreground on android.
 2014-03-14 15:46:39 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
James Chen a94b82e738 Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
Dhilan007 5f6fbc6a33 label:fixed getter for font size and font name. 2014-03-14 15:18:45 +08:00
minggo 3ddcf7da7f Merge pull request #5789 from minggo/develop 
update some docs
 2014-03-14 15:05:35 +08:00
minggo 87c138450a update readme and releae note 2014-03-14 15:01:11 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
minggo 2a6fbbb379 update readme 2014-03-14 14:50:16 +08:00
minggo 9574ba43f9 make description more readable 2014-03-14 14:49:58 +08:00
boyu0 c2e81817c0 add i386 architecture to each mac .a file 2014-03-14 14:48:37 +08:00
boyu0 a54bfb223e fix typo, add release condition link arguments. 2014-03-14 14:33:33 +08:00
boyu0 fddffae611 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into support_for_xcode_iphone_64bit_simulator 2014-03-14 14:21:52 +08:00
boyu0 38a1b13415 extract arm64 architectures form .a file, add condition link arguments. 2014-03-14 14:18:13 +08:00
James Chen de26d92d09 Merge pull request #5787 from dumganhar/develop 
Some fixes for android-build.py.
 2014-03-14 13:35:50 +08:00
James Chen b893ca3378 Some fixes for android-build.py. 2014-03-14 12:52:43 +08:00
minggo a7fea5bdb7 Merge pull request #5785 from minggo/script-des 
[ci skip]some small modification for releasing
 2014-03-14 11:47:34 +08:00
minggo 1dec465525 update changelog 2014-03-14 11:38:23 +08:00
minggo 82ddaa089b make description more readable 2014-03-14 11:37:26 +08:00
James Chen 4e6d56b93a Merge pull request #5783 from samuele3hu/develop_new_fix 
[LuaTest] fix the error that AssetManager test case can’t find correct resource path
 2014-03-14 10:12:14 +08:00
James Chen bb930eb1c1 Merge pull request #5784 from Dhilan007/develop_label 
label:fixed incorrect effect of outline.
 2014-03-14 09:56:06 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
samuele3hu 100e250d21 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-14 09:50:50 +08:00
samuele3hu 4aef65d4b7 fix the error that AssetManager test case can’t find correct resource path 2014-03-14 09:48:48 +08:00
minggo 2adc73473c Merge pull request #5781 from minggo/script-fix 
set COCOS_CONSOLE_ROOT to path on windows
 2014-03-13 23:14:52 +08:00
minggo bc4ceda242 set COCOS_CONSOLE_ROOT to path on windows 2014-03-13 23:12:55 +08:00
James Chen 8f80b76bd1 Merge pull request #5779 from Dhilan007/develop_label2 
EditBox:fixed nothing to display when input flag is PASSWORD on Android.
 2014-03-13 22:35:30 +08:00
Dhilan007 cea307bfb8 EditBox:fixed nothing to display when input flag is PASSWORD on Android. 2014-03-13 22:16:38 +08:00
minggo a1691e5cb8 Merge pull request #5777 from lihex/develop 
fix template & update submodule
 2014-03-13 22:13:06 +08:00