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

22963 Commits

Author SHA1 Message Date
yangxiao 76329f9e53 add camera mask check to visit 2014-08-13 12:06:51 +08:00
andyque e2d609c05d add UITextField color & place hold color, fix double delete bug 2014-08-13 11:28:37 +08:00
samuele3hu 5b1ceb5e5d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_fix 2014-08-13 10:31:12 +08:00
samuele3hu 8ab7647b54 Add release_print lua bindings 2014-08-13 10:27:06 +08:00
Huabing.Xu 5b99ee71c1 add comment for the limit of RenderTextue::saveToFile 2014-08-13 10:14:26 +08:00
minggo f068cd2458 Merge pull request #7757 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-08-13 10:10:13 +08:00
minggo a6c25450ef Merge pull request #7747 from liang8305/v3 
AssetsManager not follow rediect, and will not download again when uncompress false
 2014-08-13 10:07:33 +08:00
zhangbin c8ad850d68 Update the reference of submodule cocos2d-console. 2014-08-13 10:06:22 +08:00
minggo a2cafa29e5 [ci skip] 2014-08-13 10:06:14 +08:00
minggo d223629477 Merge pull request #7754 from dabingnn/v3_addCallBackForRenderTexture 
add callback for RenderTexture::saveToFile
 2014-08-13 10:05:08 +08:00
andyque e269ad49c1 fix custom particle tests position 2014-08-13 09:56:37 +08:00
minggo 9ae20d1bd3 Merge pull request #7740 from GavinThornton/v3 
Update CCEventTouch.h
 2014-08-13 09:39:17 +08:00
minggo 218cbefd96 Merge pull request #7752 from CocosRobot/update_cocosfiles_1407893243 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-13 09:34:33 +08:00
minggo bdc5a7b306 [ci skip] 2014-08-13 09:30:33 +08:00
CocosRobot 93800c5821 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-13 01:27:24 +00:00
minggo 39206b5500 Merge pull request #7748 from super626/v3_merge 
Fix Camera
 2014-08-13 09:25:47 +08:00
Mircea Rila 5a42a94d21 update AUTHORS 2014-08-12 22:31:28 +03:00
Mircea Rila cfafeb1e87 add minimize / restore for win32 2014-08-12 22:22:47 +03:00
Mircea Rila 0154f7a94a virtual Node::pause() / Node::resume() 2014-08-12 21:05:09 +03:00
yangxiao 96500a17d6 reset ParticleMainScene 2014-08-12 23:39:34 +08:00
yangxiao 5ce9afbd69 create default camera at Scene constructor 2014-08-12 23:34:06 +08:00
胖梁 c673955d5d uncompress false means zip wrong, download again 2014-08-12 20:13:52 +08:00
胖梁 0b93cc40d7 when http code 301,302, can follow rediect 2014-08-12 20:12:23 +08:00
yangxiao 0dbfb3336c call Scene::init 2014-08-12 17:47:12 +08:00
yangxiao 46e59f1150 Merge branch 'newcode' into v3_merge 2014-08-12 17:34:58 +08:00
yangxiao 2d18763f76 call Scene::init 2014-08-12 17:32:51 +08:00
samuele3hu a4f4fb2246 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-08-12 17:06:30 +08:00
samuele3hu d9fdfb2659 Modify cpp-template-default project configure 2014-08-12 17:05:39 +08:00
minggo 46cdd6f8dd Merge pull request #7701 from dabingnn/v3_renderPrimitive 
V3 render primitive
 2014-08-12 16:11:40 +08:00
GavinThornton 1d0deb0bc1 Update CCEventTouch.h 
MAX_TOUCHES=5 is less than most touch devices, iPad/Android tablets can almost all handle all 10-11 touches. Perhaps a value of 15 would be better? 

Note: There is a #define IOS_MAX_TOUCHES_COUNT 10 in CCEAGLView.mm already for this, but multitouch fails on touch 5 in "void GLViewProtocol::handleTouchesBegin" at the code:- 
            // The touches is more than MAX_TOUCHES ?
            if (unusedIndex == -1) {
                CCLOG("The touches is more than MAX_TOUCHES, unusedIndex = %d", unusedIndex);
                continue;
            }
 2014-08-12 01:02:06 -07:00
XiaoYang 24eae058a3 Merge pull request #82 from super626/obb2 
reset cocos2d project
 2014-08-12 15:25:35 +08:00
yangxiao 510b72d7c8 reset cocos2d project 2014-08-12 15:21:21 +08:00
minggo cc37780861 Merge pull request #7736 from dabingnn/v3_addSkinnedOutline 
V3 add skinned outline
 2014-08-12 15:07:21 +08:00
XiaoYang 0b2a6963c0 Merge pull request #81 from lvlonggame/obb 
Obb
 2014-08-12 14:46:31 +08:00
yangxiao 32645c1622 fix default camera, add listener for projection change 2014-08-12 14:42:08 +08:00
Huabing.Xu cb8c80de0d export MeshSkin as CC_DLL 2014-08-12 14:41:25 +08:00
lvlong f191bebe72 optimize Sprite3D get aabb. 2014-08-12 13:45:06 +08:00
minggo 66c5d996dc [ci skip] 2014-08-12 13:39:10 +08:00
minggo d80d7ed714 Merge pull request #7037 from boyu0/feature5537_physics_step 
closed #5537: add setAutoStep, isAutoStep and step method for PhysicsWorld
 2014-08-12 13:37:29 +08:00
Huabing.Xu 6cf2e7d091 add CC_DLL for primitive classes 2014-08-12 11:56:21 +08:00
Huabing.Xu 1145859d38 remove commented codes 2014-08-12 11:44:06 +08:00
boyu0 e4bb0ad3c8 fix some merge errors. 2014-08-12 11:39:56 +08:00
boyu0 5a2564755c change NULL->nullptr 2014-08-12 11:29:37 +08:00
Huabing.Xu 3a7b673164 add callback for RenderTexture::saveToFile 2014-08-12 10:50:57 +08:00
minggo 2601f5dba4 Merge pull request #7735 from natural-law/gen-prebuilt-script 
Optimize the implementation of gen-prebuilt tools.
 2014-08-12 10:41:52 +08:00
minggo b8ce300d9b Merge pull request #7737 from CocosRobot/update_lua_bindings_1407809186 
[AUTO]: updating luabinding automatically
 2014-08-12 10:41:23 +08:00
boyu0 790ef9e818 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step 
Conflicts:
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.h
 2014-08-12 10:20:34 +08:00
CocosRobot cbbe7b9c60 [AUTO]: updating luabinding automatically 2014-08-12 02:08:16 +00:00
Huabing.Xu e387caf763 add create(modelPath) interface for EffectSprite3D 2014-08-12 09:56:25 +08:00
minggo bed1ccf0f3 Merge pull request #7733 from huangshiwu/v3_glviewfix 
CCGLView modefy
 2014-08-12 09:51:27 +08:00