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

29453 Commits

Author SHA1 Message Date
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
minggo 6805d24ba3 Merge pull request #10716 from andyque/fix-jenkinw-win32 
fix jenkins compile erorr
 2015-03-04 12:50:49 +08:00
andyque 92fb735611 fix jenkins compile erorr 2015-03-04 12:09:12 +08:00
yangxiao ea7dfe1147 lua test 2015-03-04 10:42:08 +08:00
andyque d942cc5a70 upgrade v3-deps to 34 2015-03-04 10:30:18 +08:00
andyque cf2062ac64 ignore certain folders 2015-03-04 10:29:24 +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 38b24b3c10 Merge pull request #10712 from MSOpenTech/v3-wp8-fix 
V3 WP8/Universal App fixes
 2015-03-04 09:45:06 +08:00
Nite Luo e23eeafa4d Create test case for show/hide mouse 2015-03-03 14:52:55 -08:00
Dale Stammen e93fe1b13b Merge branch 'v3' into v3-wp8-fix 2015-03-03 08:40:07 -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
cpascal db9985d7cd Added new line with the left curl bracket. 2015-03-03 20:39:25 +09: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
byeonggee.seo b3335f34ae Merge branch 'network_bugfix2' of github.com:seobyeongky/cocos2d-x into network_bugfix2 2015-03-03 16:33:48 +09:00
byeonggee.seo 3811c9f1a3 connError added 2015-03-03 16:33:35 +09:00
Nite Luo 49912c2f62 clean up the formatting 2015-03-02 23:29:15 -08:00
Chad 395c14f07d Hide Cursor - Feature Request #8766 
Added the ability to hide or show the cursor on desktop builds.
 2015-03-02 23:21:18 -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
XiaoYang 399ad3ec31 Merge pull request #244 from tangziwen/terrain 
terrain
 2015-03-03 14:21:24 +08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
yangxiao 6023777133 reset modify 2015-03-03 14:12:12 +08:00
cpascal a6ee1451f4 changed one more indentation. 
I made mistake, (now replacing the spaces to tab)
 2015-03-03 13:44:43 +09:00
cpascal 4058e16f16 Added line break & removed function call in compare operator. 2015-03-03 13:40:40 +09: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