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

38 Commits

Author SHA1 Message Date
yangxiao 578053d351 add macro on other platform 2015-03-06 18:03:11 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
yangxiao bac5377e8c format 2015-03-06 10:44:56 +08:00
yangxiao bec346bf73 add comments 2015-03-06 10:35:42 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
songchengjiang 4783ac4f86 remove setParticleSystemScaleVelocity 2015-03-04 15:18:03 +08:00
songchengjiang d861220993 restore model search path 2015-03-04 14:56:04 +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 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
XiaoYang 8092437463 Merge pull request #245 from songchengjiang/particle_merge 
add test demo
 2015-03-03 17:46:47 +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
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 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
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 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
yangxiao c216984b6f clear the particle pool when start 2015-02-26 13:57:18 +08:00
yangxiao 22d8917100 add Particle Universe copy right 2015-02-25 18:05:41 +08:00
yangxiao a50efe998f fix compile 2015-02-16 11:57:07 +08:00
yangxiao bdd7da89a1 add header 2015-02-16 11:26:06 +08:00
yangxiao 6c73e22a32 variable name error 2015-02-16 11:18:54 +08:00
yangxiao 5c8fbcedab load all materials linux routine 2015-02-16 10:03:58 +08:00
yangxiao f71b432d1d fix render release bug 2015-02-15 16:52:20 +08:00
yangxiao d34a9f68f2 check ParticleModelRender to avoid crash 2015-02-15 16:39:58 +08:00
yangxiao 6172302a9b ref path add extensions 2015-02-13 16:57:00 +08:00
yangxiao 954fd52493 rename folder and fix warning 2015-02-12 17:54:27 +08:00