James Chen
|
f2664d1c36
|
Merge pull request #6692 from dumganhar/value-copy-or-move-contructor-fix
Value: initialize Value with Type::None when its move and copy contructor is called.
|
2014-05-12 23:39:26 +08:00 |
James Chen
|
602d89126f
|
Value: initialize Value with Type::None when its move and copy
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
|
2014-05-12 23:32:51 +08:00 |
James Chen
|
22b925e054
|
Update README.md, add travis build status of mac host
|
2014-05-12 22:30:28 +08:00 |
James Chen
|
d77a285b76
|
Merge pull request #6691 from dumganhar/travis-mac-support
mac support for travis ci
|
2014-05-12 22:01:04 +08:00 |
James Chen
|
e3ccf41ed9
|
Only build 'merge build'
|
2014-05-12 21:59:32 +08:00 |
James Chen
|
91d684d077
|
Updates travis script to add mac host support
|
2014-05-12 21:55:11 +08:00 |
James Chen
|
36c4a407ee
|
Adds travis_mac.yml
|
2014-05-12 21:54:24 +08:00 |
heliclei
|
1aabedb316
|
support auto start tests
|
2014-05-12 21:47:55 +08:00 |
James Chen
|
1c732bfd94
|
Merge pull request #6690 from CocosRobot/update_cocosfiles_1399892708
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 19:06:01 +08:00 |
CocosRobot
|
79b679a3b0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 11:05:12 +00:00 |
James Chen
|
9eb2af752c
|
Merge pull request #6688 from lmskater/add-lua-runtime-bin
[Jenkins][ci skip] Add lua-runtime-bin to support pull request build
|
2014-05-12 19:00:26 +08:00 |
James Chen
|
eb9fbea7be
|
Merge pull request #6686 from dumganhar/download-runtime
Updates download-deps.py to support to download several zip files. (external and lua-runtime-bin)
|
2014-05-12 19:00:15 +08:00 |
minggo
|
b8be364ae2
|
Merge pull request #6687 from dumganhar/value-fix
Null ptr check in value assignment
|
2014-05-12 18:59:07 +08:00 |
James Chen
|
528848765a
|
Merge pull request #6684 from CocosRobot/update_cocosfiles_1399888755
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 18:51:17 +08:00 |
lm
|
f5a134a86e
|
[Jenkins][ci skip] Add lua-runtime-bin to support pull request build
|
2014-05-12 18:49:52 +08:00 |
James Chen
|
b24f742c92
|
Null ptr check in value assignment
|
2014-05-12 18:45:36 +08:00 |
James Chen
|
90024ee112
|
Updates download-deps.py
|
2014-05-12 18:12:31 +08:00 |
andyque
|
ebffc66a83
|
closed #5118, fix CCSGUIReader setAnchorPoint
|
2014-05-12 18:07:13 +08:00 |
andyque
|
a0a4df5ac5
|
closed #5118, remove WidgetType and refactor LayoutType to Type
|
2014-05-12 18:00:54 +08:00 |
CocosRobot
|
e9cf6060be
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 09:59:17 +00:00 |
James Chen
|
9265a56f43
|
Updates .gitignore.
|
2014-05-12 17:58:27 +08:00 |
minggo
|
9ab2dae212
|
Merge pull request #6635 from dumganhar/iss4660-unicode
issue #4660: ccUTF8 uses utf8-utf16 conversion in llvm3.4
|
2014-05-12 17:57:25 +08:00 |
James Chen
|
8115b09d29
|
Adds config.json for runtime
|
2014-05-12 17:55:57 +08:00 |
James Chen
|
5dc69026ac
|
Updates download-deps.py to support download several files.
|
2014-05-12 17:53:51 +08:00 |
minggo
|
cbf2629bf0
|
[ci skip]
|
2014-05-12 16:54:18 +08:00 |
minggo
|
70267bc4ed
|
[ci skip]
|
2014-05-12 16:53:12 +08:00 |
minggo
|
01db66c855
|
Merge pull request #6658 from asmodehn/asmo_newv3
Added SDK / NDK detection based on PATH - tested on Linux only
|
2014-05-12 16:51:02 +08:00 |
minggo
|
2d468b055f
|
Merge pull request #6679 from CocosRobot/update_cocosfiles_1399882304
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 16:29:32 +08:00 |
minggo
|
5c0fb8e80b
|
Merge pull request #6680 from CocosRobot/update_lua_bindings_1399882383
[AUTO]: updating luabinding automatically
|
2014-05-12 16:29:07 +08:00 |
CocosRobot
|
16b31e3157
|
[AUTO]: updating luabinding automatically
|
2014-05-12 08:14:14 +00:00 |
CocosRobot
|
18e8f1bdae
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-12 08:11:46 +00:00 |
minggo
|
f290d4d3ff
|
Merge pull request #6632 from andyque/refactor5057
issue #5057. add UIDeprecated.h and refactor FocusDirection to inner class of
|
2014-05-12 16:10:21 +08:00 |
andyque
|
9a8c87601c
|
Merge branch 'v3' into refactor5057
|
2014-05-12 15:52:47 +08:00 |
minggo
|
ed7f27665a
|
Merge pull request #6678 from Dhilan007/v3
fixed compile fail on android.
|
2014-05-12 15:31:28 +08:00 |
Dhilan007
|
64b2562e1f
|
fixed compile fail on android.
|
2014-05-12 15:22:57 +08:00 |
minggo
|
1053cacc16
|
don't trigger onExitTransitionDidStart
|
2014-05-12 15:05:21 +08:00 |
andyque
|
da3e794631
|
issue #5057, convert const char* to std::string&
|
2014-05-12 14:59:00 +08:00 |
James Chen
|
d8b913dcd8
|
Merge pull request #30 from Dhilan007/iss4660
Label:fixed wrong logic of alignment.
|
2014-05-12 14:39:14 +08:00 |
Dhilan007
|
fc72dc040d
|
Label:fixed wrong logic of alignment.
|
2014-05-12 14:34:25 +08:00 |
andyque
|
56f417c520
|
issue #5057, fix windows compile error
|
2014-05-12 14:11:44 +08:00 |
minggo
|
f5055548ac
|
[ci skip]
|
2014-05-12 14:00:11 +08:00 |
minggo
|
94f50b1856
|
Merge pull request #6535 from dumganhar/value-optimize
closed #5099: Optimization for Value
|
2014-05-12 13:57:50 +08:00 |
andyque
|
8232b98525
|
issue #5057, fix android compile error
|
2014-05-12 13:54:30 +08:00 |
James Chen
|
a126433bdd
|
Merge pull request #6677 from CocosRobot/update_lua_bindings_1399873414
[AUTO]: updating luabinding automatically
|
2014-05-12 13:45:22 +08:00 |
CocosRobot
|
5c735e5277
|
[AUTO]: updating luabinding automatically
|
2014-05-12 05:44:32 +00:00 |
cocoscodeide
|
64b630912d
|
Merge pull request #3 from chuanweizhang2013/v3luaruntime
fixed project name
|
2014-05-12 13:44:31 +08:00 |
minggo
|
8ceb26532a
|
[ci skip]
|
2014-05-12 13:43:47 +08:00 |
minggo
|
b23056537b
|
Merge pull request #6602 from minggo/remove-unneeded-codes
remove unneeded codes
|
2014-05-12 13:41:12 +08:00 |
andyque
|
b735ce3ffc
|
issue #5057, fix andriod and linux compile
|
2014-05-12 11:55:00 +08:00 |
andyque
|
9d7d06a1f8
|
issue #5047, refactor UIVideoPlayer
|
2014-05-12 11:35:57 +08:00 |