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

28670 Commits

Author SHA1 Message Date
minggo 2b66bb7082 [ci skip] update version 2015-04-14 10:46:20 +08:00
minggo 4211b20134 Merge pull request #11414 from likexx/patch-1 
Update CCLabel.cpp
 2015-04-14 10:06:09 +08:00
minggo 7f1d48978f Merge pull request #11416 from super626/v3 
Sprite3D fix
 2015-04-14 10:04:22 +08:00
minggo d4d7a3a7b0 [ci skip]update CHANGELOG 2015-04-14 10:01:49 +08:00
minggo d246c33974 Merge pull request #11413 from WenhaiLin/v3-label-sf-position 
Label:Fixed the position of system font is wrong if it is visited by a new camera.
 2015-04-14 09:59:09 +08:00
minggo ee36556563 [ci skip]update AUTHORS 2015-04-14 09:41:07 +08:00
minggo f8cf6822b9 [ci skip]update CHANGELOG 2015-04-14 09:38:03 +08:00
minggo 06a2042a11 Merge pull request #11345 from IgorMats/v3 
Add getStroke/setStroke methods for motion streak.
 2015-04-14 09:36:03 +08:00
XiaoYang 37dc4c33d9 Merge pull request #300 from lvlonggame/v3 
fix bug: create single node recursively.
 2015-04-14 09:10:24 +08:00
Igor Mats e54a51be02 Fix comment. 2015-04-13 19:24:19 +03:00
likexx 6f341e3284 Update CCLabel.cpp 
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
 2015-04-13 20:53:34 +08:00
minggo bc34554bd9 Merge pull request #11407 from samuele3hu/v3_studio2 
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
 2015-04-13 18:22:18 +08:00
WenhaiLin d24a1243da Label:Fixed the position of system font is wrong if it is visited by a new camera. 2015-04-13 18:22:05 +08:00
minggo 09bc865867 Merge pull request #11411 from CocosRobot/update_cocosfiles_1428920104 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-13 18:21:49 +08:00
CocosRobot a8079d593a [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-13 10:15:05 +00:00
minggo 8d2517189c Merge pull request #11406 from WenhaiLin/v3-label-sf-scale 
Label:Fixed System font can't scale.
 2015-04-13 18:13:23 +08:00
yangxiao 284c8e5a97 add to animation cache 2015-04-13 17:14:58 +08:00
minggo 44cf1ee080 Merge pull request #11408 from andyque/v3 
Wrap Jenkins pull request builder scripts
 2015-04-13 16:53:05 +08:00
andyque 5190860ed4 Merge remote-tracking branch 'refs/remotes/upstream/v3' into v3 
Conflicts:
	tools/jenkins-scripts/pull-request-builder.py
 2015-04-13 16:50:26 +08:00
samuele3hu 24654a4847 synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests 2015-04-13 16:29:44 +08:00
WenhaiLin 9ef04943a8 Label:Fixed System font can't scale. 2015-04-13 16:28:55 +08:00
andyque f664efe889 fix gen scripting binding 2015-04-13 16:17:17 +08:00
andyque d45f66cdb9 fix the scripts 2015-04-13 16:11:09 +08:00
minggo d281e54cd2 Merge pull request #11403 from CocosRobot/update_lua_bindings_1428903754 
[AUTO]: updating luabinding automatically
 2015-04-13 16:02:49 +08:00
andyque 205c4efd9f add a wrapper for jenkins pull request build 2015-04-13 15:57:41 +08:00
CocosRobot 698a75e17f [AUTO]: updating luabinding automatically 2015-04-13 05:44:29 +00:00
minggo 07df23ed85 Merge pull request #11401 from andyque/fix-pull-requester-build 
print more infor about scripting binding
 2015-04-13 13:39:23 +08:00
andyque 6783754f3e fix typo 2015-04-13 12:00:09 +08:00
lvlong 57a44194f4 fix bug: create single node Recursively. 2015-04-13 11:35:52 +08:00
andyque 2176881dbe print more infor about jsb 2015-04-13 11:27:54 +08:00
minggo a2de59bac3 Merge pull request #11397 from andyque/fix-pull-requester-build 
fix PR requester builder prompt message position.
 2015-04-13 11:23:39 +08:00
minggo 39f40939b7 Merge pull request #11384 from super626/v3 
Fix PU bug
 2015-04-13 11:22:04 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3 
Reader update
 2015-04-13 11:20:53 +08:00
andyque 163cee699d fix PR requester builder promption. 2015-04-13 11:20:47 +08:00
minggo 1d1d574a61 Merge pull request #11393 from akermen/v3_fix_macros_namespace 
added 'cocos2d' namespace for macros
 2015-04-13 11:20:36 +08:00
minggo 5321f2a437 Merge pull request #11396 from andyque/fix-pull-requester-build 
[ci skip]fix PR builder doesn't work for tizen
 2015-04-13 11:19:15 +08:00
andyque 72691a6aac fix PR builder doesn't work for tizen 2015-04-13 11:18:08 +08:00
xiaofeng11 70d7dadeee Merge pull request #16 from samuele3hu/v3_studio 
Fix the bindings-generator error and add related Action Timeline test case.
 2015-04-13 09:21:45 +08:00
minggo 952f9da2c1 Merge pull request #11385 from super626/terrain 
Improve Terrain
 2015-04-13 09:18:50 +08:00
minggo b8e3e864d8 Merge pull request #11387 from CocosRobot/update_lua_bindings_1428660983 
[AUTO]: updating luabinding automatically
 2015-04-13 09:18:19 +08:00
samuele3hu 8896190d9b Fix the bindings-generator error and add related Action Timeline test case. 2015-04-12 22:20:53 +08:00
akermen 2957263c9d =cocos2d namespace added macros 2015-04-11 10:45:19 +03:00
akermen 1d83229956 =cocos2d namespace adder for CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES macro 2015-04-11 10:32:33 +03:00
minggo 8a160d76a3 [ci skip]update CHANGELOG 2015-04-10 18:34:45 +08:00
CocosRobot bd3b978c89 [AUTO]: updating luabinding automatically 2015-04-10 10:18:33 +00:00
minggo 9cc03407a8 Merge pull request #11383 from WenhaiLin/v3-physics-rotation 
Physics: Fixed the rotation of PhysicsBody is wrong if the rotation of node is set before PhysicsBody attached.
 2015-04-10 18:12:43 +08:00
XiaoYang 6703e63192 Merge pull request #298 from tangziwen/terrain 
update terrain
 2015-04-10 17:36:12 +08:00
XiaoYang e731b7792a Merge pull request #296 from songchengjiang/v3 
fix bugs
 2015-04-10 17:35:26 +08:00
songchengjiang ed407e7889 fix the bug of makeParticleLocal function 2015-04-10 17:32:13 +08:00
xiaofeng11 ed7907b712 Merge pull request #15 from pipu/parse_animation_easing 
Update parse animation easing.
 2015-04-10 17:10:02 +08:00