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

20767 Commits

Author SHA1 Message Date
minggo 1a241ca350 Merge pull request #7135 from minggo/orrderOfArrival 
not set _orderOfArrival to 0 after visit
 2014-06-19 15:17:55 +08:00
minggo 136033c282 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
minggo cecd96105e Merge pull request #7132 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-06-19 14:49:20 +08:00
zhangbin bd6aed8a7b Update the reference of submodule cocos2d-console. 2014-06-19 14:47:16 +08:00
minggo dff3feeeb7 Merge pull request #7128 from natural-law/v3 
Modify the lua runtime template for prebuilt engine.
 2014-06-19 11:49:04 +08:00
zhangbin 3b19b07915 Modify the lua runtime template for prebuilt engine. 2014-06-19 11:33:39 +08:00
minggo 56777e6d61 [ci skip] 2014-06-19 09:47:01 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve 
1.Support setting up the line height and additional kerning of label.
 2014-06-19 09:44:51 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
minggo 719c8995cf Merge pull request #7118 from natural-law/v3 
Remove the debug symbols for release mode in xcode projects.
 2014-06-18 17:10:34 +08:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects. 
Modify the template of lua runtime.
 2014-06-18 17:06:56 +08:00
minggo a587931ce3 Merge pull request #7115 from minggo/windows-fix 
fix compiling error on windows
 2014-06-18 14:14:39 +08:00
minggo b28a482ec4 Merge pull request #7116 from CocosRobot/update_lua_bindings_1403071752 
[AUTO]: updating luabinding automatically
 2014-06-18 14:12:53 +08:00
CocosRobot 155638f2de [AUTO]: updating luabinding automatically 2014-06-18 06:10:38 +00:00
minggo a68d89bce3 Merge pull request #7113 from samuele3hu/v3_lua_fix 
Skip some functions for Lua bindings for compile error
 2014-06-18 14:05:41 +08:00
minggo d6776b664a fix compiling error on windows 2014-06-18 14:01:57 +08:00
samuele3hu ed72202e68 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-18 13:44:27 +08:00
samuele3hu 98fde94647 Skip some functions for Lua bindings 2014-06-18 13:43:22 +08:00
minggo afb49f2e81 Merge pull request #7112 from CocosRobot/update_cocosfiles_1403069812 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-18 13:38:14 +08:00
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
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +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
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