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

34173 Commits

Author SHA1 Message Date
pandamicro 0424ab2db5 Merge pull request #15222 from xiaofeng11/v3_depsUpdate 
update deps
 2016-03-11 16:20:09 +08:00
XiaoFeng 3acea03924 Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system 2016-03-11 15:44:28 +08:00
xiaofeng11 7b338c2f4c Merge pull request #15223 from geron-cn/v3bugfixs 
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
 2016-03-11 13:34:21 +08:00
geron-cn b3ee96ebd2 fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084 2016-03-11 12:56:58 +08:00
Ricardo Quesada 9477bfd801 Merge pull request #15135 from dumganhar/ws-close-fix 
Closes websocket connection by dispatching a 'resetDirector' event.
 2016-03-10 17:39:47 -08:00
xiaofeng11 5f15489a62 Merge pull request #15220 from geron-cn/v3bugfixs 
fix scrollview bugs

It's OK, merged
 2016-03-11 09:36:15 +08:00
geron-cn 4247292c82 add test case for fix bugs 2016-03-10 18:06:54 +08:00
geron-cn 7824acc34e fix scrollview bugs: 
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
 2016-03-10 18:06:20 +08:00
XiaoFeng cce46195ca Add websocket close test 2016-03-10 14:01:38 +08:00
xiaofeng11 d398083c9a Merge pull request #15218 from geron-cn/v3bugfixs 
fix bugs

It's OK, merged
 2016-03-10 09:24:58 +08:00
geron-cn 0bd9d1638d Squashed commit of the following: 
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:58:17 2016 +0800

    avoid warning

commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:52:43 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:51:02 2016 +0800

    fix bugs:
    - fix there is a bar dot after init a scrollview with scrollbar
    - fix some time var can not auto hide after scroll

commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:32:08 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:30:47 2016 +0800

    remove inline

commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Mar 4 10:48:41 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 18:43:40 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
 2016-03-09 19:08:18 +08:00
xiaofeng11 b9b3049acb Merge pull request #15213 from FrostPolaris/v3 
Fix the bug that TextField may be set with a multi-line localized text.

It's OK, merged.
 2016-03-09 18:34:03 +08:00
zilongshanren c456ef985d Merge pull request #15217 from CocosRobot/update_cocosfiles_1457514100 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-09 17:08:54 +08:00
CocosRobot 9bb29f4880 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-09 09:01:44 +00:00
pandamicro 849a2ee544 Merge pull request #15215 from minggo/firefox-remote-debug 
[ci skip]fix a bug that will miss packets
 2016-03-09 16:59:03 +08:00
minggo e44f4d8d61 fix a typo 2016-03-09 16:07:57 +08:00
minggo 8079c55d88 fix bug that will lost incoming packets 2016-03-09 16:03:55 +08:00
beichen.liu 8f9233be00 Fix the bug that TextField may be set with a multi-line localized text. 2016-03-09 09:31:34 +08:00
xiaofeng11 fb779e5a50 Merge pull request #15207 from FrostPolaris/v3_localizeManage 
Add missing include file in ProjectConfig.cpp.

It's OK, merged
 2016-03-08 16:46:39 +08:00
beichen.liu c599f071a4 Add missing include file in ProjectConfig.cpp. 2016-03-08 14:36:01 +08:00
xiaofeng11 f2c999441a Merge pull request #15190 from FrostPolaris/v3_localizeManage 
Add localization arguments in simulator start args.

It's OK, merged
 2016-03-07 10:59:20 +08:00
beichen.liu c50d54339f Add localization arguments in simulator start args. 2016-03-07 09:52:53 +08:00
zilongshanren 6a090a7c5d Merge pull request #15185 from CocosRobot/update_cocosfiles_1457124969 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-05 08:33:31 +08:00
Ricardo Quesada 00e3189b68 Merge pull request #15186 from ricardoquesada/cmake_build_type 
CMAKE_BUILD_TYPE has precedence over DEBUG_MODE
 2016-03-04 14:11:29 -08:00
