minggo
|
4393a322c8
|
Merge pull request #6830 from CocosRobot/update_cocosfiles_1400564891
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-20 13:59:31 +08:00 |
cw
|
1aa92bdef0
|
add java nativeIsDebug
|
2014-05-20 13:53:52 +08:00 |
CocosRobot
|
ee7c753612
|
[AUTO]: updating luabinding automatically
|
2014-05-20 05:50:48 +00:00 |
CocosRobot
|
b637f06ce6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-20 05:48:12 +00:00 |
minggo
|
dd1ef2fbfc
|
Merge pull request #6826 from andyque/addReleaseNotes
modify 3.1rc0 release note
|
2014-05-20 13:46:57 +08:00 |
andyque
|
d8f5652392
|
add release note
|
2014-05-20 13:44:06 +08:00 |
favorcode
|
5ed9e781e4
|
Update UIText.h
Update the doxygen comment
|
2014-05-20 13:05:20 +08:00 |
CocosRobot
|
2c47eae1a0
|
[AUTO]: updating luabinding automatically
|
2014-05-20 04:10:28 +00:00 |
CocosRobot
|
cbda99653d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-20 04:08:17 +00:00 |
minggo
|
ae118a9d22
|
Merge pull request #6752 from andyque/refactorLayout
refactor Layout
|
2014-05-20 12:07:04 +08:00 |
cocoscodeide
|
d505cb3b50
|
Merge pull request #23 from chuanweizhang2013/v3luaruntime
fixed android degbug
|
2014-05-20 11:59:26 +08:00 |
minggo
|
6f2f2046c7
|
Merge pull request #6804 from hyqhyq3/v3
fix UIText's fontSize
|
2014-05-20 11:57:29 +08:00 |
cw
|
84d66219c8
|
fixed android degbug
|
2014-05-20 11:44:46 +08:00 |
minggo
|
4d8081fc53
|
Merge pull request #6824 from lmskater/fix-external-lib
[Jenkins][ci skip] Fix external lib to support ci release
|
2014-05-20 11:07:27 +08:00 |
lm
|
41bc599b12
|
[Jenkins][ci skip] Fix external lib to support ci release
|
2014-05-20 10:58:59 +08:00 |
minggo
|
65e3a3f420
|
Merge pull request #6815 from GameEgg/patch-1
bug fix FontFNT.cpp
|
2014-05-20 10:49:02 +08:00 |
zhangbin
|
2b3f236792
|
Support generate release apk with prebuilt libs.
|
2014-05-20 10:47:27 +08:00 |
andyque
|
993b735392
|
closed #5183, done
|
2014-05-20 10:24:22 +08:00 |
andyque
|
432f688a67
|
issue #5183, refactor
|
2014-05-20 10:16:19 +08:00 |
minggo
|
e14f81a5b5
|
Merge pull request #6823 from lmskater/add-missing-import
[Jenkins][ci skip] A missing import to ci-release-test.py
|
2014-05-20 10:16:14 +08:00 |
lm
|
aab2bf5371
|
[Jenkins][ci skip] A missing import to ci-release-test.py
|
2014-05-20 10:03:09 +08:00 |
andyque
|
e0192e2a1b
|
issue #5183, fix win32 compile error
|
2014-05-20 09:59:12 +08:00 |
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 |
Sergey
|
a489c19535
|
Android project improvements
(release/debug builds)
native debug support
|
2014-05-19 17:47:17 +04: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 |
shujunqiao
|
8c614b795a
|
[ci skip], modify request proxies in post-build.py and so on.
|
2014-05-19 17:41:09 +08: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 |