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

122 Commits

Author SHA1 Message Date
tangziwen 3381400eec trim uv_test texture's size 2014-11-13 12:06:52 +08:00
tangziwen 85f0b0ec29 fix resource miss 2014-11-12 17:44:19 +08:00
lvlong bdf10426e2 new axe.c3b (ver 0.4) 2014-10-27 16:12:15 +08:00
minggo 8a76be13e4 Merge pull request #8865 from huangshiwu/v3_fixbug 
add two missing image files for TexturePerfermancTest
 2014-10-20 15:27:12 +08:00
huanghsiwu 8e6000ef56 add two missing image files for TexturePerfermancTest 2014-10-20 15:03:30 +08:00
Huabing.Xu 86fedffd56 change asset manager to use a new resource, which will not affect other test cases 2014-10-20 11:03:13 +08:00
andyque 0dc7bbe861 fix long file path on WP8 2014-10-18 14:48:27 +08:00
samuele3hu 14f91ea9f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-17 14:38:07 +08:00
samuele3hu dfd2077648 Update the related manifests files for assetsmanager tests 2014-10-17 14:35:52 +08:00
andyque e76b605aeb update css submodule 2014-10-17 14:22:48 +08:00
minggo 34cfcb0b54 Merge pull request #8690 from dabingnn/v3_spriteLamp 
sprite lamp
 2014-10-16 19:33:57 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
Huabing.Xu 93158a1cfb update spine runtime and test case 2014-10-15 11:23:02 +08:00
Huabing.Xu a20b8d671c sprite lamp (works on iOS mac and android) 2014-10-14 16:54:52 +08:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +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
Huabing.Xu 55431d6a83 add tile map staggered test 2014-10-11 15:09:58 +08:00
pipu ee624e47cc 1. Modifying UIScale9Sprite 
2. Updating UI Test
3. Updatding resource of ActionTimeline
 2014-10-10 10:44:16 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
minggo 44aba5b2af Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements 
Scale9Sprite improvements
 2014-09-30 17:09:02 +08:00
Sergey Perepelitsa d9204b009e scale9Sprite without scale9enabled scale fix 
scale9Sprite crop >  border tile bug fix
 2014-09-30 10:59:20 +04:00
Sergey Perepelitsa 094716a500 Scale9Sprite cropped frames tests 2014-09-28 01:58:26 +04:00
yangxiao fd35d43510 remove unused resource 2014-09-26 15:57:18 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
Dhilan007 ed4e800d70 Add audio resource. 2014-09-23 15:38:40 +08:00
yangxiao 06c0adcf6d remove unused resource 2014-09-19 14:52:25 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao 74f98b36d6 merge cocos 2014-08-28 09:22:57 +08:00
andyque 84c5542a0e Merge branch 'v3' into addWebView 2014-08-26 22:11:35 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
yangxiao dd93439c4b replace model 2014-08-25 19:25:51 +08:00
songchengjiang 00085c157f Added skeleton Model 
Light On/Off
 2014-08-25 16:32:15 +08:00
yangxiao 2d5431353a engine adjust 2014-08-22 13:25:26 +08:00
liuliang a27a420a91 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 
Conflicts:
	cocos/3d/CCSprite3D.cpp
 2014-08-20 11:45:48 +08:00
songchengjiang d9bf2c2b7e Finished Light And Test 2014-08-19 15:51:30 +08:00
songchengjiang 10afb9b9af Finished Point Light 
Finished Directional Light
Finished Spot Light
 2014-08-18 17:10:07 +08:00
Huabing.Xu a9a403013c fix skinned outline effect 2014-08-14 10:44:03 +08:00
minggo cc37780861 Merge pull request #7736 from dabingnn/v3_addSkinnedOutline 
V3 add skinned outline
 2014-08-12 15:07:21 +08:00
Huabing.Xu e66d1f6f69 add skinned outline effect 2014-08-11 18:11:15 +08:00
yangxiao 3c9483899e camera, cameratest, drawNode3D squash 2014-08-07 15:23:31 +08:00
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
andyque 5af4657fbb fix windows utf8 source code file can not compile erorr 2014-08-01 21:20:27 +08:00
yangxiao cd379ab412 add axe model 2014-07-31 11:26:27 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +08:00
Sergey 92ac809bfe Mac fonts tests 2014-07-24 12:27:17 +04: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