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

21087 Commits

Author SHA1 Message Date
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix 
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
 2014-06-18 13:37:57 +08:00
CocosRobot 9aeb1510ed [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-18 05:36:54 +00:00
minggo a672f03382 Merge pull request #7110 from CocosRobot/update_lua_bindings_1403062939 
[AUTO]: updating luabinding automatically
 2014-06-18 13:35:36 +08:00
pandamicro 950894de80 Fixed #5563: Fix include issue 2014-06-18 12:47:48 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
samuele3hu 15d070f7fc Update submodule 2014-06-18 11:50:24 +08:00
samuele3hu 00611f7ec1 Update cocos2dx_spine.ini 2014-06-18 11:47:43 +08:00
CocosRobot d58d36d1c8 [AUTO]: updating luabinding automatically 2014-06-18 03:44:06 +00:00
minggo c9492cbbef [ci skip] 2014-06-18 11:31:16 +08:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name 
issue #4693: add getName(), setName() and getChildByName()
 2014-06-18 11:30:14 +08:00
minggo 246d6f12c9 Merge pull request #7047 from samuele3hu/v3_keypad_fix 
Resolve the compile warning for Lua bindings project
 2014-06-18 11:29:54 +08:00
minggo bd499d4bd6 Merge pull request #7003 from andyque/back_compatible_fix 
fix KeyCode back compatible
 2014-06-18 11:29:02 +08:00
minggo 2e84368e48 Merge pull request #7108 from minggo/v3 
fix compiling error
 2014-06-18 11:27:49 +08:00
andyque 2cef0cb437 update ccs-res 2014-06-18 11:26:26 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
andyque ca24ad6768 Merge branch 'v3' into cleanupBinaryLoader 2014-06-18 11:19:19 +08:00
minggo df798baa8b Merge pull request #7059 from Rumist/v3 
BUG FIX : #5553
 2014-06-18 11:18:33 +08:00
minggo f05eb9532d fix compiling error 2014-06-18 11:11:08 +08:00
minggo 76856af709 [ci skip] 2014-06-18 10:36:53 +08:00
minggo 8a0a6a2ded Merge pull request #7064 from kyokomi/TextReader_filePath_fix 
Fix bug for TextReader #setFontName.
 2014-06-18 10:36:29 +08:00
minggo ba54f8c92c [ci skip] 2014-06-18 10:34:57 +08:00
minggo 7589bc7b40 Merge pull request #7068 from kyokomi/UIButton_ttfFont 
Fix UIButton.cpp added TTFFont.
 2014-06-18 10:32:46 +08:00
minggo 66ec8f1ee1 Merge pull request #7106 from dabingnn/v3SmallerTexture 
use a small texture for sprite3D
 2014-06-18 10:31:50 +08:00
minggo 3c789ca35b Merge pull request #7107 from MSOpenTech/wp8-v3-fix 
Fixes broken WP8 V3 build
 2014-06-18 10:00:29 +08:00
Dale Stammen da9a652868 added missing files to project 2014-06-17 09:27:36 -07:00
Dale Stammen 6fcf43e64d #undef NEAR reserved word for WP8 and WinRT 2014-06-17 09:27:19 -07:00
Huabing.Xu 2c8c9dea01 use a small texture for sprite3D 2014-06-17 22:31:56 +08:00
minggo 9784f4d9f3 Merge pull request #7101 from CocosRobot/update_lua_bindings_1403010712 
[AUTO]: updating luabinding automatically
 2014-06-17 21:35:35 +08:00
minggo c7b14cfcba Merge pull request #7103 from CocosRobot/update_cocosfiles_1403011185 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-17 21:34:51 +08:00
minggo 611ab0e9c3 Merge pull request #7104 from CocosRobot/update_lua_bindings_1403011348 
[AUTO]: updating luabinding automatically
 2014-06-17 21:34:25 +08:00
minggo dee0c7666b Merge pull request #7100 from CocosRobot/update_cocosfiles_1403010564 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-17 21:33:16 +08:00
CocosRobot 22e1d69f9f [AUTO]: updating luabinding automatically 2014-06-17 13:24:08 +00:00
CocosRobot 2d68b408e0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 13:19:46 +00:00
minggo 269ed214a9 [ci skip] 2014-06-17 21:18:08 +08:00
minggo bd0cf66efa Merge pull request #7102 from minggo/v3 
update changelog and release note
 2014-06-17 21:15:30 +08:00
minggo 9b6d58118c update changelog and release note 2014-06-17 21:13:49 +08:00
CocosRobot fea6509c22 [AUTO]: updating luabinding automatically 2014-06-17 13:13:31 +00:00
CocosRobot a292f7d063 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 13:09:25 +00:00
minggo 26cca348cb Merge pull request #7085 from super626/v3 
Sprite3D animation
 2014-06-17 21:05:58 +08:00
minggo 17bbb675df [ci skip] 2014-06-17 20:23:26 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
minggo ec632a54b2 [ci skip] 2014-06-17 18:50:47 +08:00
minggo 552c3cbb2f [ci skip] 2014-06-17 18:42:10 +08:00
minggo caafc0ebc5 [ci skip] 2014-06-17 18:38:33 +08:00
minggo 5668674cc0 Merge pull request #7097 from andyque/fixDoxygenProblem 
fix doxygen
 2014-06-17 17:29:12 +08:00
andyque 62c4c9a69f fix doxygen 2014-06-17 17:31:54 +08:00
Huabing.Xu 605b3517f0 roll back submodule plugin 2014-06-17 16:41:10 +08:00
Huabing.Xu 77091cad8b Merge branch 'v3' of github.com:super626/cocos2d-x into v3Animation 2014-06-17 16:37:03 +08:00
Huabing.Xu 8efaf11a85 roll back submodule of bindings-generator and cocos2d-console 2014-06-17 16:35:25 +08:00