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

43 Commits

Author SHA1 Message Date
halx99 26fb5a596c Add ccs-res 2020-07-20 18:47:47 +08:00
halx99 a70b43af1e Remove a submodules. 2020-07-20 18:41:45 +08:00
子龙山人 c3bbbb6cb2 Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format (#16615) 
* refactoring ui related code

* fix label bmfont/charmap etc drawing

* make code more robust
 2016-09-30 09:42:21 +08:00
pandamicro d643b306ef Remove cocos studio tests in JS-tests 2016-06-24 13:50:24 +08:00
zilongshanren 8366983a01 fix js ui test missing UITest.json 2016-06-22 17:01:53 +08:00
patriciog 097eebdb50 Testcase for CCS 1.6 animations with only one frame (#15714) 
* Testcase for CCS 1.6 animations with only one frame

* Removed extra comma

* Removed conflict garbage

* Removed old code

* Create new Test section Cocos Studio > Issues

* update ccs-res submodule

* Fixed Back button visibility
 2016-06-06 09:32:33 +08:00
geron-cn 4247292c82 add test case for fix bugs 2016-03-10 18:06:54 +08:00
geron-cn be6fd6a2ee format code indent 2016-01-21 10:27:37 +08:00
geron-cn e2a3fb4a04 update ccs-res for scroll bar test 2016-01-20 21:12:52 +08:00
zilongshanren db05c13407 update ccs-res ref 2015-12-09 14:45:41 +08:00
zhangcheng 39f68e9885 Update ccs-res submodule to the latest. 2015-11-03 13:08:56 +08:00
Liam 68f25f65c4 update submodule 2015-10-08 14:59:48 +08:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
jianglong0156 e105c47cb0 improve testcase 2015-05-27 18:23:56 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 2015-05-26 17:49:17 +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
yusheng.lu 60190a1be6 changed csb names in ccs-res to shorter 2015-05-14 18:08:37 +08:00
WenhaiLin b5ae74c52b [ci skip]Update the reference of submodule ccs-res. 2015-04-09 17:07:37 +08:00
Ray 0f8f0322c8 fix ccs-res 2015-02-26 10:10:32 +08:00
Ray 71f90306f7 update ccs-res submodule 2015-02-25 15:40:46 +08:00
andyque 691e1925ca udpate test resource submodule 2015-01-26 15:05:41 +08:00
yusheng.lu 304f28a58a Update the csb resources for current Cocos2d-x 2015-01-21 17:08:16 +08:00
yusheng.lu a35be8977a Submodule ccs-res go forward. 2015-01-20 19:18:23 +08:00
yusheng.lu a781c974de submodule ccs-res go forward to newest 2014-12-23 15:35:20 +08:00
yusheng.lu 58ba057228 revert submodule ccs-res 2014-12-23 15:27:21 +08:00
yusheng.lu 7eedef71e6 armature node test completed 2014-12-23 11:13:05 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
yusheng.lu c6ba594c72 listview resources added 2014-12-10 09:59:28 +08:00
pipu 4d0950d828 Update submodule that are plugin, ccd-res bindings-generator, cocos2d-console 2014-12-02 15:56:32 +08:00
andyque 0dc7bbe861 fix long file path on WP8 2014-10-18 14:48:27 +08:00
andyque e76b605aeb update css submodule 2014-10-17 14:22:48 +08:00
pipu 86aee1e548 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
geron-cn 5b7852c5f6 update ccs-res hd csbs 2014-07-10 11:17:01 +08:00
geron-cn 2a64bd8945 udpate ccs-res 2014-07-09 18:35:10 +08:00
geron-cn cd84081c37 udpate ccs-res 2014-07-09 18:02:17 +08:00
zhangcheng 1551854c30 revert submodule res-ccs 2014-07-02 17:00:30 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
James Chen 399f5cf721 Adds submodule for CocoStudio resources (70MB) 2014-05-05 15:11:35 +08:00