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

34844 Commits

Author SHA1 Message Date
Vladimir Perminov 2a201a5c4e WinRT support key repeat and implement dispatchControlKey 2016-03-07 14:43:44 +03:00
Vladimir Perminov 8eec628e04 Desktop implement dispatchControlKey 
And fix bag control char for OSX onGLFWCharCallback
glow send on CharCallback character control key unicode.
 2016-03-07 14:33:59 +03:00
Vladimir Perminov 6bc36912ae TextFieldTTF support cursor 
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC,  CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
 2016-03-07 14:22:03 +03:00
Vladimir Perminov b3b047e9ad Label '\b' - Next char not change x position 
Add TextFormatter for easy use '\n', '\r', '\b'
 2016-03-07 14:07:36 +03:00
Vladimir Perminov f2a5a5ef6b StringUTF8 - Utf8 sequence 
Store each utf8 chars as std::string, for easily manipulated
 2016-03-07 13:59:53 +03: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
XiaoFeng ce555f68de Fix CocosDenshionTest playMusic won't work under android system 
Fix click setNotificationNode button in SceneTest then return to main menu the animation is still play on screen
 2016-03-03 16:47:05 +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
CocosRobot efff69a08d [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-03 07:52:55 +00:00
beichen.liu 0489fd76e8 1.Change the interface in LocalizationManager. 
2.Add new args of localization in simulator.
 2016-03-03 15:49:50 +08:00
zilongshanren 9223027532 Merge pull request #15166 from zilongshanren/fixJsbindings 
[ci skip]don't remove chipmunk js auto bindings
 2016-03-03 15:47:55 +08:00
zilongshanren cd4abc0a7f don't remove chipmunk js auto bindings 2016-03-03 15:46:16 +08:00
pandamicro 18a419a732 Merge pull request #15153 from minggo/firefox-remote-debug 
[ci skip]add a function to get object name
 2016-03-03 15:23:49 +08:00
zilongshanren ea64c49c77 Merge pull request #15162 from geron-cn/uitabcontrol 
Squashed commit of the following:
 2016-03-03 15:22:51 +08:00
geron-cn 4f6fd3ef64 Squashed commit of the following: 
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 13:43:04 2016 +0800

    change enum to enum class
    use tabitem as pointer to replace _currentTabItemIndex

commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:44 2016 +0800

    Merge remote-tracking branch 'gero/tabview' into tabcontrol

commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:15 2016 +0800

    Squashed commit of the following:

    commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:35:06 2016 +0800

        fix

    commit e0eb069846a8ceb4b726c3c945801c944404b102
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:30:44 2016 +0800

        fix active deactive in tabcontrol

    commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 20:16:22 2016 +0800

        fix active -1

    commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 16:00:51 2016 +0800

        fix merge file

    commit cdd44f1c577ad190bc175896107a48fbb36b65bb
    Merge: 1658ad6 6bf55ed
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:57:48 2016 +0800

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

        # Conflicts:
        #	cocos/ui/CMakeLists.txt

    commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:27:31 2016 +0800

        configure for win8.1

    commit ec236bff711b72952d48ec4d8b9137b4812b7a72
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:20:23 2016 +0800

        configure for iOS mac twos android linux

    commit 9d6678a4388461a791abe968fa637df2fc6839d3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:02:17 2016 +0800

        add lack files

    commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 22:05:22 2016 +0800

        add test case for TabControl

    commit 97b8d8d87a37881b33ebe90478392150ef341b3e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 15:43:29 2016 +0800

        add const to getter setter

    commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 14:50:04 2016 +0800

        format the comments

    commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:51:06 2016 +0800

        remove reference

    commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:40:04 2016 +0800

        configure for win8.1

    commit c015ac54028534202f62ff85f9a9d4b62b12801e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:27:54 2016 +0800

        fix error

    commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:25:51 2016 +0800

        add interface

    commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:21:22 2016 +0800

        fix compile error for tw-os

    commit 3bfaa2976751e844a591ae5524bfd81249927c7c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:04:23 2016 +0800

        fix linux compile error

    commit fafe3ad660e644924fd02665b77e1df4076a4802
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:54:34 2016 +0800

        re-indent code with X-Code

    commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:37:51 2016 +0800

        add reader configure for android

    commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:22:00 2016 +0800

        format code, remove some warning

    commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:02:27 2016 +0800

        configure for mac project

    commit de21cea12c0a898ea95f9951022be85bdddeefaf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 18:28:10 2016 +0800

        add comment for apis

    commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 15:32:46 2016 +0800

        fix parse objects in container

    commit 53bcce68b053a5b918a29735fed393c210d9cc2c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 22:10:54 2016 +0800

        fix flatbuffer parse

    commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 18:26:07 2016 +0800

        Init ui::TabControl

commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:35:06 2016 +0800

    fix

commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:30:44 2016 +0800

    fix active deactive in tabcontrol

commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 20:16:22 2016 +0800

    fix active -1

commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 16:00:51 2016 +0800

    fix merge file

commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:57:48 2016 +0800

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

    # Conflicts:
    #	cocos/ui/CMakeLists.txt

commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:27:31 2016 +0800

    configure for win8.1

commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:20:23 2016 +0800

    configure for iOS mac twos android linux

commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:02:17 2016 +0800

    add lack files

commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 22:05:22 2016 +0800

    add test case for TabControl

commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 15:43:29 2016 +0800

    add const to getter setter

commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 14:50:04 2016 +0800

    format the comments

commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:51:06 2016 +0800

    remove reference

commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:40:04 2016 +0800

    configure for win8.1

commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:27:54 2016 +0800

    fix error

commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:25:51 2016 +0800

    add interface

commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:21:22 2016 +0800

    fix compile error for tw-os

commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:04:23 2016 +0800

    fix linux compile error

commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:54:34 2016 +0800

    re-indent code with X-Code

commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:37:51 2016 +0800

    add reader configure for android

commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:22:00 2016 +0800

    format code, remove some warning

commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:02:27 2016 +0800

    configure for mac project

commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 18:28:10 2016 +0800

    add comment for apis

commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 15:32:46 2016 +0800

    fix parse objects in container

commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 22:10:54 2016 +0800

    fix flatbuffer parse

commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 18:26:07 2016 +0800

    Init ui::TabControl
 2016-03-03 14:17:48 +08:00
beichen.liu 05411a44f5 Add comment. 2016-03-03 13:41:32 +08:00
mogemimi 3a87ee46c6 Fix compiler warning: "/* within block comment" 2016-03-03 10:44:51 +09:00
Ricardo Quesada 462f4f4c0a Merge pull request #15156 from ricardoquesada/cmake_android_squash_2 
cmake for android
 2016-03-02 17:24:35 -08:00
Ricardo Quesada 028f8c28e1 Squashed commit of the following: 
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 15:19:48 2016 -0800

    uses new naming convention for projects

    uses _ instead of -

commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:49:22 2016 -0800

    fooling cmake for real

commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:43:05 2016 -0800

    fooling cmake

commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:26:59 2016 -0800

    makes CMake for Mac happy

commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 13:50:15 2016 -0800

    linux fix

commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 11:18:18 2016 -0800

    links correctly!

commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Mar 1 17:44:58 2016 -0800

    Squashed commit of the following:

    commit 2ef52723dae44204c047cb177d5a5670fb659c79
    Merge: 8a5c998 25cf1f1
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Mar 1 16:54:04 2016 -0800

        Merge branch 'v3' into cmake_android

    commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:34:46 2016 -0800

        Fix module name in Android template to match CMake project.

    commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:27:45 2016 -0800

        Add missing platform specific source file to CMake project.

    commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:21:12 2016 -0800

        Find AndroidNdkModules.cmake relative to android.toolchain.cmake.

    commit a10075e2cb30af2e1f9a30da99efac880658ad6b
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:03:11 2016 -0800

        Remove cpp-empty-test from project templates.

    commit e070fcbf210b8628f75785e738202a80a95ac0ff
    Author: WenhaiLin <wenhai.lin@chukong-inc.com>
    Date:   Mon Aug 31 09:56:03 2015 +0800

        Fix CMake for Android Target
 2016-03-02 16:51:54 -08:00
minggo f8580959f8 add a function to get object name 2016-03-02 15:51:29 +08:00
zilongshanren 6bf55edb70 Merge pull request #15143 from zilongshanren/add-listview-cellreuse-tests 
Add listview cell reuse tests
 2016-03-02 15:01:35 +08:00
mogemimi 11f3f95a2c Fix compile error on case-sensitive filesystems 2016-03-02 15:47:42 +09:00