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

25914 Commits

Author SHA1 Message Date
minggo 116ff0de63 Merge pull request #9439 from andyque/addcreateMethodToLoadingBar 
add TextureResType to LoadingBar's create method
 2014-12-16 18:31:20 +08:00
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +08:00
minggo 048fc500c9 Merge pull request #9505 from CocosRobot/update_lua_bindings_1418695925 
[AUTO]: updating luabinding automatically
 2014-12-16 18:28:05 +08:00
CocosRobot 3d327deb6d [AUTO]: updating luabinding automatically 2014-12-16 02:14:01 +00:00
minggo 5a4c4c61af Merge pull request #9458 from natural-law/v3 
Solve the environment conflict with Cocos.
 2014-12-16 10:09:03 +08:00
minggo b3731fa06a Merge pull request #9486 from 2youyouo2/v3_EventFrame 
fixed frame event
 2014-12-16 09:53:43 +08:00
minggo 26d555cd0b [ci skip] Update CHANGELOG 2014-12-16 09:50:37 +08:00
minggo 6b18305550 Merge pull request #9497 from Dhilan007/v3-game 
Fixed content size of Label is incorrect after sets empty string.
 2014-12-16 09:48:36 +08:00
minggo 392d8ece98 Merge pull request #9495 from vovkasm/pull/fix-tinyxml-usage 
Fix usage of tinyxml2 in cocostudio code
 2014-12-16 09:47:31 +08:00
joewanchen 7b23e3ab1d remove useless function call. 2014-12-15 19:47:25 +08:00
joewanchen 713d19c830 initialize _contentSizeDirty. 2014-12-15 19:43:54 +08:00
joewanchen 0cc4b58383 initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00
Wenhai Lin 4ed5872ba3 Fixed content size of Label is incorrect after sets empty string. 2014-12-15 14:36:57 +08:00
youyou 69824ff07b add space for readable 2014-12-15 09:36:21 +08:00
Vladimir Timofeev be01bede63 Fix couple of warnings. Make forward declarations to match to real declarations. 2014-12-14 21:04:14 +03:00
Vladimir Timofeev 6494a7abae Hide tinyxml2 from user visible header. 2014-12-14 20:32:24 +03:00
Vladimir Timofeev 9bd1ab74c7 Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory. 
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
 2014-12-14 12:14:16 +03:00
youyou 579bb3f8d8 fixed frame event 2014-12-12 18:02:03 +08:00
minggo e060360d9b Merge pull request #9483 from cocoscodeide/v3 
[ci skip]update runtime version
 2014-12-12 15:49:17 +08:00
minggo cf8b6120a0 Merge pull request #9481 from super626/v3 
CullFace state change bug and fix #9465
 2014-12-12 15:48:31 +08:00
honghui 3c3b190be8 update runtime version 2014-12-12 15:47:12 +08:00
minggo 75d9fd1b63 Merge pull request #9482 from minggo/v3 
[ci skip]update release note
 2014-12-12 15:41:01 +08:00
minggo e4e0d4552f [ci skip] 2014-12-12 15:39:16 +08:00
minggo dbbe459e54 update version 2014-12-12 15:37:27 +08:00
minggo b387dfae52 update release note 2014-12-12 15:31:47 +08:00
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