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

27107 Commits

Author SHA1 Message Date
pipu e81dca372a Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader 2014-12-10 15:46:58 +08:00
pipu 6b6fe4129d Update Reader 2014-12-10 12:36:14 +08:00
minggo 33a8c0d49b Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129 
[AUTO]: updating luabinding automatically
 2014-12-10 11:15:09 +08:00
minggo eef6d08813 Merge pull request #9402 from doomsdayer/v3_listview 
V3 listview
 2014-12-10 11:13:42 +08:00
andyque 989c05cd2d add TextureResType to LoadingBar 2014-12-10 10:21:17 +08:00
yusheng.lu c6ba594c72 listview resources added 2014-12-10 09:59:28 +08:00
youyou 41c86de0d4 update csloader 2014-12-09 22:13:17 +08:00
samuele3hu 4b43fab3e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 
# 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-12-09 21:03:01 +08:00
CocosRobot b0aacdc287 [AUTO]: updating luabinding automatically 2014-12-09 10:34:49 +00:00
samuele3hu 7e8da62ebc Add Websocket support for Mac platform 2014-12-09 18:29:20 +08:00
minggo 73ece5ad09 Merge pull request #9385 from samuele3hu/v3_cocostudio 
Remove useless copy about luasocket on the android platform
 2014-12-09 18:28:08 +08:00
minggo 734a378272 Merge pull request #9431 from pipu/update_widget_reader_and_actiontimeline_reader 
Update some widget reader and action time line reader
 2014-12-09 18:21:56 +08:00
kaile.yin 9fdd8cee06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-09 16:03:33 +08:00
pipu f54254494c Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp 2014-12-09 15:13:09 +08:00
minggo 5ab4f16fb1 Merge pull request #9411 from pipu/v3_reader_update 
V3 reader update
 2014-12-09 13:44:55 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
lite3 91c7127bbd Merge branch 'v3' into spriteretainframe 2014-12-09 10:51:47 +08:00
Zhe Wang 6413004add Update RELEASE_NOTES.md 
fix more typos.
 2014-12-09 10:20:58 +08:00
Zhe Wang f2e2454553 Update RELEASE_NOTES.md 
'Reskin' to `Reskin`
'Attachment' to `Attachment`
'Better support for FBX' to `Better support for FBX`
etc.
 2014-12-09 10:15:28 +08:00
Zhe Wang 19c00492c8 Update RELEASE_NOTES.md 
`trianle command` to `triangle command`
 2014-12-09 10:12:31 +08:00
Zhe Wang 72c125d6d4 Update RELEASE_NOTES.md 2014-12-09 10:09:03 +08:00
Zhe Wang 4f7913fcd6 Update RELEASE_NOTES.md 2014-12-09 10:08:09 +08:00
Zhe Wang 98b8ab7d26 Update RELEASE_NOTES.md 
`ClippingRectangNode` to `ClippingRectangleNode, 
`effecient` to `efficient`
 2014-12-09 10:07:48 +08:00
Zhe Wang a6c9092c19 Update RELEASE_NOTES.md 
change `Cocostudio Reader` to `Cocos Studio Reader`
 2014-12-09 10:00:25 +08:00
lite3 4f4c30051e retain the sprite frame 
do not removed by SpriteFrameCache::removeUnusedSpriteFrames
 2014-12-08 21:04:15 +08:00
yusheng.lu 7426a32d9f 1. ListView demo compeleted. 
2. Optimized ListViewReader format.
 2014-12-08 19:00:12 +08:00
minggo 7749e11614 Merge pull request #9414 from CocosRobot/update_lua_bindings_1418033522 
[AUTO]: updating luabinding automatically
 2014-12-08 18:16:50 +08:00
minggo 15948e7748 [ci skip] Update CHANGELOG 2014-12-08 18:14:56 +08:00
CocosRobot e510f24663 [AUTO]: updating luabinding automatically 2014-12-08 10:14:41 +00:00
minggo dd5659b6eb Merge pull request #9401 from minggo/iss9398-not-close-dir 
invoke closedir after invoke opendir
 2014-12-08 18:10:41 +08:00
minggo 71511078c6 [ci skip] Update CHANGELOG 2014-12-08 18:10:20 +08:00
minggo b6b9a5013f Merge pull request #9404 from super626/v3 
bug fix
 2014-12-08 18:08:25 +08:00
minggo 06c8f093ec Merge pull request #9413 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2014-12-08 18:07:35 +08:00
zhangbin 72f88a9790 Update the reference of submodule cocos2d-console. 2014-12-08 16:43:44 +08:00
pipu 56a25a2644 Update reader 2014-12-08 15:48:24 +08:00
andyque 119a68afd9 fix EditBox move animation position is wrong on iPhone6 Plus 2014-12-08 15:34:58 +08:00
andyque d53d71610b Merge branch 'v3' into fixEditBox_v3 2014-12-08 15:20:06 +08:00
pipu c3365a4654 Add interface that create node with flat buffers object for simulator 2014-12-08 14:32:33 +08:00
minggo 3dd68b47b3 Merge pull request #9390 from liamcindy/UIReader 
update for cocos reader
 2014-12-08 14:25:57 +08:00
minggo 4f021ce58f Merge pull request #9394 from MSOpenTech/wp8-fileutils-fix 
Fixed CCFileUtils::renameFile() for wp8 and winrt to pass FileUtils and AssetMangers tests
 2014-12-08 14:24:03 +08:00
minggo c067338c17 closedir when succeed 2014-12-08 11:36:11 +08:00
XiaoYang a59d4ab2a3 Merge pull request #171 from tangziwen/v3 
let billboard can rotate in the Z axis
 2014-12-08 09:34:58 +07:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
minggo 74c80296aa invoke closedir after invoke opendir 2014-12-08 09:58:58 +08:00
Dale Stammen 1d908f94ab fixed renameFile for wp8 and winrt to pass file and assetmangers tests 2014-12-05 18:12:25 -08:00
Huabing.Xu a76e2e430d Merge pull request #9392 from dabingnn/v3_releaseNotes 
V3 release notes
 2014-12-05 21:54:11 +08:00
Huabing.Xu 4c1b5bdfc6 update ReleaseNotes 2014-12-05 21:49:54 +08:00
Huabing.Xu 5e74418839 update ReleaseNots 2014-12-05 21:06:10 +08:00
Huabing.Xu ba689fc5ab update ReleaseNotes 2014-12-05 20:47:15 +08:00
kaile.yin 6479f15051 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-05 20:27:34 +08:00