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

638 Commits

Author SHA1 Message Date
honghui 8079722aff Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-25 09:55:00 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
CocosRobot 02d343fefc [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 09:03:33 +00:00
CocosRobot 78b51b3ffd [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 05:43:25 +00:00
honghui b513dbafb5 read config.json may failed caused by syntax error 2014-09-24 11:43:21 +08:00
CocosRobot 671739e9a8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-24 02:57:48 +00:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
CocosRobot 2c1649f773 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-23 01:26:04 +00:00
minggo 3f7fc6ead1 Merge pull request #8111 from joewan/v3 
fix compile on ubuntu.
 2014-09-22 09:38:52 +08:00
CocosRobot 93bfc08d67 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-22 01:32:19 +00:00
joewanchen f22c15bf1c fix. 2014-09-22 00:08:44 +08:00
joewanchen 3f2895beab fix compile on ubuntu. 2014-09-21 23:49:43 +08:00
minggo 45d311bb34 remove dependence of CoreGraphics for on mac 2014-09-19 14:02:13 +08:00
honghui 11c0d6ff25 fix:runtime crash when upload file to Mac/Win32 2014-09-18 12:40:26 +08:00
honghui fa4a6fae32 fix bug: response not been sent completely 2014-09-17 18:01:25 +08:00
honghui 86416e73ca sync code from default template 2014-09-16 16:19:05 +08:00
honghui c34eedae1c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-16 11:53:55 +08:00
samuele3hu 2fa87b9c38 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 2014-09-16 09:57:45 +08:00
samuele3hu 0c2268d85e Update release configure setting for cpp template 2014-09-16 09:57:10 +08:00
CocosRobot 34f679a88a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 19:27:41 +00:00
minggo d62e3762d2 Merge pull request #8054 from andyque/fixWin32Template 
fix resource path
 2014-09-15 16:42:46 +08:00
andyque d6bacea506 fix resource path 2014-09-15 16:40:32 +08:00
minggo d96050e1ce Merge pull request #8048 from Dhilan007/v3-audio903 
update LUA templates for AudioEngine.
 2014-09-15 16:00:11 +08:00
andyque b6bd70f119 fix lua runtime compile error 2014-09-15 15:35:04 +08:00
andyque 36feb8e47b fix lua win32 template compile error 2014-09-15 15:10:55 +08:00
andyque 8b4a7902ec fix cpp template compile 2014-09-15 14:43:41 +08:00
minggo 7084070c4a Merge pull request #8049 from natural-law/v3 
Modify the config file in template for the folder rename.
 2014-09-15 13:59:37 +08:00
zhangbin 0f62ac19c0 Modify the config file in template for the folder rename. 2014-09-15 13:56:15 +08:00
Dhilan007 1639d759af update LUA templates for AudioEngine. 2014-09-15 13:51:18 +08:00
CocosRobot 5e936ec8ca [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 05:46:24 +00:00
minggo 9e36be70f8 Merge pull request #8035 from andyque/fixLuaTemplate 
adjust registering ui module before extension module
 2014-09-15 13:40:56 +08:00
andyque 2cfff1813b modify comments 2014-09-15 12:06:34 +08:00
CocosRobot dcdabb404a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 03:11:35 +00:00
huangshiwu 42c193c424 change-template-folder-name --win32 and wp8 2014-09-15 11:04:07 +08:00
andyque 2f85310348 adjust registering ui module before extension module 2014-09-15 09:46:07 +08:00
minggo a9232a14ea res->Resources src->Classes for cpp template 2014-09-13 17:50:02 +08:00
minggo 11f9eaa4a0 fix template compiling error 2014-09-12 15:02:18 +08:00
honghui cb0faeac7e fix merge error 2014-09-11 17:50:46 +08:00
honghui 59c8c3abf2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-11 17:19:31 +08:00
honghui 83d7bdcae9 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-09-11 17:07:55 +08:00
honghui d5a8904fbb open WIFI is not necessary for runtime 2014-09-11 17:04:26 +08:00
CocosRobot 827679099c [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 08:31:19 +00:00
minggo bb0b7a9b8a Merge pull request #7950 from super626/billboard 
3D BillBoard
 2014-09-11 16:29:05 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
CocosRobot 974e810bb2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 07:48:14 +00:00
CocosRobot 11005a6ce9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 06:48:54 +00:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
CocosRobot deef5cb3d7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:07:55 +00:00
CocosRobot 15254a5ddb [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 01:50:11 +00:00