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

1435 Commits

Author SHA1 Message Date
minggo bfed48f0ff revert binding-generators to correct commit 2014-06-19 17:42:50 +08:00
minggo 6d80de181a revert binding-generators to correct commit 2014-06-19 17:39:14 +08:00
minggo a549fdccdc Merge pull request #7134 from samuele3hu/v3_keypad_fix 
Update bindings-generator
 2014-06-19 15:28:43 +08:00
zhangbin bd6aed8a7b Update the reference of submodule cocos2d-console. 2014-06-19 14:47:16 +08:00
samuele3hu 477816e883 update bindings-generator submodule 2014-06-19 14:42:09 +08:00
samuele3hu 46ce1c917d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-19 14:37:00 +08:00
samuele3hu 98fde94647 Skip some functions for Lua bindings 2014-06-18 13:43:22 +08:00
samuele3hu 15d070f7fc Update submodule 2014-06-18 11:50:24 +08:00
samuele3hu 00611f7ec1 Update cocos2dx_spine.ini 2014-06-18 11:47:43 +08:00
samuele3hu 9b3b6c0e53 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix 2014-06-13 14:39:11 +08:00
zhangbin 60c08dcb47 Update the reference of submodule cocos2d-console. 2014-06-13 14:15:17 +08:00
heliclei 87ac4c660d [ci skip] Set github commit status context & description 2014-06-12 11:30:37 +08:00
samuele3hu 108c0d0da9 Modify ini files for bindings-generator to fix the compile warning 2014-06-12 10:08:58 +08:00
zhangbin 07aaa6fabe Update the reference of submodule cocos2d-console. 2014-06-09 11:27:01 +08:00
samuele3hu 52323b27fa Update cocos2d-console submodule 2014-06-06 12:09:10 +08:00
samuele3hu 919524cf89 Update controller.lua for lua-tests and bindings-generator submoudle 2014-06-05 14:39:09 +08:00
samuele3hu 404db49538 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-06-03 17:17:11 +08:00
lm be3f88c4ce [Jenkins][ci skip] Fix proxy address in post-build.py 2014-06-03 11:48:52 +08:00
samuele3hu 5b3f3da428 update console submodule 2014-06-03 10:13:23 +08:00
samuele3hu 691e606b34 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 
Conflicts:
	tools/cocos2d-console
 2014-06-03 09:58:57 +08:00
samuele3hu b91d8255bd Add xxtea encrypt support for lua and update the console submodule 2014-06-03 09:55:57 +08:00
zhangbin 1d95d9a04b Update the reference of submodule cocos2d-console. 2014-05-30 15:35:25 +08:00
lm 3520e7da0b [Jenkins][ci skip] Fix proxy address to jenkins config 2014-05-30 12:51:54 +08:00
minggo 50fcb9a52b Merge pull request #6935 from heliclei/config-proxies 
[ci skip][jenkins]move http proxy address to jenkins configuration
 2014-05-29 17:19:19 +08:00
heliclei 7d547cf9d2 [ci skip][jenkins]move http proxy address to jenkins configuration 2014-05-29 16:55:22 +08:00
lm f93a40ebde [Jenkins][ci skip] Add rebuild jobs to watchdog.py 2014-05-29 15:50:24 +08:00
zhangbin db66cd866a Update the reference of submodule cocos2d-console. 2014-05-29 13:37:26 +08:00
James Chen 984d33c055 Update README.md in tools/tolua 2014-05-28 09:43:48 +08:00
samuele3hu b6cc477832 Update submodule 2014-05-27 14:25:18 +08:00
minggo 63680946ee Merge pull request #6841 from shujunqiao/reboot 
[ci skip], add reboot.py in jenkins-scripts.
 2014-05-27 14:08:25 +08:00
minggo c476e784fa Merge pull request #6816 from shujunqiao/request-build-modify 
[ci skip], modify request proxies in post-build.py and so on.
 2014-05-27 14:04:37 +08:00
samuele3hu 270ddf0354 Update submodule 2014-05-26 18:25:23 +08:00
lm 4328072f7b [Jenkins][ci skip] Remove unavailable parameter in android building 2014-05-23 16:06:46 +08:00
lm 209c1d884a [Jenkins][ci skip] Remove upload apks to another slave, just save it in local 2014-05-23 14:02:31 +08:00
samuele3hu f76e2a5476 Readd the lua binding for `visit` and modify a requirement for IDE 2014-05-23 10:00:59 +08:00
minggo 6e76ca7945 Merge pull request #6864 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-22 20:32:13 -05:00
samuele3hu a6efd4f650 Move `setSearchPat` operation from cpp to script 2014-05-22 14:00:39 +08:00
zhangbin d3d8c94c32 Update the reference of submodule cocos2d-console. 2014-05-21 17:48:46 +08:00
samuele3hu a2ebe428da Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-20 18:11:28 +08:00
samuele3hu 2d65f9bc6f issue #5255:Add Sprite3D test cases for Lua 2014-05-20 18:09:04 +08:00
shujunqiao 7232ba9414 [ci skip], add reboot.py in jenkins-scripts. 2014-05-20 16:34:36 +08:00
minggo 1ce1b00544 Merge pull request #6839 from natural-law/support-prebuilt 
Update the reference of submodule cocos2d-console.
 2014-05-20 15:12:56 +08:00
zhangbin ccc85ab210 Update the reference of submodule cocos2d-console. 2014-05-20 15:03:43 +08:00
lm 70d1daf8f4 [Jenkins][ci skip] Fix the path of android public project 2014-05-20 14:31:42 +08:00
lm 41bc599b12 [Jenkins][ci skip] Fix external lib to support ci release 2014-05-20 10:58:59 +08:00
zhangbin 2b3f236792 Support generate release apk with prebuilt libs. 2014-05-20 10:47:27 +08:00
lm aab2bf5371 [Jenkins][ci skip] A missing import to ci-release-test.py 2014-05-20 10:03:09 +08:00
lm 1d5748c505 [Jenkins][ci skip] Add check slave online status to watchdog 2014-05-19 18:03:21 +08:00
shujunqiao 8c614b795a [ci skip], modify request proxies in post-build.py and so on. 2014-05-19 17:41:09 +08:00
zhangbin d9e226f886 Package the binary files of cocos2d-console in git-achive-all. 2014-05-19 13:48:50 +08:00