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

22510 Commits

Author SHA1 Message Date
Huabing.Xu 64c2ede765 IOS work now 
reset binding buffer to 0 after drawing
 2014-08-06 15:46:35 +08:00
Huabing.Xu b1954ef516 clean up primitive code 2014-08-05 17:49:35 +08:00
Huabing.Xu 01b69c9e4f Merge branch 'v3' into v3_migrateFastTMX 2014-08-05 17:30:11 +08:00
minggo befe284027 Merge pull request #7664 from CocosRobot/update_cocosfiles_1407217954 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 16:45:08 +08:00
minggo 7ef775db1b Merge pull request #7667 from CocosRobot/update_cocosfiles_1407227920 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 16:41:58 +08:00
CocosRobot 3a3cf0383d [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 08:38:41 +00:00
minggo f172a86e22 Merge pull request #7665 from dabingnn/v3_addNewAttribFlag 
V3 add new attrib flag
 2014-08-05 16:37:18 +08:00
Huabing.Xu 7353f036db Merge branch 'v3' into v3_addNewAttribFlag 2014-08-05 15:23:14 +08:00
Huabing.Xu 7fbd81aeca add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib 2014-08-05 15:15:17 +08:00
Huabing.Xu 56551e6787 fast_tmx migrate to primitive command 2014-08-05 15:08:01 +08:00
CocosRobot 839bfb7d55 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 05:52:35 +00:00
minggo 1bad9ddbc2 Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr 
V3 wp8glviewhookpr
 2014-08-05 13:51:15 +08:00
minggo 3814fe5592 Merge pull request #7663 from CocosRobot/update_lua_bindings_1407216814 
[AUTO]: updating luabinding automatically
 2014-08-05 13:40:16 +08:00
CocosRobot 24da61e443 [AUTO]: updating luabinding automatically 2014-08-05 05:35:12 +00:00
minggo 6771ee10a5 [ci skip] 2014-08-05 13:34:41 +08:00
minggo 2ece4b90fb [ci skip] 2014-08-05 13:32:55 +08:00
minggo cd98034f16 Merge pull request #7631 from maltium/v3 
added 3D rotation support to the RotateTo action
 2014-08-05 13:30:43 +08:00
minggo 376d218ff8 Merge pull request #7662 from CocosRobot/update_lua_bindings_1407210952 
[AUTO]: updating luabinding automatically
 2014-08-05 11:58:36 +08:00
CocosRobot f3e2ebf215 [AUTO]: updating luabinding automatically 2014-08-05 03:57:51 +00:00
minggo 99f9a0fb19 [ci skip] 2014-08-05 11:55:06 +08:00
minggo 0ff00ddbf7 [ci skip] 2014-08-05 11:53:37 +08:00
minggo 38e4ad0fbd Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview 
Update : added function for setting min/max scale
 2014-08-05 11:52:22 +08:00
minggo 2f41f031fa Merge pull request #7661 from CocosRobot/update_cocosfiles_1407204823 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 10:14:28 +08:00
CocosRobot 1772ab78ac [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:13:45 +00:00
minggo 06144bfc7a Merge pull request #7660 from CocosRobot/update_lua_bindings_1407204158 
[AUTO]: updating luabinding automatically
 2014-08-05 10:12:33 +08:00
minggo a6a90e4090 [ci skip] 2014-08-05 10:10:17 +08:00
CocosRobot 8dd1be5172 [AUTO]: updating luabinding automatically 2014-08-05 02:05:02 +00:00
minggo 326c76007a Merge pull request #7659 from CocosRobot/update_cocosfiles_1407204055 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-05 10:02:07 +08:00
CocosRobot 0f3fbfa07f [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-05 02:00:57 +00:00
minggo cc75a8e860 Merge pull request #7632 from super626/v3 
SubMesh and AttachMement
 2014-08-05 09:59:38 +08:00
minggo 6d09b00e1d Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback 
fix potential crash when user remove self in widgets callback
 2014-08-05 09:46:00 +08:00
minggo 34a0603a52 Merge pull request #7658 from andyque/fixButtonOpacityIssue 
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
 2014-08-05 09:39:13 +08:00
minggo a42bbaebf9 [ci skip] 2014-08-05 09:35:13 +08:00
minggo b6ceb507c0 [ci skip] 2014-08-05 09:33:37 +08:00
minggo 007e42faa0 Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak 
Fix iOS VideoPlayer memory leak.
 2014-08-05 09:30:52 +08:00
andyque f44906d56c fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property 2014-08-05 08:11:37 +08:00
takaken1994 1b74bc279a Fix : remove unused params from header file 2014-08-04 23:20:47 +09:00
takaken1994 6f26a7b983 Fix : remove verbose function 2014-08-04 23:20:13 +09:00
takaken1994 7c0919042f Fix : small bug 2014-08-04 23:17:09 +09:00
huangshiwu 25079ccbd8 delete wrong changes 2014-08-04 18:16:47 +08:00
Huabing.Xu f7ad98b15b using primitve->draw in Fast_tmx on draw 2014-08-04 17:57:31 +08:00
Huabing.Xu 95a8b23d64 fix draw bug in primitive when using indices 2014-08-04 17:56:56 +08:00
huangshiwu 9c87522199 little more modefy 2014-08-04 17:34:50 +08:00
Huabing.Xu a0d1b0dad8 allow null index buffer when create primitive 2014-08-04 17:21:23 +08:00
Huabing.Xu 2dca0a4809 remove IndexData class 2014-08-04 17:00:08 +08:00
huangshiwu 9a3f231771 merge v3 into v3_wp8glviewhookpr 2014-08-04 16:49:42 +08:00
Huabing.Xu 414d67851f add _vertexBuffer back in Fast_tmx 2014-08-04 16:36:20 +08:00
minggo cad0c40cd2 [ci skip] 2014-08-04 16:33:44 +08:00
minggo b96f91730a [ci skip] 2014-08-04 16:32:36 +08:00
minggo 93ee009366 Merge pull request #7656 from zii/v3 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 16:30:41 +08:00