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

22841 Commits

Author SHA1 Message Date
zii 20c43e5684 Update ccUtils.h 2014-08-04 15:21:10 +08:00
zii 7659a1623f Update ccUtils.h 2014-08-04 15:20:45 +08:00
zii e151795c43 Update ccUtils.cpp 2014-08-04 15:18:01 +08:00
yangxiao 47838ce945 reset 2014-08-04 14:37:26 +08:00
zhangbin c0b1ce9ce6 Store the version of engine into the prebuilt engine. 2014-08-04 14:34:24 +08:00
yangxiao 01e0192a2d reset 2014-08-04 14:29:55 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
minggo 405be168b0 Merge pull request #7650 from andyque/fixTestUnicode 
fix windows utf8 source code file can not compile erorr
 2014-08-04 13:58:16 +08:00
yangxiao d6d3ea6b18 fix template 2014-08-04 13:12:59 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
zii 825209dd04 Update ccUtils.cpp 2014-08-04 11:48:23 +08:00
zii 97f06306e3 Update ccUtils.cpp 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 11:45:50 +08:00
Huabing.Xu a44f4c95e1 using indexBuffer instead of raw VBO 2014-08-04 10:40:07 +08:00
samuele3hu c5c394846c Adjust iOS and Mac tempts for Lua 2014-08-04 10:25:17 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
takaken1994 9692dfdc67 Update : added function for setting min/max scale 
Fix to remove unused params.
 2014-08-03 21:25:55 +09:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
xuzhiqiang 85dd898319 bug fix 2014-08-02 08:04:29 +08:00
andyque 5af4657fbb fix windows utf8 source code file can not compile erorr 2014-08-01 21:20:27 +08:00
andyque d7b17c598d fix potential crash when user remove self in widgets callback 2014-08-01 20:58:42 +08:00
AppleJDay 85cecb4ace roll back to fix compile error on jenkins 2014-08-01 18:02:54 +08:00
Huabing.Xu 3d4bfe7780 using VertexBuffer instead of raw buffer 2014-08-01 17:50:22 +08:00
AppleJDay b736202a55 replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013. 2014-08-01 17:37:30 +08:00
AppleJDay 2239fafade Merge branch 'v3' of github.com:AppleJDay/cocos2d-x 2014-08-01 17:22:43 +08:00
AppleJDay c2742e6484 Merge pull request #4 from cocos2d/v3 
update
 2014-08-01 17:19:49 +08:00
zhangbin f53473d7ba Consider the lua-bindings when generating prebuilt engine. 2014-08-01 16:30:45 +08:00
minggo f74626e946 Merge pull request #7648 from CocosRobot/update_cocosfiles_1406879885 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-01 15:59:03 +08:00
CocosRobot ea1d9d4657 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 07:58:06 +00:00
minggo 6d6864056d Merge pull request #7646 from CocosRobot/update_lua_bindings_1406879478 
[AUTO]: updating luabinding automatically
 2014-08-01 15:56:09 +08:00
CocosRobot fda11428bf [AUTO]: updating luabinding automatically 2014-08-01 07:53:19 +00:00
minggo 2ca623a26a Merge pull request #7630 from huangshiwu/v3_pr 
GLView Hook
 2014-08-01 15:47:45 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
andyque 6dee943352 fix mac EditBox callback issue 2014-08-01 14:56:47 +08:00
Huabing.Xu f269d7345e original version of PrimitiveCommand 2014-08-01 14:46:35 +08:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
Ningyu 137de84b05 add test case 2014-08-01 14:39:45 +08:00
andyque 630c41e4a3 Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549 2014-08-01 13:37:27 +08:00
minggo e5aad1fa39 Merge pull request #7641 from CocosRobot/update_lua_bindings_1406865618 
[AUTO]: updating luabinding automatically
 2014-08-01 12:04:18 +08:00
minggo 80eaca9d84 Merge pull request #7640 from CocosRobot/update_cocosfiles_1406865528 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-01 12:02:48 +08:00
CocosRobot 26c76f5cf1 [AUTO]: updating luabinding automatically 2014-08-01 04:02:13 +00:00
minggo 0c9b960de3 [ci skip] 2014-08-01 12:01:12 +08:00
minggo 780549e5a7 [ci skip] 2014-08-01 11:59:44 +08:00
CocosRobot ce8c5ee327 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 03:58:50 +00:00
minggo 0b6254d095 Merge pull request #7587 from dzl-ian/fixTextWidgetColor 
Add getter and setter for TextColor to Text Widget
 2014-08-01 11:57:10 +08:00
kaile.yin d1407ca929 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-01 11:42:18 +08:00
AppleJDay fa8290247d Merge pull request #3 from cocos2d/v3 
update
 2014-08-01 09:19:30 +08:00
AppleJDay bcecf09b6c Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git 2014-08-01 09:18:22 +08:00
maltium baba808391 RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
maltium 98354e9f8e RotateTo action now uses Vec3() to keep track of the state 2014-07-31 23:05:58 +02:00
Dhilan007 aea83926f0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 23:41:56 +08:00