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

21332 Commits

Author SHA1 Message Date
2youyou2 e0f6ae9db4 change TimelineAction to cocos/2d folder 2014-06-13 13:36:01 +08:00
vision 7e99121af7 Change the default pixel format from RGB to RGBA for render texture when saving as PNG. 2014-06-13 13:35:18 +08:00
yangxiao 247734e2e0 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-13 12:25:04 +08:00
Huabing.Xu 638fdd62df Merge pull request #37 from dabingnn/v3Animation 
V3 animation
 2014-06-13 12:12:44 +08:00
Huabing.Xu 4e94eaabed Merge branch 'v3' into v3Animation 2014-06-13 12:06:11 +08:00
Huabing.Xu 9ece9cead4 Merge pull request #36 from dabingnn/v3Animation 
V3 animation
 2014-06-13 12:03:06 +08:00
Huabing.Xu f7b8acd6fd change pointer to std::vector for mesh 2014-06-13 11:59:13 +08:00
boyu0 ee919b673f issue #4437: config for android and linux. 2014-06-13 11:07:21 +08:00
yinkaile 75ff67c0ec Merge pull request #8 from pipu/v3_kaile 
V3 kaile
 2014-06-13 10:52:48 +08:00
pipu 65c2a5e3e1 add parse actionTag in loadWidget method of CCNodeReader 2014-06-13 10:49:57 +08:00
pandamicro 7ccff325b6 Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage 2014-06-13 10:29:40 +08:00
lvlong 3af0bdfef6 texture 2014-06-13 09:18:25 +08:00
yangxiao 09fe7e13b7 blendstate 2014-06-13 09:12:29 +08:00
Dale Stammen 2d913470a0 updated fast resume code for app 2014-06-12 16:36:53 -07:00
Dale Stammen 29b9da34ea updated to latest version of Angle to fix memory leak when switching apps 2014-06-12 16:35:24 -07:00
Dale Stammen b0bc971523 fixed reloading of cocos2d-x after app switch 2014-06-12 16:34:21 -07:00
Dale Stammen 70f3f0f913 release glTextures before reloading cached textures 2014-06-12 16:31:46 -07:00
Dale Stammen 48404a8fb5 fixed reloading of textures from VolatileTexture cache 2014-06-12 16:31:07 -07:00
Dale Stammen 49a94a20ef added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures 2014-06-12 16:28:38 -07:00
Dale Stammen 2c5b449c9c updated app name to App 2014-06-12 16:27:09 -07:00
2youyou2 f09b1863a9 fixed read sprite 2014-06-12 20:16:39 +08:00
yinkaile 8174481575 Merge pull request #7 from pipu/v3_kaile 
update TimelineAction
 2014-06-12 19:57:55 +08:00
pipu c0170d23c7 fixed warnings 2014-06-12 19:56:15 +08:00
pipu 1cb7dd58ec add CCNodeReader into project 2014-06-12 19:40:58 +08:00
2youyou2 b36741865c add hd resource 2014-06-12 19:38:08 +08:00
2youyou2 f63939945d change NodeCache to NodeReader 2014-06-12 19:34:22 +08:00
2youyou2 b2c5334de1 change NodeCache to NodeReader 2014-06-12 19:24:27 +08:00
2youyou2 eb2e973e07 change read name 2014-06-12 19:12:05 +08:00
2youyou2 ea7e24ba24 add TimelineActionData 2014-06-12 18:50:37 +08:00
lvlong dbadabb6e9 skin: getPosition() 2014-06-12 18:46:45 +08:00
yangxiao ae0b850d89 boneblendstate 30% 2014-06-12 18:32:47 +08:00
lvlong 14f4b6430f modify 3dloader, you can run animation. 2014-06-12 18:26:42 +08:00
minggo 1b24af95f1 [ci skip] 2014-06-12 18:23:31 +08:00
minggo cf7c603d79 Merge pull request #7036 from visiblelight/new_blur_shader 
New shader for the blur effect
 2014-06-12 18:20:38 +08:00
2youyou2 e4f1ac6126 add hd resource 2014-06-12 17:38:26 +08:00
2youyou2 7eda0ae999 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-12 16:43:04 +08:00
yinkaile 5462b343dc Merge pull request #6 from pipu/v3_kaile 
V3 kaile
 2014-06-12 16:34:06 +08:00
lvlong 1ca69d2689 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2014-06-12 16:28:36 +08:00
pipu f191c72732 add TimeLineAction into project 2014-06-12 16:27:45 +08:00
2youyou2 db992b6d0f modify cocostudio Android.mk 2014-06-12 16:26:18 +08:00
2youyou2 f536020d26 remove unused files 2014-06-12 16:21:41 +08:00
minggo 1187cfff6d [ci skip] 2014-06-12 16:19:05 +08:00
minggo d1ca81634a [ci skip] 2014-06-12 16:18:22 +08:00
minggo eb21bf1ad1 Merge pull request #7030 from Rumist/v3 
#5506 bug fix
 2014-06-12 16:16:13 +08:00
minggo f6913fc931 [ci skip] 2014-06-12 16:12:03 +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
gin0606 80c5349d75 Fix crash when videoView to remove in android 2014-06-12 16:47:08 +09:00
yangxiao ee5aa0f648 android work 2014-06-12 15:42:53 +08:00
samuele3hu c6b913145c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-12 15:41:52 +08:00
samuele3hu 27a3a46d62 Modify the implemetation of `LuaStack::executeScriptFile` 2014-06-12 15:39:59 +08:00