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

26436 Commits

Author SHA1 Message Date
Dale Stammen 395b9fbaa7 added /bigobj to c++ command line options to fix arm builds 2014-12-31 12:56:16 -08:00
Huabing.Xu 4d5d5c5a5d Merge pull request #9763 from dabingnn/v3 
update releaseNote
 2014-12-31 22:31:15 +08:00
Huabing.Xu 6fbb32d465 update releaseNote 2014-12-31 22:30:21 +08:00
Huabing.Xu 19e32820a3 Merge pull request #9762 from dabingnn/v3_updateChangeLog 
[ci skip]update changelog
 2014-12-31 22:22:01 +08:00
Huabing.Xu 70ac38d09b [ci skip]update changelog 2014-12-31 22:20:28 +08:00
Huabing.Xu d3b0a4a3d0 Merge pull request #9761 from dabingnn/v3_updateChangeLog 
[ci skip]update changelog
 2014-12-31 22:19:43 +08:00
Huabing.Xu 59e4d817a6 [ci skip]update changelog 2014-12-31 22:18:48 +08:00
minggo e6602e1eec Merge pull request #9760 from yinjimmy/bugfix 
fix: compile error on win32 with release model
 2014-12-31 22:00:05 +08:00
yinjimmy fb5bd01ac1 fix: compile error on win32 with release model 2014-12-31 20:00:51 +08:00
minggo d1e54ee28b Merge pull request #9759 from dualface/update_runtime_ver 
Update runtime ver
 2014-12-31 18:54:53 +08:00
dualface df82dfc873 update config.json 2014-12-31 18:49:02 +08:00
dualface 3077e294b7 update runtime version 2014-12-31 18:39:51 +08:00
minggo 5982a4ec90 [ci skip] Update CHANGELOG 2014-12-31 18:23:40 +08:00
minggo 9fa768f41c Merge pull request #9758 from andyque/update-changelog 
Update releasenote
 2014-12-31 18:21:13 +08:00
andyque 4919462579 update release note 2014-12-31 18:19:39 +08:00
andyque ff036cc74a add release note for UI 2014-12-31 18:15:27 +08:00
minggo d7fceb30bd Merge pull request #9757 from dualface/fix_framework_on_ios 
fix framework on iOS
 2014-12-31 18:04:15 +08:00
dualface 432bdf3541 fix framework on iOS 2014-12-31 18:01:03 +08:00
minggo cf6c08268f Merge pull request #9755 from dualface/fix_lua_debugger 
fix lua_debugger.c
 2014-12-31 17:51:00 +08:00
dualface b0199dfa61 fix lua_debugger.c 2014-12-31 17:46:48 +08:00
minggo bbfa7a9183 Merge pull request #9753 from samuele3hu/v3_4_httpclient 
Resolve the bug that requiring lua scrip did not consider the module dependent
 2014-12-31 16:48:33 +08:00
minggo 9af87ace7f Merge pull request #9754 from andyque/update-changelog 
update changelog
 2014-12-31 16:48:01 +08:00
minggo 3be5608696 Merge pull request #9751 from CocosRobot/update_lua_bindings_1420013583 
[AUTO]: updating luabinding automatically
 2014-12-31 16:47:51 +08:00
andyque 71c6f92903 update changelog 2014-12-31 16:45:09 +08:00
samuele3hu 54d376db01 Resolve the bug that requiring lua scrip did not consider the module dependent 2014-12-31 16:28:14 +08:00
CocosRobot 2e1d8b4e42 [AUTO]: updating luabinding automatically 2014-12-31 08:15:01 +00:00
minggo 0b0ca17031 Merge pull request #9748 from doomsdayer/v3_version1 
V3 version1
 2014-12-31 16:10:36 +08:00
yusheng.lu 718cfb9d37 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version1 2014-12-31 16:06:19 +08:00
yusheng.lu 89034469f5 Updated the version check description. 2014-12-31 16:01:11 +08:00
minggo 292fff3c29 Merge pull request #9746 from pandamicro/v3_origin 
Current restart game will disable ActionManager
 2014-12-31 15:50:33 +08:00
pandamicro 677f7ca1d3 Improve restart game 2014-12-31 15:32:59 +08:00
minggo 2495d698c0 Merge pull request #9745 from huangshiwu/iosnetwork_template 
iOS runtime template add security.framework
 2014-12-31 15:20:20 +08:00
minggo 50914665e6 Merge pull request #9742 from huangshiwu/iosnetwork_template 
ios template add security.framework
 2014-12-31 15:15:08 +08:00
huangshiwu 7702c102a2 iOS runtime template add security.framework 2014-12-31 15:15:01 +08:00
minggo 010f48f28a Merge pull request #9744 from CocosRobot/update_cocosfiles_1420010066 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-31 15:14:45 +08:00
CocosRobot 85ccfb2209 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 07:14:27 +00:00
minggo 3c83bd2fb3 Merge pull request #9733 from andyque/update-curl 
Update curl
 2014-12-31 15:13:18 +08:00
minggo 956b5567a2 Merge pull request #9743 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-12-31 15:05:55 +08:00
zhangbin 6adedee781 Update the reference of submodule cocos2d-console. 2014-12-31 14:55:14 +08:00
huangshiwu ac2ff38624 ios template add security.framework 2014-12-31 14:46:34 +08:00
minggo 59247581e1 Merge pull request #9741 from CocosRobot/update_lua_bindings_1420006889 
[AUTO]: updating luabinding automatically
 2014-12-31 14:39:40 +08:00
CocosRobot 3614f716ae [AUTO]: updating luabinding automatically 2014-12-31 06:23:33 +00:00
andyque 5d9274acf5 fix conflicts 2014-12-31 14:22:18 +08:00
minggo 94e1eb6406 Merge pull request #9740 from cocos2d/revert-9693-v3_version 
Revert "Feature of version check. "
 2014-12-31 14:18:58 +08:00
minggo ad443da6a0 Revert "Feature of version check. " 2014-12-31 14:17:18 +08:00
andyque 62b1404213 Merge branch 'v3' into update-curl 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-12-31 14:04:04 +08:00
minggo 4db4fb47f6 Merge pull request #9739 from CocosRobot/update_cocosfiles_1420005049 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-31 13:56:08 +08:00
andyque 417c2efaba revert linux cmake modification 2014-12-31 13:54:35 +08:00
CocosRobot ced43a1c2b [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-31 05:50:50 +00:00
minggo 84c193a343 Merge pull request #9737 from samuele3hu/v3_4_httpclient 
Resolve the require file errror
 2014-12-31 13:49:16 +08:00