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

20057 Commits

Author SHA1 Message Date
andyque fe01d12a21 issue #5183, fix android compile error 2014-05-20 09:39:05 +08:00
andyque 28c3752641 issue #5183, refacotr some variable names 2014-05-20 09:36:17 +08:00
andyque b6373b5303 Merge branch 'v3' into refactorLayout 2014-05-20 09:30:23 +08:00
Ricardo Quesada 65e25898e4 Update RELEASE_NOTES.md 2014-05-19 17:12:18 -07:00
Ricardo Quesada d12fdc057b Update RELEASE_NOTES.md 2014-05-19 17:06:30 -07:00
Ricardo Quesada cc73c59a9f Update RELEASE_NOTES.md 2014-05-19 17:05:05 -07:00
Ricardo Quesada a77086a41a Update RELEASE_NOTES.md 2014-05-19 17:03:53 -07:00
Ricardo Quesada 845d458829 Update RELEASE_NOTES.md 2014-05-19 17:02:30 -07:00
Ricardo Quesada 305f1ec813 Merge pull request #6821 from ricardoquesada/release_notes_3_1 
Release Notes for v3.1
 2014-05-19 16:58:29 -07:00
Ricardo Quesada 908d329ae3 Release Notes for v3.1 2014-05-19 16:56:33 -07:00
minggo 1fe836ff79 Merge pull request #6818 from lmskater/add-watch-slave-offline 
[Jenkins][ci skip] Add check slave online status to watchdog
 2014-05-19 18:32:37 +08:00
minggo 28705f3857 Merge pull request #6808 from Mazyod/cleanup-2d-platform 
Cleanup 2d/platform library references
 2014-05-19 18:12:56 +08:00
lm 1d5748c505 [Jenkins][ci skip] Add check slave online status to watchdog 2014-05-19 18:03:21 +08:00
minggo a88da0cef3 Merge pull request #6817 from minggo/accelerometer-fix 
[ci skip]accelerometer fix
 2014-05-19 17:47:22 +08:00
minggo cffd53ea94 accelerometer fix 2014-05-19 17:44:28 +08:00
andyque 834a72315a issue #5183, add deprecated function for Widget 2014-05-19 17:43:27 +08:00
GameEgg 9c5f7f0ce3 bug fix FontFNT.cpp 2014-05-19 18:42:11 +09:00
andyque a9e1c50897 issue #5183, refactor UIScrollView 2014-05-19 17:34:48 +08:00
andyque ee24e137f7 issue #5183, refactor obscure functions 2014-05-19 17:18:04 +08:00
andyque 121d6d3109 issue #5183, refactor 2014-05-19 16:51:25 +08:00
minggo 72b4b9ef15 [ci skip] 2014-05-19 16:33:27 +08:00
andyque a03a565863 issue #5138, add Groups in Xcode 2014-05-19 14:11:39 +08:00
andyque a14f8b0a93 Merge branch 'v3' into refactorLayout 2014-05-19 13:55:43 +08:00
andyque 5ddfc41414 Merge branch 'v3' into refactorLayout 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-05-19 13:54:16 +08:00
James Chen da707a128e Merge pull request #6810 from natural-law/v3 
Package the binary files of cocos2d-console in git-achive-all.
 2014-05-19 13:50:22 +08:00
zhangbin d9e226f886 Package the binary files of cocos2d-console in git-achive-all. 2014-05-19 13:48:50 +08:00
minggo 66dd5866d1 Merge pull request #6805 from andyque/fix_broken_test_resource_file 
fix cpp-tests resource crash
 2014-05-19 13:38:28 +08:00
cocoscodeide a2be97380b Merge pull request #14 from bofeng-song/v3 
show uploading file in play scene
 2014-05-19 13:35:31 +08:00
Mazyad Alabduljaleel 9bf7ec3c20 Cleanup project file. 
[REM]: old library references. New libraries are under prebuilt.
 2014-05-19 09:08:35 +04:00
andyque b89a073b90 replace texture resources 2014-05-19 12:09:55 +08:00
andyque 99f17ec88d commnet out the Renderer test in PerformanceTest 2014-05-19 11:46:32 +08:00
hyq 11dcf1e1dd fix UIText's fontSize 
if set fontsize before setting font family, fontsize was wrong
 2014-05-19 11:38:45 +08:00
minggo 732cc9dd1e Merge pull request #6803 from CocosRobot/update_lua_bindings_1400469339 
[AUTO]: updating luabinding automatically
 2014-05-19 11:18:26 +08:00
minggo da30c64498 [ci skip] 2014-05-19 11:18:00 +08:00
CocosRobot 9f9b0bc426 [AUTO]: updating luabinding automatically 2014-05-19 03:16:40 +00:00
minggo a58ec22b75 [ci skip] 2014-05-19 11:15:29 +08:00
minggo c0b0ca0e70 Merge pull request #6655 from zifter/FixCascade 
Fixed bug with cascade opacity and color for control button. #4881
 2014-05-19 11:13:29 +08:00
minggo e51676c6ab Merge pull request #6802 from samuele3hu/v3_fix 
[ci skip]fix compile error for lua template
 2014-05-19 11:07:45 +08:00
samuele3hu e2a0029c4e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-19 10:50:15 +08:00
samuele3hu 6dc7f5a2b5 fix compile error for lua template 2014-05-19 10:38:59 +08:00
minggo 0443018181 Merge pull request #6801 from dabingnn/v3_fix_template 
[ci skip]fix cpp template linux
 2014-05-19 10:06:58 +08:00
Huabing.Xu b69efe00a7 fix cpp template linux 2014-05-18 18:34:53 -07:00
Ricardo Quesada 4407ad1bd0 Merge pull request #6800 from dabingnn/v3_fix_template 
fix cpp_template
 2014-05-18 18:05:12 -07:00
Huabing.Xu 94228df977 fix cpp_template 2014-05-18 18:04:12 -07:00
Ricardo Quesada 649008d185 Merge pull request #6799 from CocosRobot/update_cocosfiles_1400451948 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-18 15:27:14 -07:00
CocosRobot 794ba83495 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-18 22:25:49 +00:00
Ricardo Quesada 7db0d97766 Merge pull request #6798 from CocosRobot/update_lua_bindings_1400451416 
[AUTO]: updating luabinding automatically
 2014-05-18 15:24:36 -07:00
CocosRobot a7485bb4e9 [AUTO]: updating luabinding automatically 2014-05-18 22:18:07 +00:00
Ricardo Quesada 4501a15d99 Merge pull request #6797 from ricardoquesada/point2_fixes 
Point is no longer deprecated
 2014-05-18 15:14:03 -07:00
Ricardo Quesada 2ab70ca39b Point is no longer deprecated 
As discussed on the forums:

- Point must not be deprecated (not it must not be used internally)
- Point2, Point3, must not be used. Use Vec2, Vec3 instead
 2014-05-18 15:12:48 -07:00