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

33168 Commits

Author SHA1 Message Date
pandamicro 23f27534f6 Solve a possible memory leak in HttpRequest 2015-11-25 14:03:56 +08:00
pandamicro 930405d52c Remove useless manual bindings for MenuItems 2015-11-24 16:32:02 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08:00
pandamicro 378cfa35b6 Merge pull request #14394 from super626/v3 
Terrain: char* to string
 2015-11-24 14:53:00 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren dfe4999a06 Update README.md 2015-11-23 16:53:18 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
zilongshanren 361daf7f5f fix wrong indentation 2015-11-23 11:50:04 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 51e2e369d1 Merge pull request #14443 from zilongshanren/fix-scalesprite-opacity 
fix scalesprite opacity issue.
 2015-11-23 09:50:23 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
zilongshanren a789e31605 Merge pull request #14441 from neokim/fix-14440 
Fix #14440
 2015-11-20 16:49:12 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00
zilongshanren 386c734b25 Merge pull request #14423 from xpol/fixes-boring-warnings 
Fixes boring deprecated warning.
 2015-11-19 18:29:12 +08:00
pandamicro dfe2fb1c29 Merge pull request #14433 from pandamicro/v3 
Merged v3.8.1 into v3 and fix some issues
 2015-11-19 18:20:10 +08:00
pandamicro 21d0ff846c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-19 17:20:42 +08:00
pandamicro eccde9fe11 Fix PhysicsSprite not working with moveTo action issue 2015-11-19 17:17:59 +08:00
pandamicro 0893d7d4ff Fix text color parser for TextField widget 2015-11-19 17:17:17 +08:00
pandamicro ea372d7a91 Merge pull request #14432 from CocosRobot/update_cocosfiles_1447924073 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-11-19 17:12:19 +08:00
CocosRobot 74050b6595 [AUTO][ci skip]: updating cocos2dx_files.json 2015-11-19 09:07:54 +00:00
pandamicro fbcf0680ae Merge pull request #14430 from cocos2d/V3.9 
V3.9
 2015-11-19 17:06:07 +08:00
肖峰 d0c3275281 Change version in change log 2015-11-19 13:33:05 +08:00
pandamicro b8ebd51561 Merge pull request #14427 from CocosRobot/update_lua_bindings_1447902515 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-19 11:25:38 +08:00
CocosRobot d5b07e5b60 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-19 03:14:03 +00:00
zilongshanren 7ea90c2d41 Merge pull request #14033 from m-yukio/feature/fixed-richtext 
Support the new line element. Fixed a problem of UIRichText.
 2015-11-19 11:05:08 +08:00
Jeff Wang efeae1eae9 add a test case for pr 14327 2015-11-18 22:52:47 +08:00
Jeff Wang 9cbcd00798 some properties should be set 2015-11-18 22:47:26 +08:00
zilongshanren 27a5cdb295 Merge pull request #14421 from zilongshanren/fixIssue14332 
Fix onEndEditing issue in script.
 2015-11-18 18:13:33 +08:00
Xpol Wan 0b5a3465bc Remove duplicated code by introduce a private doSetResponseCallback. 2015-11-18 17:52:24 +08:00
Xpol Wan b33aa00109 Fixes boring deprecated warning. 
I know I duplicated the code but there is no cpp for me to move body into.
 2015-11-18 17:47:07 +08:00
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
zilongshanren bf08b5b16d Merge pull request #14405 from CocosRobot/update_lua_bindings_1447730847 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-18 14:56:07 +08:00
zilongshanren 61614d64a3 Merge pull request #14408 from CocosRobot/update_lua_bindings_1447733106 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-18 14:55:55 +08:00
肖峰 2d97647177 update framework number 2015-11-18 10:55:10 +08:00
CocosRobot 0794c7a43c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 04:09:43 +00:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
CocosRobot ec86ea47a5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 03:32:26 +00:00
zilongshanren 0b3a342222 Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets 
Set focus for widgets
 2015-11-17 11:24:27 +08:00
zilongshanren 097f7a34e0 Merge pull request #14379 from mogemimi/fix-deprecated-warnings 
Fix deprecated warnings
 2015-11-17 11:19:07 +08:00
pandamicro c4f9804f5b Merge pull request #14404 from CocosRobot/update_lua_bindings_1447728669 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-17 10:56:58 +08:00
pandamicro efde3c3a0e Merge pull request #14403 from pandamicro/v3 
Fix issue in ComponentJS::~ComponentJS
 2015-11-17 10:56:37 +08:00
CocosRobot 3ee2e7a490 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-17 02:56:26 +00:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
pandamicro c77ea57fb1 Merge pull request #14399 from xiaofeng11/v3_combine_mac32compatible 
Combine Studio change for compatible with 32 bit Mac System
 2015-11-17 10:44:40 +08:00
pandamicro 367a502fd4 Merge pull request #14395 from xiaofeng11/v3_combine_actionTimeLine 
Combine Studio change for ActionTimeline
 2015-11-17 10:43:12 +08:00
pandamicro 5bc73c6ede Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-11-17 10:42:05 +08:00
pandamicro c990703b8b Merge branch 'v3.8.1' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	cocos/cocos2d.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_cocos2d.js
	docs/RELEASE_NOTES.md
	external/config.json
	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
	tools/simulator/frameworks/runtime-src/proj.win32/game.rc
 2015-11-17 10:41:41 +08:00
XiaoFeng e3c120eef4 Combine Studio change for compatible with 32 bit Mac System 2015-11-16 18:25:26 +08:00
XiaoFeng e313f7be8b Combine Studio change for ActionTimeline 2015-11-16 15:56:23 +08:00