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

27537 Commits

Author SHA1 Message Date
XiaoYang 231f139a75 Merge pull request #247 from songchengjiang/particle_merge 
fix bugs
 2015-03-04 15:47:47 +08:00
songchengjiang 590912ba49 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-04 15:29:05 +08:00
songchengjiang 4783ac4f86 remove setParticleSystemScaleVelocity 2015-03-04 15:18:03 +08:00
yangxiao 9665bb6dd8 add to linux project 2015-03-04 15:17:37 +08:00
songchengjiang d861220993 restore model search path 2015-03-04 14:56:04 +08:00
yangxiao 573fdafbd8 android work 2015-03-04 14:25:46 +08:00
songchengjiang 7c1e8e1a08 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 
Conflicts:
	tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
 2015-03-04 14:12:34 +08:00
songchengjiang 1b0fc162b0 fix bugs 2015-03-04 13:19:42 +08:00
yangxiao 6a6877b39f add particle to lua test 2015-03-04 12:59:22 +08:00
yangxiao b938872621 lua binding 2015-03-04 12:58:51 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
yangxiao e466b5d231 fix warning 2015-03-04 10:24:07 +08:00
yangxiao a92a8ac924 particle to transparent queue 2015-03-04 10:10:33 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
minggo 009c94b422 Merge pull request #10710 from CocosRobot/update_lua_bindings_1425395595 
[AUTO]: updating luabinding automatically
 2015-03-03 23:18:17 +08:00
CocosRobot 93c2b48779 [AUTO]: updating luabinding automatically 2015-03-03 15:15:43 +00:00
minggo 13e4525772 Merge pull request #10659 from super626/v3 
Remove expolosion particle
 2015-03-03 23:03:02 +08:00
Huabing.Xu ccded2cb1a Merge pull request #10706 from andyque/fix-jenkins-compile-issue 
fix v3 win32 build issue
 2015-03-03 21:14:56 +08:00
andyque 2e2fb122e6 fix v3 win32 build issue 2015-03-03 18:35:43 +08:00
yangxiao 36723fcb68 reset submodule 2015-03-03 18:34:51 +08:00
yangxiao f34ce304de Merge branch 'v3.3' into particle_merge 2015-03-03 18:17:10 +08:00
yangxiao 901cfd627b Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-03 17:59:25 +08:00
XiaoYang 25e987f3a5 Merge pull request #246 from songchengjiang/particle_merge 
replace star.pu with lineStreak.pu
 2015-03-03 17:57:54 +08:00
songchengjiang d25c025cbe replace star.pu with lineStreak.pu 2015-03-03 17:53:19 +08:00
yangxiao 9e06a4b848 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-03 17:47:22 +08:00
XiaoYang 8092437463 Merge pull request #245 from songchengjiang/particle_merge 
add test demo
 2015-03-03 17:46:47 +08:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
minggo 885a740a76 Merge pull request #10702 from andyque/fix-jenkins-compile-issue 
refactoring Jenkins PR builder script and add backup slave name to slave build name list
 2015-03-03 17:09:00 +08:00
andyque 23e49fe2b7 modify building slaves name lists in each slave 2015-03-03 16:42:48 +08:00
andyque 7b183a13ad sync jenkins script with v4-develop 2015-03-03 16:36:42 +08:00
yangxiao 18a3a23a2e adjust code style 2015-03-03 15:57:03 +08:00
yangxiao db5c098ca8 adjust 2015-03-03 15:13:47 +08:00
songchengjiang 9bdcdec60a add test demo 
use particleSystemScaleVelocity
 2015-03-03 15:10:42 +08:00
yangxiao 6023777133 reset modify 2015-03-03 14:12:12 +08:00
XiaoYang 791224ee09 Merge pull request #242 from songchengjiang/particle_merge 
update particles
 2015-03-03 11:56:08 +08:00
songchengjiang e650ef2b4d check sprite == nullptr 
remove unneeded namespace
 2015-03-03 11:52:55 +08:00
songchengjiang 6b046c5236 add log to Render 2015-03-03 11:42:15 +08:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
songchengjiang def8da1612 remove unneeded code 2015-03-03 10:33:28 +08:00
songchengjiang 6a3e810bc2 code optimization 2015-03-03 10:15:49 +08:00
Huabing.Xu e836e98dc4 Merge pull request #10694 from andyque/fix-windows-jenkins-compile-issue 
fix new windows jenkins slave compile error
 2015-03-02 21:00:14 +08:00
andyque 992cc52a02 fix new windows jenkins slave compile error 2015-03-02 19:43:27 +08:00
songchengjiang a3ae37ac7a optimization 2015-03-02 17:47:26 +08:00
songchengjiang a9eb4dc7f9 support read material files on linux 
modify the name of getAliveParticleCnt function
 2015-03-02 16:28:38 +08:00
songchengjiang 79d892bffc add std::nothrow 
modify Copyright
 2015-03-02 16:05:26 +08:00
songchengjiang a71aed6cc8 mix particle with sprite3D 2015-03-02 13:51:43 +08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
yangxiao 924a3cdff0 create particle with pu and material 2015-02-28 14:26:33 +08:00