Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests/proj.win32
History
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
..
build-cfg.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
cpp-tests.vcxproj Squashed commit of the following: 2016-03-03 14:17:48 +08:00
cpp-tests.vcxproj.filters Squashed commit of the following: 2016-03-03 14:17:48 +08:00
cpp-tests.vcxproj.user Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which 2014-05-08 21:19:54 +08:00
main.cpp issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
main.h Compiles in Win32 2014-09-09 18:07:24 -07:00