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

20775 Commits

Author SHA1 Message Date
elsanide 4b7b32e81e BUG FIX : #5553 
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
 2014-06-13 15:24:37 +09:00
minggo fbae2e96f1 Merge pull request #7058 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-06-13 14:22:56 +08:00
zhangbin 60c08dcb47 Update the reference of submodule cocos2d-console. 2014-06-13 14:15:17 +08:00
samuele3hu 5b6330d59b Add more conversion functions and manual binding functions 2014-06-13 14:10:08 +08:00
minggo 19fa4733c5 Merge pull request #7029 from samuele3hu/v3_lua_ui_fix 
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
 2014-06-13 13:41:52 +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
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
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
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
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
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
Huabing.Xu 9acf8e6253 fix bug for deleteTexture 2014-06-12 15:22:41 +08:00
minggo bb5471ca8b [ci skip] 2014-06-12 15:07:29 +08:00
minggo 77fdd124a1 [ci skip] 2014-06-12 15:05:31 +08:00
minggo 5a28ba68b4 Merge pull request #7031 from sachingarg05/GLProgramNoAbort 
GLProgram should not abort() if shader compilation fails, returning false is better.
 2014-06-12 15:03:29 +08:00
minggo 22f445d56f [ci skip] 2014-06-12 14:47:42 +08:00
minggo ed14108ab1 Merge pull request #7042 from Dhilan007/v3-systemfont-ios 
LinWenhai	fixed calculating height of multi-line string was incorrect on IOS.
 2014-06-12 14:44:26 +08:00
Dhilan007 b2d8e4fc93 add assert. 2014-06-12 14:41:01 +08:00
minggo 85a9e85dfd Merge pull request #7045 from heliclei/commit-status-desc 
[ci skip] Set github commit status context & description
 2014-06-12 14:40:55 +08:00
yangxiao e37c6ab7ee test action sequence 2014-06-12 14:20:38 +08:00
samuele3hu 5bdecadd70 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix 2014-06-12 14:09:00 +08:00
Huabing.Xu e70918e325 extract Animation3DData 2014-06-12 14:03:33 +08:00
minggo 6845a69655 issue #4693: remove unneede codes 2014-06-12 14:00:41 +08:00
minggo 990c491746 issue #4693: add test case for getName, setName, getChildByName and enumerateChildren 2014-06-12 13:55:23 +08:00
samuele3hu c2288936db Remove `handleStudioEventListener` of LuaEngine 2014-06-12 13:50:52 +08:00
samuele3hu f687f63bfd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-12 13:44:15 +08:00