Ricardo Quesada 081dc312de CMAKE_BUILD_TYPE has precedence over DEBUG_MODE 
cmake fixes
 2016-03-04 13:30:38 -08:00
CocosRobot 8f6da161d1 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-04 20:56:11 +00:00
Ricardo Quesada 21cd5d08f7 Merge pull request #15177 from ricardoquesada/cmake_fixes 
"cocos new" fixes for cmake
 2016-03-04 12:38:13 -08:00
Ricardo Quesada 6a31f43a27 compiles on Mac. adds missing libs and files 2016-03-04 10:47:19 -08:00
zilongshanren 79ccbf71a2 Merge pull request #15183 from CocosRobot/update_lua_bindings_1457079144 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-04 16:20:52 +08:00
CocosRobot e31c918264 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-04 08:14:39 +00:00
zilongshanren 7c56f0bc2c Merge pull request #15181 from geron-cn/uitabcontrol 
add tab control to js/lua binding generate
 2016-03-04 16:08:04 +08:00
xiaofeng11 30b3551dcf Merge pull request #15180 from chengstory/AddFirstSearchPath 
Add first search path to command param.

It's OK for me, merged
 2016-03-04 14:19:06 +08:00
geron-cn 9ba5dffb4c add tab control to js/lua binding generate 2016-03-04 13:35:41 +08:00
zhangcheng 709d79ad14 Add first search path to command param. 2016-03-04 13:16:37 +08:00
zilongshanren 32303b5904 Merge pull request #15178 from CocosRobot/update_cocosfiles_1457063146 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-04 12:00:56 +08:00
CocosRobot 836a6ffa42 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-04 03:45:48 +00:00
xiaofeng11 e46e392ff5 Merge pull request #15175 from FrostPolaris/v3_localizeManage 
Add language localization support for Button, Text, TextField and TextBMFont.

It's OK, merged
 2016-03-04 11:43:47 +08:00
zilongshanren 48997e1f0d Merge pull request #15174 from CocosRobot/update_cocosfiles_1457058538 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-04 11:37:03 +08:00
zilongshanren e6d2bfd014 Merge pull request #15145 from grwhitehead/fontatlas_fix 
three related bug fixes in FontAtlas::prepareLetterDefinitions
 2016-03-04 11:36:36 +08:00
Ricardo Quesada 5b3942fcbb "cocos new" fixes for cmake 
cmake for mac compiles. doesn't link since it needs iconv.
 2016-03-03 19:21:30 -08:00
beichen.liu b207d559ae Change the interface of LocalizationHelper::setCurrentManager. 2016-03-04 10:34:04 +08:00
CocosRobot c50630fdef [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-04 02:28:59 +00:00
zilongshanren b5a44bc2f4 Merge pull request #15170 from geron-cn/uitabcontrol 
add TabControl TabHeader to tolua
 2016-03-04 10:26:06 +08:00
geron-cn 46f2e8c8b6 rename deactiveTabItem 2016-03-03 18:09:07 +08:00
geron-cn 008089a506 add TabControl TabHeader to tolua 2016-03-03 16:22:42 +08:00
zilongshanren a6b02fcc5b Merge pull request #15168 from CocosRobot/update_lua_bindings_1456991724 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-03 16:01:27 +08:00
CocosRobot 169a81c6ea [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-03 07:57:25 +00:00
zilongshanren 3d50047ab8 Merge pull request #15167 from CocosRobot/update_cocosfiles_1456991574 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-03 15:54:04 +08:00
zilongshanren 93b7e4396b Merge pull request #15150 from mogemimi/fix-incorrect-header-include 
Fix compile error on case-sensitive filesystems
 2016-03-03 15:53:38 +08:00
zilongshanren e2d31c1c63 Merge pull request #15157 from mogemimi/fix-block-comment 
Fix compiler warning: "/* within block comment"
 2016-03-03 15:53:22 +08:00