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

2703 Commits

Author SHA1 Message Date
andyque 6c16f16b1d fix CCDirectorCaller warnings 2014-03-20 11:32:43 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
andyque d7b3737605 fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings 2014-03-20 10:14:25 +08:00
CocosRobot 0a57a5be11 [AUTO]: updating luabinding automatically 2014-03-19 10:32:42 +00:00
James Chen bed76d4460 Merge pull request #5870 from dabingnn/fix_scale0Bug 
closed #4382: added missed scaleZ feature in ScaleTo and ScaleBy.
 2014-03-19 18:28:12 +08:00
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash 
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
 2014-03-19 17:57:40 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
James Chen 740aa30713 closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window 2014-03-19 17:09:10 +08:00
Huabing.Xu dc9baa7c72 closed #4382: added missed scaleZ feature for scaleZ 2014-03-19 16:23:14 +08:00
CocosRobot f0fdcb22d3 [AUTO]: updating luabinding automatically 2014-03-19 06:14:23 +00:00
James Chen 7061641dd8 Merge pull request #5860 from Dhilan007/develop_label 
closed #4434: Label's color is incorrect if it's created by font name
 2014-03-19 14:09:32 +08:00
Dhilan007 bb17da8f88 add override for Label::updateDisplayedColor 2014-03-19 10:36:44 +08:00
Dhilan007 f76460aee8 closed issue#4434:fixed display incorrect color of label if create by font name. 2014-03-19 10:10:47 +08:00
CocosRobot 781ff463a2 [AUTO]: updating luabinding automatically 2014-03-19 01:56:50 +00:00
James Chen a5e9630db1 Merge pull request #5843 from Dhilan007/develop_label 
closed #4428: fixed display incorrect of multi-line label if invoking 'getLetter'.
 2014-03-19 09:52:14 +08:00
CocosRobot fc5a34e500 [AUTO]: updating luabinding automatically 2014-03-18 07:55:30 +00:00
Dhilan007 a286ed8374 fixed typo. 2014-03-18 13:48:41 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
Dhilan007 46a4c17097 change access specifier of SpriteBatchNode::addSpriteWithoutQuad. 2014-03-17 19:31:58 +08:00
Dhilan007 cc671835f8 closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line. 2014-03-17 18:33:15 +08:00
chuanweizhang2013 295bf7f7f2 rename variable 2014-03-17 11:06:50 +08:00
chuanweizhang2013 9167d39959 space 2014-03-15 18:18:56 +08:00
chuanweizhang2013 0a9ec91d6c init Console variable 2014-03-15 18:13:29 +08:00
James Chen 2e13d45848 Merge pull request #5819 from Dhilan007/develop_menu 
fixed content size of MenuItem is incorrect when font size or font name ...
 2014-03-15 01:27:05 +08:00
Dhilan007 e20676f939 fixed content size of MenuItem is incorrect when font size or font name change. 2014-03-15 01:24:23 +08:00
minggo 1c96c595ac Merge pull request #5817 from dumganhar/develop 
Fix potential overflow in Texture::getCachedTextureInfo and where uses MultiByteToWideChar and WideCharToMultiByte
 2014-03-15 01:23:00 +08:00
minggo dfb3b6719c Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator 
build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...
 2014-03-15 01:22:28 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
James Chen a47923e06d Fix potential overflow in Texture::getCachedTextureInfo. 2014-03-15 01:09:22 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
James Chen 9bc48a7ac1 PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm. 2014-03-14 18:40:04 +08:00
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash 
Crash while clicking close button on desktop platforms
 2014-03-14 18:26:34 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label 
closed #4377: LabelAtlas::setColor takes no effect.
 2014-03-14 18:07:36 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color. 
MenuItem:using Label to replace LabelTTF.
 2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
CocosRobot a090729b6e [AUTO]: updating luabinding automatically 2014-03-14 08:44:57 +00:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
CocosRobot 189733abac [AUTO]: updating luabinding automatically 2014-03-14 07:56:39 +00:00
James Chen 8c7bc11931 Merge pull request #5790 from dumganhar/warning-fix-and-project-update 
Warning fix and update VS project to fix compilation errors when building in Release mode
 2014-03-14 15:48:55 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
James Chen a94b82e738 Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
Dhilan007 5f6fbc6a33 label:fixed getter for font size and font name. 2014-03-14 15:18:45 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
James Chen 263c83fd88 Merge pull request #5775 from CocosRobot/update_lua_bindings_1394716568 
[AUTO]: updating luabinding automatically
 2014-03-13 21:19:13 +08:00
CocosRobot c9259bb800 [AUTO]: updating luabinding automatically 2014-03-13 13:17:32 +00:00
James Chen 8743b00d9f Merge pull request #5768 from Dhilan007/develop_label2 
Refactor setter of label's font name and font size.
 2014-03-13 21:14:36 +08:00
Dhilan007 fe6f485a6b label:rename some API for clearly. 2014-03-13 21:00:36 +08:00
boyu0 b0b1645190 fix some physics bugs. 2014-03-13 20:56:51 +08:00