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

22764 Commits

Author SHA1 Message Date
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
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
minggo 46cdd6f8dd Merge pull request #7701 from dabingnn/v3_renderPrimitive 
V3 render primitive
 2014-08-12 16:11:40 +08:00
minggo cc37780861 Merge pull request #7736 from dabingnn/v3_addSkinnedOutline 
V3 add skinned outline
 2014-08-12 15:07:21 +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
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
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
minggo e3723d8398 Merge pull request #7734 from 2youyouo2/v3 
fixed bone rotation isn't right
 2014-08-12 09:51:12 +08:00
Huabing.Xu 0dff45cfc2 adjust SkinnedEffectCode 2014-08-12 09:51:03 +08:00
minggo ba092ede25 Merge pull request #7732 from andyque/addDLLExportToLayoutParameter 
add virtual destructor
 2014-08-12 09:49:29 +08:00
zhangbin 88382994b9 Modify the gen-prebuilt tools for the lua-bindings modules. 2014-08-12 09:37:51 +08:00
kaile.yin 358b1f6736 fixed bone rotation isn't right 2014-08-11 19:53:51 +08:00
Huabing.Xu e66d1f6f69 add skinned outline effect 2014-08-11 18:11:15 +08:00
huangshiwu 77bc3a0e60 GLView modefy additional 2014-08-11 16:55:23 +08:00
minggo e0ef4d16d3 Merge pull request #7724 from cpascal/fix_ime 
Fix a correct onGLFWCharCallback
 2014-08-11 16:18:59 +08:00
minggo ec1864cb7a Merge pull request #7731 from dabingnn/v3_add_CC_DLL_For_cocos2dVersion 
add missed CC_DLL for cocos2dVersion function
 2014-08-11 16:18:31 +08:00
huangshiwu 1177b0d545 CCGLView modefy 2014-08-11 16:15:02 +08:00
andyque 3e1f7119f9 add virtual destructor 2014-08-11 15:54:40 +08:00
Huabing.Xu 5086758063 add missed CC_DLL for cocos2dVersion function 2014-08-11 15:50:48 +08:00
minggo b34e97cfd6 Merge pull request #7729 from andyque/fixCascadedColor 
fixed Widget's Children reload textures change RGBA issue
 2014-08-11 15:33:36 +08:00
zhangbin e493c0b3c8 Merge branch 'v3' into gen-prebuilt-script 2014-08-11 15:09:06 +08:00
minggo 5016da321e Merge pull request #7730 from CocosRobot/update_cocosfiles_1407740805 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-11 15:07:26 +08:00
CocosRobot f8f15df530 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-11 07:06:46 +00:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
minggo 43a3603a8b Merge pull request #7720 from samuele3hu/v3_module 
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
 2014-08-11 15:01:28 +08:00
minggo 3704800fa5 Merge pull request #7728 from super626/v3_merge 
Fix Camera
 2014-08-11 14:59:31 +08:00
Huabing.Xu c1a71453d5 Merge branch 'v3_renderPrimitive' into v3 2014-08-11 14:39:16 +08:00
Huabing.Xu 031efaf242 Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3 2014-08-11 14:37:43 +08:00
Huabing.Xu 6aff707eab windows work now for renderPrimitive 2014-08-11 14:18:07 +08:00
samuele3hu 3c3c05204f Split files in lua-bindings/script into different module and adjust related project 2014-08-11 12:54:30 +08:00
Huabing.Xu 2a28744dc5 Merge branch 'v3' into v3_renderPrimitive 2014-08-11 12:48:23 +08:00
yangxiao 6d15c26a61 move create default camera to Scene::initWithSize 2014-08-11 10:55:14 +08:00
minggo e4faa4f9b1 [ci skip] 2014-08-11 10:37:23 +08:00
minggo 0f942d3417 Merge pull request #7719 from boyu0/physics_bitmask_fix 
fix PhysicsBody bitmask bug.
 2014-08-11 10:35:06 +08:00
samuele3hu 47c034af5d Rename experimentalConstants.lua to experimentalUIConstantslua and modify related project configure 2014-08-11 10:25:40 +08:00
minggo d413acc1b7 Merge pull request #7721 from heliclei/libsize-tracking 
[ci skip][jenkins]Add script to track android built libs size
 2014-08-11 10:16:34 +08:00