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

19393 Commits

Author SHA1 Message Date
chuanweizhang2013 c8d871a60b modify read config time 2014-05-13 15:56:39 +08:00
chuanweizhang2013 1c0968bbc4 Merge pull request #27 from cocoscodeide/v3 
update cocos2d-x
 2014-05-13 14:25:02 +08:00
cocoscodeide 64b630912d Merge pull request #3 from chuanweizhang2013/v3luaruntime 
fixed project name
 2014-05-12 13:44:31 +08:00
chuanweizhang2013 d502e41af4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
 2014-05-09 14:28:14 +08:00
chuanweizhang2013 c973dba4f1 add entry file support 2014-05-09 14:06:20 +08:00
James Chen a0fbe9e737 Merge pull request #6649 from CocosRobot/update_cocosfiles_1399614149 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-09 13:45:10 +08:00
CocosRobot 224b0910c9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-09 05:42:30 +00:00
minggo df894931b5 Merge pull request #6644 from Dhilan007/v3_video 
rename VideoWidget to VideoPlayer.
 2014-05-09 13:41:06 +08:00
James Chen 1a5a29b863 Merge pull request #6645 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-09 11:52:11 +08:00
zhangbin 7d270cd1a1 Update the reference of submodule cocos2d-console. 2014-05-09 11:48:43 +08:00
Dhilan007 c904fff9eb update XCode project.pbxproj 2014-05-09 11:37:14 +08:00
Dhilan007 06f264e87d rename VideoWidget to VideoPlayer. 2014-05-09 11:30:07 +08:00
James Chen 1308ad53df Merge pull request #6639 from MSOpenTech/wp8-v3-fix 
Added missing files to WP8 projects
 2014-05-09 08:29:15 +08:00
Dale Stammen eea1ba6946 added missing files to projects 2014-05-08 10:11:42 -07:00
cocoscodeide 6efaa2fe8f Merge pull request #2 from chuanweizhang2013/v3luaruntime 
modify luadebug and adjust code file
 2014-05-08 22:09:06 +08:00
James Chen 59e1fc39b3 Merge pull request #6638 from Dhilan007/v3_video 
fixed compilation fails on android.
 2014-05-08 21:43:21 +08:00
Dhilan007 24452cada1 fixed compilation fails on android. 2014-05-08 21:39:53 +08:00
James Chen dfd302a8ab Merge pull request #6637 from dumganhar/vs-user-file 
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which was set in '.user' file
 2014-05-08 21:22:37 +08:00
James Chen 0ed33cacf4 Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which 
was set in '.user' file
 2014-05-08 21:19:54 +08:00
chuanweizhang2013 48566b70e0 add ignore .gz 2014-05-08 20:59:24 +08:00
James Chen b550622d90 Merge pull request #6636 from CocosRobot/update_cocosfiles_1399545311 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 19:13:25 +08:00
minggo 8a74f83ad0 [ci skip] 2014-05-08 18:46:34 +08:00
CocosRobot 7ef529b1c4 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 10:35:12 +00:00
minggo 56622dc765 Merge pull request #6555 from Dhilan007/v3_video 
issue #4859:Add a widget to play video
 2014-05-08 18:33:51 +08:00
Dhilan007 52d7d804f7 Update XCode project.pbxproj for add files related to VideoWidget. 2014-05-08 18:28:28 +08:00
Dhilan007 972f9447dd issue #4876:Add test case to play video 2014-05-08 18:14:32 +08:00
Dhilan007 af26fb9b07 issue #4870:Add a ui widget of playing video 2014-05-08 18:13:50 +08:00
Dhilan007 bda73bc7b3 issue #4868:Use system widget to play video on iOS 2014-05-08 18:12:53 +08:00
Dhilan007 bda8a73ae5 issue #4867:Use system widget to play video on Android 2014-05-08 18:12:03 +08:00
minggo f12bdeca9a Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug 
Fixed bug of guireader
 2014-05-08 18:06:21 +08:00
minggo 0ae859e3e1 [ci skip] 2014-05-08 18:00:01 +08:00
minggo 56f749f273 Merge pull request #6575 from twhittock/lua-main-error-no-launch 
Lua template should fail to launch on lua error
 2014-05-08 17:58:48 +08:00
minggo 5291bbc377 [ci skip] 2014-05-08 17:25:41 +08:00
minggo c886bf21a8 Merge pull request #6631 from Dhilan007/v3_labelhotfixed 
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
 2014-05-08 17:24:08 +08:00
minggo 2571767907 [ci skip] 2014-05-08 17:13:21 +08:00
minggo d84e26c7b4 Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background 
sounds pause automatically when switching background
 2014-05-08 17:11:29 +08:00
minggo 9f0e25d808 Merge pull request #6628 from andyque/refactor5056 
refactor 5056. pull gui tests from ExtensionTest to UITest
 2014-05-08 17:00:38 +08:00
Ryeeeeee 80103487fe rename variable 2014-05-08 16:53:24 +08:00
andyque 97ee5cb456 closed #5056. fix windows compile error 2014-05-08 16:18:46 +08:00
chuanweizhang2013 8f7cb74dd1 fixed debug 2014-05-08 16:02:55 +08:00
CaiWenzhi 0a46b3c8d2 Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:56:34 +08:00
Dhilan007 966e7e2b20 closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT. 2014-05-08 15:47:37 +08:00
minggo b22fe211de [ci skip] 2014-05-08 15:42:05 +08:00
minggo a8d728ffc9 Merge pull request #6610 from zawasp/vs2013project 
upgrade win32 projects for Visual Studio 2013
 2014-05-08 15:40:02 +08:00
CaiWenzhi 64f8feb50c Merge branch 'v3' into v3_nutty_fixedreaderbug 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-08 15:38:28 +08:00
James Chen 366540902c Merge pull request #6630 from CocosRobot/update_cocosfiles_1399534246 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 15:34:29 +08:00
CocosRobot fb0094e0b7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 07:30:48 +00:00
James Chen 5c38c04b1b Merge pull request #6629 from dumganhar/v3 
Adds missing 'fps_images.png', our test case needs them and Lua xcode project fix
 2014-05-08 15:28:29 +08:00
andyque e48e26cfdc issue #5056. fix linux & android compile error 2014-05-08 15:20:24 +08:00
CaiWenzhi a562f19880 Fixed bug of guireader 2014-05-08 15:15:09 +08:00