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

27460 Commits

Author SHA1 Message Date
Huabing.Xu 63e6557165 fix GLProgram log crash on windows 2015-01-04 21:51:22 +08:00
yusheng.lu 7e8d1bb74c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-04 19:13:20 +08:00
yusheng.lu a7fb75dc7d Update the description when the csb reader version dismatches the reader version in Cocos2d-x 2015-01-04 19:12:19 +08:00
samuele3hu c91bd076cb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_bug_xmlhttp 2015-01-04 17:10:22 +08:00
samuele3hu 832a87f5f0 Fix crash on the XmlHttpRequestTest for Lua and parsing error of response headers for HttpURLConnection 2015-01-04 17:09:35 +08:00
ffskyfan cb3b760759 Update CCFileUtils-win32.cpp 
fix the problem that engine can't get data from file while other app using the file on windows platform
 2015-01-04 16:43:10 +08:00
andyque 412e76a626 add fixme 2015-01-04 15:16:22 +08:00
andyque 7328c2eea0 fix linux compile error 2015-01-04 15:16:22 +08:00
minggo c9a2860ce2 [ci skip] Update CHANGELOG 2015-01-04 14:51:00 +08:00
minggo 4224319d61 Merge pull request #9775 from huangshiwu/iosnetwork-fixbug 
fix iOS HttpClient immediately mode's bug
 2015-01-04 14:45:18 +08:00
minggo 24daad384c Merge pull request #9776 from samuele3hu/v3_4_bug 
Fix compile iOS compile error on the Xcode 5.1.1
 2015-01-04 14:38:45 +08:00
samuele3hu 713de37c5b Fix compile iOS compile error on the Xcode 5.1.1 2015-01-04 13:49:41 +08:00
minggo 26a6502558 Merge pull request #9766 from raydelto/v3 
Fixing typo in the constant INVAILD_AUDIO_ID
 2015-01-04 13:36:16 +08:00
minggo 001cb59d8e Merge pull request #9764 from zhensydow/patch-1 
Remove warn error on Exit
 2015-01-04 11:14:53 +08:00
huangshiwu 79e3e8463d fix iOS HttpClient immediately mode's bug 2015-01-04 10:54:29 +08:00
minggo 2ea89c0b3f [ci skip] Update CHANGELOG 2015-01-04 10:41:23 +08:00
minggo 818aaeeaac Merge pull request #9765 from MSOpenTech/wp8-fix 
WP8 added /bigobj to c++ command line options to fix arm builds
 2015-01-04 10:39:00 +08:00
ton a445148a5e fix problem : JumpTo position is changed each repeat. 
example:

    sprite->runAction(
        RepeatForever::create(
            Sequence::create(
                JumpTo::create(1, Vec2(300, 200), 100, 2),
                MoveTo::create(1, Vec2(100, 200)),
                nullptr
            )
        )
    );
 2015-01-03 01:13:57 +09:00
raydelto e20c347767 Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID 2014-12-31 20:51:45 -04:00
lvlonggame a41bb40930 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-01-01 07:35:30 +08:00
Dale Stammen 395b9fbaa7 added /bigobj to c++ command line options to fix arm builds 2014-12-31 12:56:16 -08:00
Luis Cabellos 651b7fc13c Remove warn error on Exit 
Change the return error on Linux to  -1  to  standard EXIT_SUCCESS value.
 2014-12-31 18:37:59 +01:00
Huabing.Xu 4d5d5c5a5d Merge pull request #9763 from dabingnn/v3 
update releaseNote
 2014-12-31 22:31:15 +08:00
Huabing.Xu 6fbb32d465 update releaseNote 2014-12-31 22:30:21 +08:00
Huabing.Xu 19e32820a3 Merge pull request #9762 from dabingnn/v3_updateChangeLog 
[ci skip]update changelog
 2014-12-31 22:22:01 +08:00
Huabing.Xu 70ac38d09b [ci skip]update changelog 2014-12-31 22:20:28 +08:00
Huabing.Xu d3b0a4a3d0 Merge pull request #9761 from dabingnn/v3_updateChangeLog 
[ci skip]update changelog
 2014-12-31 22:19:43 +08:00
Huabing.Xu 59e4d817a6 [ci skip]update changelog 2014-12-31 22:18:48 +08:00
minggo e6602e1eec Merge pull request #9760 from yinjimmy/bugfix 
fix: compile error on win32 with release model
 2014-12-31 22:00:05 +08:00
yinjimmy fb5bd01ac1 fix: compile error on win32 with release model 2014-12-31 20:00:51 +08:00
minggo d1e54ee28b Merge pull request #9759 from dualface/update_runtime_ver 
Update runtime ver
 2014-12-31 18:54:53 +08:00
dualface df82dfc873 update config.json 2014-12-31 18:49:02 +08:00
dualface 3077e294b7 update runtime version 2014-12-31 18:39:51 +08:00
minggo 5982a4ec90 [ci skip] Update CHANGELOG 2014-12-31 18:23:40 +08:00
minggo 9fa768f41c Merge pull request #9758 from andyque/update-changelog 
Update releasenote
 2014-12-31 18:21:13 +08:00
andyque 4919462579 update release note 2014-12-31 18:19:39 +08:00
andyque ff036cc74a add release note for UI 2014-12-31 18:15:27 +08:00
minggo d7fceb30bd Merge pull request #9757 from dualface/fix_framework_on_ios 
fix framework on iOS
 2014-12-31 18:04:15 +08:00
dualface 432bdf3541 fix framework on iOS 2014-12-31 18:01:03 +08:00
minggo cf6c08268f Merge pull request #9755 from dualface/fix_lua_debugger 
fix lua_debugger.c
 2014-12-31 17:51:00 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
minggo bbfa7a9183 Merge pull request #9753 from samuele3hu/v3_4_httpclient 
Resolve the bug that requiring lua scrip did not consider the module dependent
 2014-12-31 16:48:33 +08:00
minggo 9af87ace7f Merge pull request #9754 from andyque/update-changelog 
update changelog
 2014-12-31 16:48:01 +08:00
minggo 3be5608696 Merge pull request #9751 from CocosRobot/update_lua_bindings_1420013583 
[AUTO]: updating luabinding automatically
 2014-12-31 16:47:51 +08:00
andyque 71c6f92903 update changelog 2014-12-31 16:45:09 +08:00
samuele3hu 54d376db01 Resolve the bug that requiring lua scrip did not consider the module dependent 2014-12-31 16:28:14 +08:00
CocosRobot 2e1d8b4e42 [AUTO]: updating luabinding automatically 2014-12-31 08:15:01 +00:00
minggo 0b0ca17031 Merge pull request #9748 from doomsdayer/v3_version1 
V3 version1
 2014-12-31 16:10:36 +08:00
yusheng.lu 718cfb9d37 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1 2014-12-31 16:06:19 +08:00
yusheng.lu 89034469f5 Updated the version check description. 2014-12-31 16:01:11 +08:00