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

28836 Commits

Author SHA1 Message Date
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
tangziwen 380d829548 move reset draw polygon state in corresponding position 2015-04-13 10:14:03 +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
pipu 755134ba3f Update parse animation easing 2015-04-10 17:05:55 +08:00
Wenhai Lin 1949348124 Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached. 2015-04-10 17:01:21 +08:00
minggo 698d93a42b Merge pull request #11379 from WenhaiLin/v3-physics-fix 
Physics: Fixed position of physics body is wrong when the position of parent node changes
 2015-04-10 16:45:45 +08:00
minggo 9876f0765e [ci skip]update CHANGELOG 2015-04-10 16:43:21 +08:00
minggo 3d2fb6250e Merge pull request #11378 from andyque/fix-outline-update-do-not-change-content-size 
fix ui::Text outline don't change content size
 2015-04-10 16:41:24 +08:00
minggo e2d71d3724 Merge pull request #11377 from CocosRobot/update_lua_bindings_1428650747 
[AUTO]: updating luabinding automatically
 2015-04-10 16:41:09 +08:00
songchengjiang 783b159abc naming error 2015-04-10 16:09:39 +08:00
songchengjiang 6b8d8a4774 fix the bug of PUParticle3DQuadRender 2015-04-10 15:58:16 +08:00
Wenhai Lin 97082cb169 Physics: Fixed position of physics body is wrong when the position of parent node changes 2015-04-10 15:39:39 +08:00
andyque 10c90b06aa fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
CocosRobot 15f22d936f [AUTO]: updating luabinding automatically 2015-04-10 07:27:51 +00:00
minggo 68fc4ad741 [ci skip]update CHANGELOG 2015-04-10 15:25:46 +08:00
minggo 554901bb12 [ci skip]update CHANGELOG 2015-04-10 15:24:43 +08:00
minggo c70314eedc Merge pull request #11375 from andyque/fix-ui-text-contentSize-not-change 
add disableEffect API for ui::Text
 2015-04-10 15:22:41 +08:00
xiaofeng11 bdc67d9573 Merge pull request #14 from pipu/test_samples 
Test samples
 2015-04-10 15:09:05 +08:00
pipu 7a67b6ccce Test samples 2015-04-10 14:52:54 +08:00
xiaofeng11 5ec9b14a33 Merge pull request #13 from geron-cn/xiaov3 
fix
 2015-04-10 14:27:09 +08:00
geron-cn b8083f2c99 fix 2015-04-10 14:24:48 +08:00
tangziwen a7aed360a1 update terrain 2015-04-10 14:22:07 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
xiaofeng11 dda662a7c1 Merge pull request #12 from geron-cn/xiaov3 
add blendfunc frame
 2015-04-10 14:04:35 +08:00
geron-cn d238f9905e add blendfunc frame 2015-04-10 13:34:39 +08:00
songchengjiang a6e83ca35b fix the bug of makeParticleLocal function 2015-04-10 11:31:39 +08:00
xiaofeng11 ee98b40af9 Merge pull request #11 from geron-cn/xiaov3 
add tween easing to ccframe
 2015-04-10 10:46:58 +08:00
minggo 45817683ed Merge pull request #11366 from super626/v3 
Fix PURibbonTrail bug
 2015-04-10 09:58:41 +08:00
minggo 16cb5f32d3 [ci skip]update CHANGELOG 2015-04-10 09:37:45 +08:00
minggo e59e61b34f [ci skip]update AUTHORS 2015-04-10 09:35:26 +08:00
minggo 0aef6b9446 Merge pull request #11295 from Almax27/v3 
RenderQueue command buffer optimisation
 2015-04-10 09:33:43 +08:00
XiaoYang fc4ffe6a7c Merge pull request #295 from songchengjiang/v3 
fix the bug of PURibbonTrail
 2015-04-10 09:09:45 +08:00
Ricardo Quesada b409f20fcd Merge pull request #11365 from ricardoquesada/cpp_compiles_on_mac 
removes warning
 2015-04-09 15:41:54 -07:00
Ricardo Quesada 967f35ad82 removes warning 
warnings are treated as errors on Mac.
Why this was even merged? Do we have a Mac builder? The Mac builder
should fail.
 2015-04-09 15:15:15 -07:00
geron-cn c206725be5 fix color 2015-04-09 19:13:14 +08:00
Igor Mats f5c61b4f9a Ooops. 2015-04-09 13:36:17 +03:00
minggo 09c50c44dc Merge pull request #11224 from hawkwood/patch-7 
Remove use of autorelease NSString and NSURL
 2015-04-09 18:36:07 +08:00