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

19664 Commits

Author SHA1 Message Date
andyque 62a66872aa issue #4861, fixed some boundary conditions 2014-05-07 10:05:20 +08:00
Ricardo Quesada db759005e0 Improvements for Attributes and Uniform API 2014-05-06 17:58:14 -07:00
Ricardo Quesada 21dd6fef69 Improves code a little bit 2014-05-06 12:46:35 -07:00
Trace cf9e8ff0bd Merge branch 'newV3' into improved_glprogram 
Conflicts:
	cocos/2d/CCGLProgram.cpp
	cocos/2d/CCGLProgram.h
 2014-05-06 12:07:42 -07:00
Trace 69fd841b30 fix the include error 2014-05-06 11:19:51 -07:00
Ricardo Quesada 720852681e Adds license to VertexAttribBind 2014-05-06 11:15:40 -07:00
yangxiao bbd4533c5e Improves GLProgram 
Adds vetex attrib bind class
 2014-05-06 11:03:24 -07:00
James Chen a4ce0687f4 Merge pull request #6591 from CocosRobot/update_cocosfiles_1399375244 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-06 20:35:32 +08:00
CocosRobot 12ba2b178e [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-06 11:20:46 +00:00
James Chen 706b33f9dd Merge pull request #6590 from dumganhar/v3 
Re-adds download-deps.py, comments unzip functionality, please help to test the download functionality. Thanks.
 2014-05-06 19:18:49 +08:00
James Chen dab2eed48a Speed calculate fix 2014-05-06 19:13:05 +08:00
James Chen 85d545cc30 Percent number fix 2014-05-06 18:36:37 +08:00
James Chen cafe263883 Re-adds download-deps.py, comments unzip functionality, please help to 
test the download functionality. Thanks.
 2014-05-06 18:33:52 +08:00
andyque 9d71ae29b9 issue #4861. fixed all widget focus diabled bug 2014-05-06 17:28:12 +08:00
chuanweizhang2013 c3d7465cc7 move win menu bar to sysmenu 2014-05-06 17:03:40 +08:00
andyque 51a704dcc8 issue #4861, refactor improve nested focus test 2014-05-06 15:11:55 +08:00
James Chen ac7fd0069b Merge pull request #6559 from shujunqiao/cocos-console-hang 
fixed one-hang-bug in cocos-console-test.py. [ci skip]
 2014-05-06 15:11:07 +08:00
andyque 29c57568bf issue #4861, add nested focus test 2014-05-06 14:38:45 +08:00
andyque e52370e1c2 issue #4861, refactor UIFocusTest, simplify code 2014-05-06 14:20:01 +08:00
andyque ad4e1f1e2c issue #4861, improve UIFocusTest, add click event to ImageView 2014-05-06 14:14:22 +08:00
samuele3hu 3017c776e1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-06 13:59:44 +08:00
samuele3hu 0ce2a38f17 Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test 2014-05-06 13:59:16 +08:00
andyque a15dd55baa closed #3861, fixed some typo and indent problem 2014-05-06 12:04:52 +08:00
minggo 1caa7ece9a [ci skip] 2014-05-06 11:56:00 +08:00
minggo 07df728919 [ci skip] 2014-05-06 11:51:34 +08:00
minggo 9634da6ce7 [ci skip] 2014-05-06 11:47:53 +08:00
andyque bcd2d3ccb3 issue #3861, fix layout contentSize caculation 2014-05-06 11:46:28 +08:00
minggo 7830818fc0 Merge pull request #6553 from Dhilan007/v3_labelhotfixed 
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
 2014-05-06 11:41:24 +08:00
Dhilan007 989b3830aa fixed indent 2014-05-06 11:22:23 +08:00
Dhilan007 e412f91103 [hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font. 2014-05-06 10:36:55 +08:00
minggo 302ec843e7 Merge pull request #6577 from MSOpenTech/v3-wp8-fix 
V3 wp8 fix
 2014-05-06 10:26:19 +08:00
andyque e65b144ee6 issue #3861, fixs windows compile error 2014-05-06 10:17:10 +08:00
Ricardo Quesada e1b90c19f1 Merge pull request #6586 from dabingnn/v3_unify_ZERO_ONE 
V3 unify zero one
 2014-05-05 19:06:48 -07:00
andyque 16ebe8d41c issue #3861, fix linux compile error 2014-05-06 09:40:50 +08:00
Huabing.Xu c581f74142 Merge branch 'v3' into v3.1_unify_ZERO_ONE 2014-05-05 18:10:13 -07:00
Huabing.Xu 32f9a8ffc6 comment out warning code in quaternion.cpp 
unify ZERO, ONE, UNIT_X/Y/Z/W into a consistent convention
 2014-05-05 18:07:58 -07:00
James Chen c91f94fa5c Merge pull request #6585 from CocosRobot/update_lua_bindings_1399337119 
[AUTO]: updating luabinding automatically
 2014-05-06 08:51:56 +08:00
CocosRobot db99518c80 [AUTO]: updating luabinding automatically 2014-05-06 00:46:16 +00:00
Ricardo Quesada 157b46b2cb Merge pull request #6584 from ricardoquesada/math_cocos2d_fixes 
math cocos2d fixes
 2014-05-05 17:42:47 -07:00
Ricardo Quesada afaa701cff math cocos2d fixes 2014-05-05 17:42:11 -07:00
Ricardo Quesada f12ea26611 Merge pull request #6582 from ricardoquesada/math_fixes 
math fixes
 2014-05-05 17:11:37 -07:00
Ricardo Quesada 4483d653d5 math fixes 
- Moves deprecated Point to CCDeprecated.h
- Adds Point2 and Point3
- removes `math` from `cocos2d::math` namespace
 2014-05-05 17:10:41 -07:00
Ricardo Quesada 6a12c01427 Merge pull request #6581 from CocosRobot/update_lua_bindings_1399334264 
[AUTO]: updating luabinding automatically
 2014-05-05 17:06:03 -07:00
CocosRobot 5db3fa8df0 [AUTO]: updating luabinding automatically 2014-05-05 23:58:54 +00:00
Ricardo Quesada 666e820a2a Merge pull request #6580 from ricardoquesada/sprite_new_fixes 
Revert `new Sprite` change done a few days ago
 2014-05-05 16:54:50 -07:00
Ricardo Quesada e413b86295 Revert `new Sprite` change done a few days ago 
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
 2014-05-05 16:53:37 -07:00
Ricardo Quesada 80ecdc8d2a Merge pull request #6578 from ricardoquesada/particles_without_texture 
Particles can be created without texture
 2014-05-05 15:51:26 -07:00
Ricardo Quesada 0e6dd9afe5 Particles can be created without texture 
Needed for complex particles like in EarthWarrior3D
 2014-05-05 15:50:08 -07:00
Dale Stammen 8b5d255296 removed obsolete include files 2014-05-05 13:52:20 -07:00
Dale Stammen 12daf49900 added missing Assets folder 2014-05-05 13:48:31 -07:00