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

29566 Commits

Author SHA1 Message Date
minggo d7a00b686a [ci skip]update CHANGELOG 2015-05-22 09:53:47 +08:00
minggo d5d329b74f Merge pull request #11946 from andyque/v3-final-android-9-patch-feature 
add Android 9-patch image format support
 2015-05-22 09:52:12 +08:00
minggo 1a1860e126 Merge pull request #11949 from jianglong0156/modifyTestResource 
Modify test resource
 2015-05-22 09:49:08 +08:00
minggo 10fb660fca Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene 
add test case to reproduce the bug for visiting scene by multiple camera
 2015-05-22 09:47:18 +08:00
minggo 3df546a9c7 Merge pull request #11945 from CocosRobot/update_cocosfiles_1432191678 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-22 09:45:03 +08:00
minggo 678b279754 Merge pull request #11953 from MSOpenTech/v3-winrt-settings 
V3: Windows 8.1 Universal App CCUserDefault implementation
 2015-05-22 09:44:41 +08:00
minggo 36089b9bc3 Merge pull request #11950 from WenhaiLin/v3-console-crash 
Console:Fixed crash
 2015-05-22 09:42:41 +08:00
Dale Stammen 6c02e46865 fix deprecated method 2015-05-21 13:30:51 -07:00
Ricardo Quesada 648ca590bf Merge pull request #11954 from CocosRobot/update_cocosfiles_1432238465 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-21 13:03:13 -07:00
CocosRobot 7e392635ce [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 20:01:07 +00:00
Ricardo Quesada bee7eee04d Merge pull request #11934 from ricardoquesada/compiler_warning_fix 
adds `virtual` to destructor
 2015-05-21 12:52:31 -07:00
Dale Stammen 7d0ca21167 use stringstream instead to to_string 2015-05-21 12:39:00 -07:00
Dale Stammen 8bb393f16f use stringstream instead to to_string 2015-05-21 12:20:43 -07:00
Dale Stammen 382d681250 added winrt version of CCUserDefault 2015-05-21 11:23:36 -07:00
Dale Stammen 2e5b604d2f added CC_PLATFORM_WINRT to comments 2015-05-21 11:23:20 -07:00
Dale Stammen 52546112a5 added tests for saving cocos2d::Data buffers 2015-05-21 11:22:37 -07:00
Dale Stammen 992e292338 added winrt version of CCUserDefault 2015-05-21 11:21:46 -07:00
WenhaiLin 158181d4eb Console:Fixed crash 2015-05-21 18:14:21 +08:00
jianglong0156 cf5f3c321c fix invalid native object error 2015-05-21 18:10:00 +08:00
jianglong0156 9ed290e64e Merge branch 'jsTest' into modifyTestResource 2015-05-21 17:35:13 +08:00
Huabing.Xu 2d147f0b97 [ci skip] and an empty line at the end of file 2015-05-21 17:12:35 +08:00
jianglong0156 1c32d9ed0d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into 2d-xv3 2015-05-21 17:01:06 +08:00
Huabing.Xu c202cad712 add test case to reproduce the bug for visiting scene by multiple camera 2015-05-21 16:57:13 +08:00
jianglong0156 f2b41971d0 modify js test resource path 2015-05-21 16:21:45 +08:00
andyque 0352a7a3ea add Android 9-patch image format support 
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date:   Mon May 18 17:16:09 2015 +0800

    Add Android 9-patch format support.

    Squashed commit of the following:

    commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 17:08:05 2015 +0800

        finish refactoring

    commit 730bf817f833de56999c616779fc0279890e14bf
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 11:47:08 2015 +0800

        refactoring 9-patch

    commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 09:42:06 2015 +0800

        refactor

    commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 17:59:21 2015 +0800

        fix lua and Android compile error

    commit 2877538fb3a436f95400b2ad637ea147b9df81d7
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 11:32:43 2015 +0800

         Add Android 9-patch image format support.

        The 9-patch format is used for creating Scale9Sprite.
 2015-05-21 16:04:37 +08:00
jianglong0156 5af04be9ad add js-test resources 2015-05-21 15:38:41 +08:00
CocosRobot 4ceb9bfdb0 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 07:01:20 +00:00
minggo dff368aa49 Merge pull request #11944 from andyque/add-vs2015-support 
add vs2015 support
 2015-05-21 14:50:51 +08:00
andyque 81fcbb45dc update 3rd party 2015-05-21 14:01:05 +08:00
andyque 03e8f16a8a add vs2015 support 2015-05-21 13:55:01 +08:00
minggo a14881effa Merge pull request #11941 from CocosRobot/update_lua_bindings_1432176062 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-21 12:45:35 +08:00
CocosRobot ad301891f0 [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 02:46:49 +00:00
minggo ef8e7958cd [ci skip]update CHANGELOG 2015-05-21 10:37:35 +08:00
minggo 22f0e2fbbf Merge pull request #11918 from WenhaiLin/v3-37 
AudioEngine: Fixed play with a large audio file may fail on Win32
 2015-05-21 10:36:08 +08:00
minggo 69b6c9a3e5 Merge pull request #11906 from samuele3hu/v3_check 
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
 2015-05-21 10:35:38 +08:00
minggo dc0dd081d8 Merge pull request #11938 from CocosRobot/update_lua_bindings_1432172799 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-21 10:35:14 +08:00
minggo 9f720512a1 Merge pull request #11937 from CocosRobot/update_cocosfiles_1432172742 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-21 10:34:39 +08:00
CocosRobot cb6abaa14c [AUTO]: updating luabinding & jsbinding automatically 2015-05-21 01:52:51 +00:00
CocosRobot 5005c77d45 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-21 01:45:44 +00:00
minggo f1eae8f724 Merge pull request #11929 from namezero111111/patch-1 
Fixed missing const-correctness
 2015-05-21 09:38:24 +08:00
子龙山人 9ac23a5436 Merge pull request #11933 from kobake/fix-typo-angel 
Fix typo: "angel" to "angle"
 2015-05-21 09:37:53 +08:00
minggo bfbc8d28f2 Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d 
V3: Windows 8.1 Universal App version of Bullet 3D physics lib
 2015-05-21 09:36:42 +08:00
Ricardo Quesada 944b0ef5e7 adds `virtual` to destructor 2015-05-20 17:43:48 -07:00
kobake d6f7a0a8a1 Fix typo. angel -> angle 2015-05-21 09:22:59 +09:00
Ricardo Quesada 6131501c5f Merge pull request #11931 from ricardoquesada/meshcommand_particle_fixes 
Removes state from MeshCommand.
 2015-05-20 16:30:53 -07:00
Ricardo Quesada f2d3ecad48 Removes state from MeshCommand. 
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
 2015-05-20 15:57:26 -07:00
Dale Stammen aa641189ad fixed audio file path for winrt 2015-05-20 11:22:13 -07:00
Dale Stammen d70a9bf369 resolve full path for audio file 2015-05-20 11:18:54 -07:00
Namezero 89152ef514 Fixed missing const-correctness 2015-05-20 17:19:42 +02:00
Dale Stammen ee8a85fb9b set version to 1.0.0.0 update GUID 2015-05-20 08:10:24 -07:00