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

26639 Commits

Author SHA1 Message Date
yangxiao 32395f8e90 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-12-12 15:09:11 +08:00
yangxiao 34b21dad6d invalid texture parameter on release mode fix #9465 2014-12-12 15:05:55 +08:00
XiaoYang b106b2f7ce Merge pull request #175 from lvlonggame/v3 
fix bug: same model in mirror state cullFace problem.
 2014-12-12 09:52:01 +07:00
minggo 7acb8bfddf Merge pull request #9477 from pipu/update_serialize_plist_file_name 
Update that serialize plist file name and load plist file
 2014-12-12 10:13:18 +08:00
minggo a620608a29 Merge pull request #9478 from cocoscodeide/v3 
[ci skip]runtime's setSearchPaths failed
 2014-12-12 09:56:12 +08:00
honghui ab162a01f4 runtime's setSearchPaths failed 2014-12-11 22:16:39 +08:00
pipu accf66c49f Update that serialize plist file name 2014-12-11 19:15:04 +08:00
Wenhai Lin 46f6f6bb34 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game 2014-12-11 18:24:03 +08:00
minggo 93561fcb8e [ci skip]update version 2014-12-11 18:14:28 +08:00
minggo 07c9251557 Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize 
Fix UIText miss copy contentSize for clone
 2014-12-11 17:55:32 +08:00
minggo f0f393654e Merge pull request #9459 from pipu/fix_#9457 
Fixes #9457
 2014-12-11 15:12:48 +08:00
minggo d7c722c67f Merge pull request #9455 from samuele3hu/v3_cocostudio 
Add Websocket support for Mac platform
 2014-12-11 15:12:10 +08:00
lvlong d0ce99413d fix bug: same model in mirror state cullFace problem. 2014-12-11 14:24:26 +08:00
minggo 498ad489fe Merge pull request #9461 from MSOpenTech/v3-wp8-release-notes 
added notes to ReadMe for Windows 8.1 Universal App
 2014-12-11 13:36:15 +08:00
Edward Zhou 1ca92411fc Fix UIText miss copy contentSize for clone 2014-12-11 13:33:28 +08:00
Dale Stammen 6343502fcb added notes for Windows 8.1 Universal App 2014-12-10 20:52:29 -08:00
pipu 70b9767c56 1. Fixes #4957 that click test TestChangePlaySection, then it will crash. 
2. Modify default value of selectedState to serialize check box data.
 2014-12-11 11:34:31 +08:00
zhangbin 6f4d61e948 Solve the environment conflict with Cocos. 2014-12-11 11:14:30 +08:00
minggo 974c6593a2 Merge pull request #9454 from andyque/modifyExternal 
update v3-deps to 29
 2014-12-11 10:55:39 +08:00
minggo a1c60bcf24 Merge pull request #9452 from minggo/java-style 
[ci skip]use java coding style
 2014-12-11 10:55:14 +08:00
Wenhai Lin 6bb91c35f6 Merge branch 'java-style' of https://github.com/minggo/cocos2d-x into v3-game 2014-12-11 10:05:33 +08:00
andyque e05d6d872b update v3-deps to 29 2014-12-11 10:04:16 +08:00
minggo 48345a0d65 Merge pull request #9441 from pipu/update_reader 
Update Reader
 2014-12-11 10:02:38 +08:00
minggo 7c07bc6a90 Merge pull request #9449 from Dhilan007/v3-keycode 
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
 2014-12-11 09:58:57 +08:00
samuele3hu 5d3008d6ac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 2014-12-11 09:51:18 +08:00
Sxd 5f47bef320 add stopActionByName() 2014-12-11 02:57:13 +08:00
minggo 0408c03903 [ci skip] Update CHANGELOG 2014-12-10 18:56:07 +08:00
minggo 1d1028a68b Merge pull request #9410 from andyque/fixEditBox_v3 
Fix edit box v3
 2014-12-10 18:54:20 +08:00
minggo 0e7470505f replace tab with 4 spaces 2014-12-10 18:32:58 +08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
minggo 77ed7a47e2 use java coding style 2014-12-10 18:07:46 +08:00
pipu d3351a4b11 1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic. 
2. Update how to parse attribute scale9Enabled
 2014-12-10 17:35:39 +08:00
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