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

19664 Commits

Author SHA1 Message Date
Dale Stammen f233251f4f added functions to display ip address of device 2014-04-19 09:12:04 -07:00
Dale Stammen 008bde1e27 fixed font path when fontname is empty string 2014-04-19 09:11:20 -07:00
Dale Stammen b54a1064fd fixed accelerometer for wp8 2014-04-19 09:10:34 -07:00
Kenneth Chan a2fa6ef2d5 Fix lua project template crash on iOS5.1 device 2014-04-18 18:02:40 -07:00
Huabing.Xu 3b83d52f95 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/ui/UIButton.cpp
	cocos/ui/UIButton.h
	cocos/ui/UICheckBox.cpp
	cocos/ui/UICheckBox.h
	cocos/ui/UIImageView.cpp
	cocos/ui/UIImageView.h
	cocos/ui/UILayout.cpp
	cocos/ui/UILayout.h
	cocos/ui/UILoadingBar.cpp
	cocos/ui/UIRichText.h
	cocos/ui/UISlider.cpp
	cocos/ui/UIText.cpp
	cocos/ui/UIText.h
	cocos/ui/UITextAtlas.cpp
	cocos/ui/UITextAtlas.h
	cocos/ui/UITextBMFont.cpp
	cocos/ui/UITextBMFont.h
	cocos/ui/UITextField.cpp
	cocos/ui/UITextField.h
	cocos/ui/UIWidget.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioGUITest/UIScrollViewTest/UIScrollViewTest.cpp
 2014-04-19 00:30:34 +08:00
minggo 618e49cf86 [ci skip] 2014-04-18 17:12:32 +08:00
minggo d8d847bd65 Merge pull request #6319 from boyu0/bug4903_build_libcurl_with_openssl 
closed #4903: Build libcurl.a with openssl
 2014-04-18 17:10:53 +08:00
boyu0 9756709473 closed #4903: change HttpClientTest get test 3 to https protocol. 2014-04-18 17:03:06 +08:00
James Chen 482fa3ece0 Update CHANGELOG [ci skip] 2014-04-18 16:53:18 +08:00
James Chen 0a1c926d10 Update CHANGELOG [ci skip] 2014-04-18 16:52:41 +08:00
James Chen 3b708f4e82 Merge pull request #6295 from samuele3hu/develop_fix 
fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua
 2014-04-18 16:50:57 +08:00
minggo 2aea2540b6 [ci skip] 2014-04-18 14:22:21 +08:00
minggo 5b4a65ea3a [ci skip] 2014-04-18 14:21:06 +08:00
minggo 8e83cd7900 Merge pull request #6261 from iSevenDays/patch-9 
Fix memory leak
 2014-04-18 14:19:17 +08:00
cw 0f61481c40 add android runtime 2014-04-18 14:12:34 +08:00
minggo 051d4cf62d [ci skip] 2014-04-18 14:02:26 +08:00
minggo 0e7280b1ca Merge pull request #6304 from dumganhar/iss4568-crash 
closed #4568: Application crashes on closing if CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
 2014-04-18 14:00:40 +08:00
minggo b7e5306275 Merge pull request #6313 from chuanweizhang2013/luaruntime 
update android runtime
 2014-04-18 13:59:32 +08:00
minggo 5fe9ab992e [ci skip] 2014-04-18 13:58:56 +08:00
minggo 541f0b0a19 Merge pull request #6315 from natural-law/issue4863 
Update the reference of submodule "cocos2d-console".
 2014-04-18 13:57:52 +08:00
minggo ef52c91849 [ci skip] 2014-04-18 13:56:49 +08:00
minggo 14ed6e9f5a Merge pull request #6321 from samuele3hu/devRichText 
fix the compile error about luabindings in release version and add the `RichText` test cases
 2014-04-18 13:55:05 +08:00
samuele3hu 7e81f32016 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into devRichText 2014-04-18 11:55:30 +08:00
samuele3hu 914516a4e0 fix the compile error about luabindings and add the `RichText` test cases. 2014-04-18 11:54:57 +08:00
chuanweizhang2013 2a9c99ff66 Merge pull request #25 from cocos2d/develop 
update cocos2d-x
 2014-04-18 11:45:53 +08:00
cw a9e697523e amend comment 2014-04-18 11:40:51 +08:00
James Chen 8a80bac266 Merge pull request #6320 from CocosRobot/update_lua_bindings_1397789417 
[AUTO]: updating luabinding automatically
 2014-04-18 11:05:29 +08:00
CocosRobot a78a1090c3 [AUTO]: updating luabinding automatically 2014-04-18 02:51:14 +00:00
minggo 7399ef2527 Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize 
Develop nutty widgetsupportscontentsize
 2014-04-18 10:47:10 +08:00
boyu0 f595413983 closed #4903: Build libcurl.a with openssl 2014-04-18 09:36:34 +08:00
minggo 74e9355119 Merge pull request #6317 from lmskater/fix-comment-body 
[Jenkins][ci skip] Fix result comment body of Emptytest
 2014-04-17 18:14:22 +08:00
lm dfeac8c7d2 [Jenkins][ci skip] Fix result comment body of Emptytest 2014-04-17 18:08:15 +08:00
zhangbin 0e14c2ad3f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863 2014-04-17 17:19:57 +08:00
minggo bb0c62b724 Merge pull request #6314 from lmskater/add-internet-permission 
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
 2014-04-17 17:19:07 +08:00
zhangbin 33472c7805 closed #4863, Zipalign the apk generated with release mode. 2014-04-17 17:18:39 +08:00
lm c34b3d5324 [Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test 2014-04-17 17:04:28 +08:00
cw 2914f60fcf fixed xiaomi show ip error 2014-04-17 16:50:11 +08:00
James Chen 0d7747e3b1 Merge pull request #6312 from heliclei/fix-jenkins-tool 
[jenkins]Add execute permission
 2014-04-17 15:12:24 +08:00
heliclei 70c20ddfb2 add execute permission 2014-04-17 15:08:49 +08:00
minggo b85a2c08e5 Merge pull request #6311 from minggo/comment-event-listener 
add comment for EventListenerTouchOneByOne::checkAvailable()
 2014-04-17 14:48:37 +08:00
minggo a8a8ef85e6 add comment for EventListenerTouchOneByOne::checkAvailable() 2014-04-17 14:46:52 +08:00
CaiWenzhi a8bfa094c0 Remove useless codes 2014-04-17 14:27:21 +08:00
CaiWenzhi ed4fcd5d1a Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-04-17 14:23:08 +08:00
CaiWenzhi 19f6526ef8 Widget supports contentsize 2014-04-17 14:08:25 +08:00
minggo 5d90fd73d3 Merge pull request #6235 from natural-law/issue4727 
Support run sample projects with console.
 2014-04-17 12:05:50 +08:00
samuele3hu 11515f6ab3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio 2014-04-17 11:06:20 +08:00
James Chen 57d1f00788 Merge pull request #6297 from lmskater/comment-emptytest-result 
[Jenkins][ci skip] Comment result of emptytest
 2014-04-17 10:41:46 +08:00
James Chen 68d5cec430 Merge pull request #6303 from andyque/issue4883 
closed #4883. fixed slider hittest problem
 2014-04-17 10:38:17 +08:00
samuele3hu 1331fff62c fix the bug that exit layer can’t end SimpleAudioEngine 2014-04-17 10:36:08 +08:00
James Chen 30e1d41dbf Makes 'compareRenderCommand' as a static function instead of a global function 2014-04-17 10:16:37 +08:00