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

2309 Commits

Author SHA1 Message Date
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3 
Fix Socket IO handshake issue with latest version libwebsocket
 2016-04-01 22:27:57 +08:00
zhangbin bb4e9869d1 Update the submodule cocos2d-console 2016-03-30 15:14:05 +08:00
zhangbin e3de0d1f0b Update the submodule cocos2d-console 2016-03-29 15:38:00 +08:00
pandamicro 446527301b Support llvm 3.5 for latest version idk 2016-03-25 17:12:47 +08:00
Xpol Wan 220e1f8e4b exclude some platform specific files form linter. 2016-03-24 21:35:15 +08:00
Xpol Wan 8d9cdeae7b Update binding generator 
with fixes for generated include path for headers that not in cocos directory (e.g. extensions ).
 2016-03-22 20:49:54 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
Xpol Wan a66c2060b5 Also check the #import statement for m and mm files. 2016-03-21 20:12:15 +08:00
Xpol Wan be688d33c4 Remove debug print [ci skip] 2016-03-21 15:08:45 +08:00
Xpol Wan 764389036d Try fix win32 path issue. 2016-03-21 15:01:01 +08:00
Xpol Wan d063f26173 Add some debug print in linter script. 2016-03-21 14:16:17 +08:00
Xpol Wan 56f2aff34c Replace '\\' with '/' when scan source files. 2016-03-21 13:53:15 +08:00
Xpol Wan bd2d7c3ee7 Always use posixpath. 2016-03-21 13:35:40 +08:00
Xpol Wan c6c2e42a51 include include path check in Jenkins build script. 2016-03-21 11:41:17 +08:00
Xpol Wan 6dcd7d51c3 Update include-linter.py excludes pch.cpp and include .m and .mm. 2016-03-21 11:01:23 +08:00
Xpol Wan 0001ac18f1 Add a include linter script. 
It has follow:

1. lint mode: check include lines of all .h .hpp .inl .c .cpp files in cocos directory, find any included cocos2d-x files using #include "???" path not search from cocos directory.
2. fix mode: when run with -f (or --fix), it will fixes these include path.
3. when running in lint mode, it exit with code 1 if any issues found, this can be used in CI scripts to check commits and PRs.
 2016-03-20 21:50:25 +08:00
zilongshanren 7993ad93d2 fix jsb API inconsistency. 
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
 2016-03-18 16:18:40 +08:00
beichen.liu c599f071a4 Add missing include file in ProjectConfig.cpp. 2016-03-08 14:36:01 +08:00
beichen.liu c50d54339f Add localization arguments in simulator start args. 2016-03-07 09:52:53 +08:00
zhangcheng 709d79ad14 Add first search path to command param. 2016-03-04 13:16:37 +08: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
beichen.liu b207d559ae Change the interface of LocalizationHelper::setCurrentManager. 2016-03-04 10:34:04 +08: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 008089a506 add TabControl TabHeader to tolua 2016-03-03 16:22:42 +08: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 cd4abc0a7f don't remove chipmunk js auto bindings 2016-03-03 15:46:16 +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
zhangcheng c449f61124 Add "-use-local-script" command to control whether to load js script files from simulator local directory. 2016-02-29 13:53:49 +08:00
zhangbin 077b5e7bfc Update the reference of submodule cocos2d-console 2016-02-15 10:49:57 +08:00
pandamicro 6bbfc846da Update bindings generator and Activate new memory model by default 2016-02-14 09:48:29 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
 2016-01-28 01:12:49 +08:00
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 2016-01-18 16:40:00 +08:00
XiaoFeng 0f3cb16efd Fix when add two ActionTimeLine object in one node, play state is wrong 2016-01-14 16:16:37 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni 
easy jni
 2016-01-12 11:50:16 +08:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
 2016-01-09 18:01:56 +08:00
XiaoFeng 1554b6e676 Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program. 2016-01-07 10:42:47 +08:00
肖峰 7bd9ceda10 Use method same as MacOS solution fix js pre-compiled framework project crash when exit on windows. 2015-12-31 09:54:32 +08:00
肖峰 0c0f241c5e Fix pre-compiled frame work js project will crash when exit on MacOS 2015-12-30 19:42:19 +08:00
XiaoFeng 52fb3fd098 Fix js project with pre-build frameworks crash when exit program 2015-12-29 19:38:37 +08:00
Ricardo Quesada 692c0f8a0e adds tvOS support 
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
 2015-12-28 15:59:36 -08:00
lunhao.guo 1871813c2b update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97 2015-12-24 20:35:12 +08:00
pandamicro 6c2fd67d08 Update auto bindings 2015-12-21 00:14:51 +08:00
pandamicro 4f94b03b86 Upgrade bindings generator 2015-12-19 17:18:39 +08:00
xiaofeng11 ef71d8cdcf Merge pull request #14689 from GuoLunHao/v3.10_updateConsole 
update cocos2d-console submodule to  1ad9331a9e3cbef9c499b6c7
 2015-12-16 12:23:23 +08:00
lunhao.guo b32d013dc4 update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133 2015-12-15 20:06:16 +08:00
pandamicro 6e20c3cc4f Merge pull request #14681 from pandamicro/v3.10 
Fix ComponentJS proxy management issue in JSB
 2015-12-15 12:26:12 +08:00
pandamicro 64276bd664 Fix ComponentJS proxy management issue in JSB 2015-12-15 11:48:44 +08:00
pandamicro 280a8e9d9c Merge pull request #14663 from xiaofeng11/v3.10 
Update all version number to v3.10
 2015-12-15 10:48:51 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3 
Sync v3 and Fix win32 js project crash issue
 2015-12-14 13:12:42 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00