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

80 Commits

Author SHA1 Message Date
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
geron-cn cd84081c37 udpate ccs-res 2014-07-09 18:02:17 +08:00
lvlong 70b9d9b9ac delete cube_anim 2014-07-07 17:11:37 +08:00
zhangcheng 1551854c30 revert submodule res-ccs 2014-07-02 17:00:30 +08:00
Huabing.Xu 395e61f977 fix outline bug 2014-06-30 17:21:04 +08:00
yangxiao 4685a8654e Animate3D transition 2014-06-27 17:02:08 +08:00
yangxiao 2a6ce26335 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-27 16:36:36 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
lvlong a497cc0ed2 wrong suffix name 2014-06-27 15:53:25 +08:00
lvlong fac17097a0 add a new model and change girl model to it 2014-06-27 11:44:44 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
yangxiao ccb39e51b2 animation3d transition not finished 2014-06-26 18:35:12 +08:00
lvlong 8cc4520deb add boss.c3b 2014-06-25 13:22:04 +08:00
lvlong 658a955e36 modify skindata binary reading 2014-06-25 13:20:42 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
lvlong dfd68f128a c3b file 2014-06-23 09:03:53 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
Huabing.Xu 2c8c9dea01 use a small texture for sprite3D 2014-06-17 22:31:56 +08:00
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00
lvlong 920b358764 new girl.c3t 2014-06-16 16:23:24 +08:00
lvlong 2282c98f2e do some test 2014-06-16 15:38:03 +08:00
lvlong 2840409933 for tony test 2014-06-16 14:09:41 +08:00
lvlong 0fa4e921f0 delete girl - 副本.c3t 2014-06-16 09:25:12 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
yangxiao 9dd7241176 load c3t animation work 90% 2014-06-15 22:45:56 +08:00
lvlong 4ae01d148f 11 2014-06-13 19:26:46 +08:00
2youyou2 369ed3e6d3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-13 18:00:01 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00
2youyou2 1c5d9ba212 remove resource to use armature resource 2014-06-13 14:41:28 +08:00
lvlong 3af0bdfef6 texture 2014-06-13 09:18:25 +08:00
2youyou2 b36741865c add hd resource 2014-06-12 19:38:08 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00
2youyou2 f536020d26 remove unused files 2014-06-12 16:21:41 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00
vision dc4cdc9c0f remove the comments 2014-06-12 10:19:08 +08:00
vision 97b578185d new parameter for setting blur shader effect 2014-06-12 09:49:48 +08:00
2youyou2 aa06fab776 support relative path for reading json 2014-06-11 21:11:22 +08:00
vision e2c75c1f11 New shader for the blur effect, the old one is ineffecient and difficult to maintain. 2014-06-11 14:54:14 +08:00
Dhilan007 791737befa update test cast of label. 2014-06-09 13:41:32 +08:00