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

19000 Commits

Author SHA1 Message Date
samuele3hu edc4dde15f fix the bug that `EditBox` can’t response that ‘changed’,`ended` and ‘return’ event for lua 2014-04-16 15:31:44 +08:00
James Chen 1d64d4038a Merge pull request #6294 from lmskater/fix-ftp-home 
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
 2014-04-16 14:26:37 +08:00
lm b78c89d39b [Jenkins][ci skip] Fix ftp home in upload_apk.sh 2014-04-16 14:19:13 +08:00
Huabing.Xu d14d3007d0 remove kazmath include file 2014-04-16 14:08:58 +08:00
lm 3cbe02771d [Jenkins][ci skip] Fix ftp home in upload_apk.sh 2014-04-16 13:47:40 +08:00
Huabing.Xu d4ddd7550b Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-16 11:22:47 +08:00
Huabing.Xu 346d42f723 remove warning message---finished 2014-04-16 11:20:45 +08:00
Huabing.Xu 6fd7197d96 remove warning message---continue 2014-04-16 11:18:23 +08:00
James Chen 4dadd3537e Merge pull request #6289 from lmskater/create-save-apk 
[Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
 2014-04-16 11:14:50 +08:00
James Chen 99ff168512 Merge pull request #6282 from shujunqiao/empty-test 
[ci skip], add emptytest.py
 2014-04-16 11:13:35 +08:00
zhangbin 4605fb6d56 closed #4847, Find ant path from system first when ANT_ROOT is not set. 2014-04-16 11:08:01 +08:00
lm e5cd2adaad [Jenkins][ci skip] Add [ci emptytest] command 2014-04-16 11:05:27 +08:00
Huabing.Xu a32bb8cd23 remove warning message---continue 2014-04-16 10:58:34 +08:00
Huabing.Xu 718f3b3a57 remove warning message---continue 2014-04-16 10:47:29 +08:00
Huabing.Xu 0dab97919f add missed line in PhysicSprite.cpp 2014-04-16 10:46:10 +08:00
Huabing.Xu b01941b6ac remove warning message---continue 2014-04-16 10:42:39 +08:00
James Chen 60c1ed28dc Removes unused enum in PerformaceCallbackTest 2014-04-16 10:41:42 +08:00
James Chen ec40dda7f3 Adds performance test for callbacks: 1) std::function, 
2) (target->*selector)(), 3) simulate new api of Scheduler
 2014-04-16 10:35:58 +08:00
zhangbin 4af7e14dc8 Update the reference of submodule cocos2d-console. 2014-04-16 10:32:43 +08:00
zhangbin 72bc254141 Merge branch 'develop' into issue4727 2014-04-16 10:30:43 +08:00
Huabing.Xu 2bb32a8e4b remove warning message 2014-04-16 10:27:17 +08:00
Ricardo Quesada 9c19974448 Merge pull request #6290 from ricardoquesada/fix_changelog 
argh... changelog is outdated
 2014-04-15 16:43:36 -07:00
Ricardo Quesada 170d1fd626 argh... changelog is outdated 2014-04-15 16:40:41 -07:00
Huabing.Xu 30dec564e6 remove kazmath/kazmath.h include 2014-04-15 23:50:28 +08:00
Huabing.Xu debad86ec1 fix compile error after merge 2014-04-15 22:35:35 +08:00
Huabing.Xu 95cb7721f6 Merge branch 'develop' into develop_migrate_math_lib_merge 
Conflicts:
	cocos/2d/CCSprite.cpp
	tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
 2014-04-15 22:21:04 +08:00
shujunqiao 17811f00a1 [ci skip], modify apk path. 2014-04-15 18:28:56 +08:00
Huabing.Xu 7f61639541 replace Point with Vector2 in tests, extension folder 2014-04-15 18:23:40 +08:00
lm 7e495c9619 [Jenkins][ci skip] Create and save cpp-empty-test apk for autotest 2014-04-15 18:15:31 +08:00
Huabing.Xu 63b52dd287 replace Point with Vector2 in cocos folder cpp file 2014-04-15 18:13:57 +08:00
Huabing.Xu e2a24dec84 replace Point with Vector2 2014-04-15 18:08:29 +08:00
Huabing.Xu 917ae6e88b deprecate Point, using Vector2 instead 2014-04-15 17:46:44 +08:00
shujunqiao fcd72adf9f [ci skip], modify information of print. 2014-04-15 17:41:40 +08:00
Huabing.Xu 5303f50904 Migrate to Vector2 in DrawPrimitive.h 2014-04-15 17:29:23 +08:00
cw 312cd49b1a Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-04-15 17:10:24 +08:00
cw d361efacae add update 2014-04-15 17:10:11 +08:00
Huabing.Xu 9c33b48b50 remove Point in CCNode.h and CCSprite.h 2014-04-15 17:09:18 +08:00
Huabing.Xu 511e868ac4 migrate getAnchorPoint, getAnchorPointInPoints and relative member variable to Vector2 2014-04-15 16:59:16 +08:00
Huabing.Xu e351b778c1 migrate setAnchorPoint to Vector2 2014-04-15 16:47:29 +08:00
Huabing.Xu 6686b657a4 Migrate getPostion and correspondent member variable to Vector2 2014-04-15 16:28:59 +08:00
Huabing.Xu 071cbc7565 migrate setPosition to Vector2 2014-04-15 16:16:14 +08:00
zhangbin dd5c2aacd6 Merge branch 'develop' into issue4727 
Conflicts:
	tools/cocos2d-console
 2014-04-15 15:18:00 +08:00
Huabing.Xu ec2ef0f64b migrate convertXXXX to Vector2 step2 2014-04-15 14:41:09 +08:00
Huabing.Xu 633173005b migrate convertXXXX to Vector2 2014-04-15 14:29:12 +08:00
Huabing.Xu 4df714b9d8 Migrate to Vector2 in class Director 2014-04-15 14:18:40 +08:00
Huabing.Xu 44be9a38ec Node convertToNodeSpace and convertToWorldSpace use Vector2 2014-04-15 14:09:46 +08:00
minggo b68ff69ad0 Merge pull request #6287 from minggo/update-version 
update version information
 2014-04-15 14:00:08 +08:00
minggo 46e7058587 update version information 2014-04-15 13:58:51 +08:00
Huabing.Xu 11fc8ac308 conversion from Vector2 and Point 2014-04-15 13:58:08 +08:00
shujunqiao 3b8934f205 [ci skip], modify print infomation in emptytest.py 2014-04-15 13:43:38 +08:00