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

5395 Commits

Author SHA1 Message Date
minggo 31af102f26 Merge pull request #7532 from lite3/object_to_luaval 
replace dynamic_cast to std::is_base_of
 2014-07-25 23:11:55 +08:00
boyu0 34a8d26124 Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image. 2014-07-25 18:19:04 +08:00
boyu0 e3b79f4150 delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning. 2014-07-25 18:01:32 +08:00
Dhilan007 154be91808 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio 2014-07-25 17:58:40 +08:00
gin0606 c66ebbf528 Fix void* casting 2014-07-25 16:41:12 +09:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
dzl-ian 7048bc515b Remove update of content size as it won't change 2014-07-25 15:52:35 +09:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
dzl-ian 3ad0d981c4 Add getter and setter for TextColor to Text Widget 2014-07-25 14:46:25 +09:00
gin0606 4ee13994ce Fix Scale issue on cocos2d-x cpp-test 2014-07-25 13:10:16 +09:00
Huabing.Xu 68894e622f add indexData 2014-07-25 11:58:54 +08:00
LiuZhuo 2f10e8e468 Update CCParticleSystem.cpp 2014-07-25 11:40:23 +08:00
minggo 20e3a61524 Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2 
mac custom font fix v2
 2014-07-25 11:38:38 +08:00
minggo 88d4adda63 Merge pull request #7586 from samuele3hu/v3_retain 
Fix the a error in the `ccmap_string_key_to_luaval` function
 2014-07-25 11:26:33 +08:00
minggo 98943b4517 Merge pull request #7548 from yongkangchen/v3 
fix Label::setTextColor did not have any effect.
 2014-07-25 11:18:10 +08:00
Huabing.Xu a4cd61f30a compiles OK: raw version of vertex Index buffer, half version of vertex data 2014-07-25 09:58:24 +08:00
samuele3hu 1d055fe6e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_retain 2014-07-25 09:44:52 +08:00
samuele3hu e51cb57c53 Fix the a error in the `ccmap_string_key_to_luaval` functions 2014-07-25 09:44:17 +08:00
minggo d3e30b1b32 Merge pull request #7574 from andyque/fixRichTextVisitIssue 
fix RichText visit issue
 2014-07-25 09:24:58 +08:00
CocosRobot 8cc0a2eea3 [AUTO]: updating luabinding automatically 2014-07-24 14:23:49 +00:00
minggo b0c922d91e Merge pull request #7188 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Add new file&directory apis into FileUtils and test cases
 2014-07-24 22:18:10 +08:00
Reck Hou 44c675f9ee Fix: Application::setAnimationInterval() not implemented. 2014-07-24 19:22:17 +08:00
Unai Orbe ae56e637f8 allow setting bundle to use in file utils 2014-07-24 11:56:59 +01:00
minggo fa1d9ecf0c Merge pull request #7568 from 2youyouo2/v3 
fixed init Armature blendfunc state
 2014-07-24 17:44:56 +08:00
Sergey 9501b9912d load font v2 2014-07-24 12:25:07 +04:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
andyque a9a16b3ee5 fix RichText visit issue 2014-07-24 11:51:47 +08:00
Huabing.Xu f795ca5467 Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError 2014-07-24 10:38:25 +08:00
Huabing.Xu 58cd01b2f6 reverse cocos2d.vcxproj 2014-07-24 10:37:54 +08:00
Huabing.Xu 918da16639 Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError 2014-07-24 10:09:59 +08:00
kaile.yin 3b1ee96aef fixed armature blendfunc effect 2014-07-23 21:35:08 +08:00
wagulu 46ac5d12b2 Update CCParticleSystem.cpp 
diff is base on WorldSpace, when you scale scene,you will get the wrong value.
 2014-07-23 21:04:17 +08:00
kaile.yin 01d85340ad fixed black edge in Armature 2014-07-23 20:07:33 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +08:00
minggo 0f105a58c2 Merge pull request #7563 from andyque/minorFixOfRichText 
minor fix of RichText
 2014-07-23 18:17:41 +08:00
kaile.yin bdad6d9b67 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-23 15:24:36 +08:00
kaile.yin 5aae024a7b fixed cannot set blendfunc to Armature 2014-07-23 15:21:20 +08:00
CocosRobot 283d727b76 [AUTO]: updating luabinding automatically 2014-07-23 06:21:31 +00:00
andyque 21f1624462 minor fix of RichText 2014-07-23 14:10:00 +08:00
samuele3hu 0a6af2f758 Add more useful tip for error log 2014-07-23 13:44:57 +08:00
samuele3hu 6d678ce443 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion 2014-07-23 11:57:56 +08:00
samuele3hu 91fc288fbe Add more useful tip for error log 2014-07-23 11:57:17 +08:00
minggo 3662077025 Merge pull request #7556 from Dhilan007/v3 
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
 2014-07-23 11:29:26 +08:00
Huabing.Xu b281c38c20 init version of VertexIndexBuffer 2014-07-23 09:20:33 +08:00
LinWenhai 0fe02b3636 Update CCFontAtlasCache.cpp 2014-07-22 22:07:19 +08:00
LinWenhai 815d063a0a replace sprintf with snprintf 2014-07-22 22:05:56 +08:00
Sergey 9e692cd329 missing include 2014-07-22 15:49:39 +04:00
Sergey 59cbc153d4 Copyright & small fixes 2014-07-22 15:49:38 +04:00
Sergey 9c0493d40b mipmaps loading fix 2014-07-22 15:49:37 +04:00
Sergey 600dbebfb0 pvr 2bpp decompression fixed 2014-07-22 15:49:37 +04:00
Sergey 624b6a5af4 unused variable removed 2014-07-22 15:49:37 +04:00
Sergey 1a617ad804 pvr display fix pvr decompression on 64 bit platforms fix 2014-07-22 15:49:36 +04:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
minggo f2f0152f54 Merge pull request #7555 from CocosRobot/update_lua_bindings_1406020122 
[AUTO]: updating luabinding automatically
 2014-07-22 18:36:30 +08:00
minggo 2e56a4ce21 Merge pull request #7546 from nutty898/v3_nutty_modifynodereader 
Fixed bug of NodeReader
 2014-07-22 18:34:36 +08:00
Dhilan007 f38b48914f fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments. 2014-07-22 18:31:53 +08:00
CocosRobot c8c17b68df [AUTO]: updating luabinding automatically 2014-07-22 09:11:18 +00:00
minggo 8cc25f82e6 fix compiling error 2014-07-22 17:03:27 +08:00
Yongkang Chen bb7d6ba3d4 fix Label::setTextColor did not have any effect. 2014-07-22 14:52:41 +08:00
samuele3hu aa0308a7c8 Add more useful tip for error log 2014-07-22 11:16:16 +08:00
zhangcheng 76c12e9029 1. add export to function CocosGUIVersion() 2014-07-22 10:02:00 +08:00
cai wenzhi d14522880d Fixed bug of NodeReader 2014-07-21 22:45:33 +08:00
zhangcheng bc254cab25 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport 2014-07-21 20:46:55 +08:00
Huabing.Xu 3403182f3e change define macros to avoid run error on mac 32 bit 2014-07-21 18:12:46 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
minggo 8e3220ba9e Merge pull request #7533 from dabingnn/v3_windowsDllCompileError 
fix windows compile error
 2014-07-21 17:17:33 +08:00
pandamicro d2c6602dea Refactor #5580: Merge createDirectories to createDirectory 2014-07-21 16:51:48 +08:00
samuele3hu d9dc6ea2f7 Reset Webscoket 2014-07-21 16:05:10 +08:00
samuele3hu 5e773edb28 Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion 2014-07-21 16:01:56 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
lite3 d66d9b02de replace dynamic_cast to std::is_base_of 2014-07-21 14:37:46 +08:00
minggo 7ba4f2ed5e Merge pull request #7526 from chenguangqi/v3 
fixed compile error.
 2014-07-21 13:54:31 +08:00
CocosRobot 30b00dadd8 [AUTO]: updating luabinding automatically 2014-07-21 03:57:41 +00:00
minggo 45fa2363e8 Merge pull request #7517 from dabingnn/v3_dll 
V3 dll
 2014-07-21 11:53:36 +08:00
Jialong Zhai 012f5403d9 protected -> CC_CONSTRUCTOR_ACCESS 2014-07-21 11:17:58 +08:00
edwardzhou bf4143b5a3 show detail class & function name on conversion error 2014-07-21 09:39:41 +08:00
edwardzhou 0f2fde38fa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-21 09:36:18 +08:00
陈广歧 8b4953bbfc fixed compile error. 
```bash
# compile for android.
$ ./build_native.py
```

Error message as follow:

```
ssize_tjni/../../cocos2d/cocos/./3d/CCBundleReader.cpp:94:23: error: return type of out-of-line
      definition of 'cocos2d::BundleReader::tell' differs from that in the declaration
ssize_t BundleReader::tell()
                      ^
jni/../../cocos2d/cocos/./3d/CCBundleReader.h:90:14: note: previous declaration is here
    long int tell();
             ^
1 error generated.
```
 2014-07-19 18:29:52 +08:00
minggo e128a432c1 Merge pull request #7521 from andyque/fixTextFieldDeleteBug 
fix TextField backspace delete bug
 2014-07-18 18:37:07 +08:00
andyque 73b38fbc6b fix TextField backspace delete bug 2014-07-18 18:13:17 +08:00
minggo b347c93f47 Merge pull request #7520 from andyque/fixListViewInsertAtIndexBug 
fix listview insert child at index bug
 2014-07-18 18:09:49 +08:00
andyque 4fa1af584c fix listview insert child at index bug 2014-07-18 18:02:46 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
Huabing.Xu 0be2210724 rename CGSize to NSSize 2014-07-18 16:51:29 +08:00
edwardzhou 6b9e79629f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-18 15:36:54 +08:00
pandamicro b614854cf9 Refactor #5580: Improve createDirectories 2014-07-18 15:09:00 +08:00
Huabing.Xu 23db16b0bd convert indention to space 2014-07-18 14:53:00 +08:00
Huabing.Xu 8afd7614d1 Merge branch 'v3' into v3_dll 2014-07-18 14:01:17 +08:00
minggo 9409a73a06 Merge pull request #7511 from Mazyod/const-data-copy 
[FIX]: copied data should be const
 2014-07-18 11:35:09 +08:00
minggo 405ea3b7b9 Merge pull request #7510 from MSOpenTech/wp8-v3-fix 
Wp8 v3 shader update
 2014-07-18 10:03:48 +08:00
Mazyad Alabduljaleel a4b4efff1b [FIX]: copied data should be const 2014-07-18 03:44:39 +04:00
Dale Stammen 24462e1ded updated wp8 precompiled shaders 2014-07-17 09:41:07 -07:00
samuele3hu b482a5e971 Use relative path in the cocos2dxLuaLoader for showing useless msg when lua script trigger errors 2014-07-17 23:53:36 +08:00
CocosRobot 8ea5083e32 [AUTO]: updating luabinding automatically 2014-07-17 14:20:04 +00:00
minggo 867fb18c5d Merge pull request #7503 from CaiCQ/v3 
修正Linux下中文显示问题
 2014-07-17 22:05:15 +08:00
minggo b4c75bb7f5 Merge pull request #7504 from CocosRobot/update_lua_bindings_1405603442 
[AUTO]: updating luabinding automatically
 2014-07-17 21:41:45 +08:00
andyque 76ffb2261d fix ios comiple error 2014-07-17 21:44:33 +08:00
CocosRobot ffaa0d9c04 [AUTO]: updating luabinding automatically 2014-07-17 13:26:35 +00:00
minggo 61597e0e5a Merge pull request #7496 from Dhilan007/v3-320final 
Fixed VideoPlayer can't quitting the full screen mode by press the back key on Android.
 2014-07-17 21:19:56 +08:00
Dhilan007 51aba5dae4 fixed magic number. 2014-07-17 21:19:09 +08:00
Dhilan007 229b30ed8b Fixed VideoPlayer can't quitting the full screen mode by press the back key. 2014-07-17 21:10:26 +08:00
Huabing.Xu 21b3e55339 Mac dylib version works now 2014-07-17 20:58:50 +08:00
minggo 462f9bdd78 Merge pull request #7502 from visiblelight/render_texture_disabled 
The orientation of render texture should be rotated
 2014-07-17 20:09:01 +08:00
visiblelight 7e7c3aeb1c The orientation of render texture should be rotated when _keepMatrix is true 2014-07-17 19:53:35 +08:00
CCQ 2bda9f62a1 Merge branch 'v3' of github.com:CaiCQ/cocos2d-x into v3 2014-07-17 18:58:55 +08:00
CCQ cb3b9b8405 修正Linux下中文显示不全问题 2014-07-17 18:42:23 +08:00
andyque 7ff78c61ba fix richText UTF8 2014-07-17 18:36:09 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo 578af01ef1 Merge pull request #7499 from andyque/fixRichTextUTF8 
fix richText utf8 error
 2014-07-17 17:57:41 +08:00
andyque fc2ab110cc fix richText utf8 error 2014-07-17 17:58:40 +08:00
minggo 8381069c75 Merge pull request #7497 from chengstory/v3_fixesActionManagerCrash 
V3 fixes action manager crash
 2014-07-17 17:42:04 +08:00
minggo 1f4b516f66 Merge pull request #7495 from boyu0/physics_flip_bug 
Fix the bug: flip scale for physics body make it's size incorrect.
 2014-07-17 17:28:03 +08:00
zhangcheng 6d0bf8e143 Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash 2014-07-17 17:25:32 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
boyu0 e07215995a Fix the bug: flip scale for physics body make it's size incorrect. 2014-07-17 17:21:09 +08:00
minggo 91a537dec6 Merge pull request #7493 from visiblelight/render_texture_disabled 
no need to save/restore for render texture when entering background
 2014-07-17 17:07:54 +08:00
vision a2413a6538 no need to save/restore for render texture when entering background 2014-07-17 17:03:10 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final 
fixed text line wrap issue in UITextField.
 2014-07-17 16:48:41 +08:00
Dhilan007 21ea289eb1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-320final 2014-07-17 16:48:08 +08:00
samuele3hu 10d498e1ae Fix type judgment error. 2014-07-17 16:41:09 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
CocosRobot aabfdfebed [AUTO]: updating luabinding automatically 2014-07-17 07:46:20 +00:00
minggo 5c0ac02f70 Merge pull request #7479 from samuele3hu/v3_hot_fix 
Update bindings-generator submodule and update the related Lua bindings for experimental and test cases
 2014-07-17 15:40:07 +08:00
minggo 3b3a29ed68 Merge pull request #7477 from Dhilan007/v3-gc0717 
Fix the y-inverse Joystick bug[IOS].
 2014-07-17 15:13:57 +08:00
samuele3hu db18530d63 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:58:50 +08:00
samuele3hu e975b0d5f9 Update experimental lua bindings、related test cases and project setting 2014-07-17 14:54:34 +08:00
CocosRobot fda93df648 [AUTO]: updating luabinding automatically 2014-07-17 06:12:42 +00:00
Huabing.Xu 3c6e87d34e Merge branch 'v3' into v3_dll 
Conflicts:
	cocos/base/ccUtils.h
 2014-07-17 14:12:10 +08:00
samuele3hu ab0fe54d32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 14:11:15 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
minggo 0fe0be18e8 Merge pull request #7475 from CocosRobot/update_lua_bindings_1405566114 
[AUTO]: updating luabinding automatically
 2014-07-17 13:37:20 +08:00
samuele3hu 5682a983bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 12:57:31 +08:00
samuele3hu eb8d1d70f7 Update the FastTileMapTest and VideoPlayerTest 2014-07-17 12:55:28 +08:00
samuele3hu 6f109f330f Update the related Lua bindings for experimental 2014-07-17 12:54:50 +08:00
Dhilan007 a457db53b0 Fix the y-inverse Joystick bug[IOS]. 2014-07-17 11:14:53 +08:00
minggo e58626c11c Merge pull request #7476 from Dhilan007/v3-gc0717 
Fixed bugs[Ouya controller]
 2014-07-17 11:12:31 +08:00
Dhilan007 1ff937aa48 Fixed bugs[Ouya controller]: 
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
 2014-07-17 11:09:08 +08:00
CocosRobot 9217589b9f [AUTO]: updating luabinding automatically 2014-07-17 03:04:08 +00:00
minggo 5a5b245e84 Merge pull request #7474 from andyque/fixFastTileMap 
change FastTiledMap namespace to cocos2d::experimental
 2014-07-17 10:52:40 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
minggo 43fe305cc9 Merge pull request #7283 from taug/v3 
could add seach path and resolution order path in front.
 2014-07-17 10:34:45 +08:00
minggo ab3a394d08 Merge pull request #7472 from CocosRobot/update_lua_bindings_1405563998 
[AUTO]: updating luabinding automatically
 2014-07-17 10:29:18 +08:00
CocosRobot e72fffe5c9 [AUTO]: updating luabinding automatically 2014-07-17 02:28:34 +00:00
minggo 54da8be54f Merge pull request #7467 from ntotani/fix-lua-accelerometer 
fix enabled to interval
 2014-07-17 10:23:45 +08:00
minggo 4c7d777f25 Merge pull request #7471 from visiblelight/wp8_shader_update 
Wp8 shader update
 2014-07-17 10:14:54 +08:00
vision c47d844d20 update the buildin shaders on WP8. Disable the effect 3d test. 2014-07-17 10:08:49 +08:00
samuele3hu 39e3f29e92 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:07:03 +08:00
minggo 2403bc2e50 Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10 
Add getChildByName method for get a node that can be cast to Type T
 2014-07-17 10:02:57 +08:00
samuele3hu ce4f5f0e96 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 10:02:16 +08:00
minggo c0fdc747e8 Merge pull request #7460 from andyque/fixComments 
modify widget class comments
 2014-07-17 10:00:12 +08:00
minggo a192ddfebd Merge pull request #7466 from andyque/fixPageView 
remove unused functions
 2014-07-17 09:59:46 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
samuele3hu b782814b4b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-16 22:08:48 +08:00
minggo b25cb5ccf3 Merge pull request #7468 from CocosRobot/update_lua_bindings_1405515629 
[AUTO]: updating luabinding automatically
 2014-07-16 21:28:37 +08:00
minggo ac82fdca59 Merge pull request #7462 from chengstory/v3_FixLuaTriggerTestBug 
1、 fixes lua TriggerTest bug.
 2014-07-16 21:28:15 +08:00
CocosRobot af231d78db [AUTO]: updating luabinding automatically 2014-07-16 13:02:27 +00:00
Naoyuki Totani cd025158f6 fix enabled to interval 2014-07-16 19:10:05 +09:00
samuele3hu 1b2d389011 Update ListViewEventType for Lua 2014-07-16 17:18:01 +08:00
andyque 46aafeecc6 remove unused functions 2014-07-16 16:28:01 +08:00
zhangcheng 1530ba4a90 1、fixes Trigger condition value can't be export. 2014-07-16 16:12:55 +08:00
minggo c7473611b8 Merge pull request #7463 from Dhilan007/v3-320final 
Remove prompt box of connect controller[Nibiru].
 2014-07-16 15:26:24 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
Huabing.Xu a0be6d9ac7 remove Storage project, merge code into cocos2d 2014-07-16 14:49:05 +08:00
Dhilan007 7e76b7b9a1 Remove prompt box of connect controller[Nibiru]. 2014-07-16 14:48:22 +08:00
zhangbin 7e7c3a1e55 Merge branch 'v3' into android-dependencies 2014-07-16 13:49:20 +08:00
zhangbin 14f3d6f230 Adjust the dependencies of extensions & cocostudio on android. 2014-07-16 13:47:57 +08:00
joshuastray 190460018f use CC_CONSTRUCTOR_ACCESS in ParallaxNode 2014-07-16 11:40:09 +08:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
andyque 70ae3bf980 modify widget class comments 2014-07-16 10:12:13 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
samuele3hu a6c30bc495 Update bindings-generator config files and manual bindings files to fix the compile warning 2014-07-15 17:38:56 +08:00
minggo a59a86df0a Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib 
merge iOS arm64 libs to fat libs, change the project setting.
 2014-07-15 16:57:10 +08:00
minggo 920c3f905a Merge pull request #7449 from andyque/cleanupComments 
update UI module code comments
 2014-07-15 15:52:04 +08:00
andyque dae29e5678 update UI module code comments 2014-07-15 15:56:07 +08:00
joshuastray da9563f623 fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS 2014-07-15 15:26:37 +08:00
Huabing.Xu ed690114d7 add CC_DLL for mesh, lua works now 2014-07-15 15:19:34 +08:00
minggo b282970833 [ci skip] 2014-07-15 15:11:17 +08:00
minggo b5f9a45ee4 Merge pull request #7448 from andyque/fixTypo 
fix Layout typo
 2014-07-15 14:56:37 +08:00
andyque 1dc1df0827 fix Layout typo 2014-07-15 14:57:10 +08:00
minggo d830580dc3 Merge pull request #7442 from pandamicro/ArmatureTrans 
Fixed #5724: Fix armature bone's transform issue
 2014-07-15 14:37:02 +08:00
boyu0 8400ce2e84 fix error. 2014-07-15 14:14:35 +08:00
boyu0 812ad7cd5b fix lua compile error in xcode6 beta3 2014-07-15 14:10:36 +08:00
Huabing.Xu dbd3fce0a5 windows dll version of cpp-tests works 2014-07-15 13:54:08 +08:00
samuele3hu 19cc5b9c4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 13:34:46 +08:00
Huabing.Xu 63de5f6acc add CC_DLL 2014-07-15 12:00:31 +08:00
andyque 52596dc97f fix Text line wrap issue 2014-07-15 11:46:53 +08:00
samuele3hu 55e77d8fd2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-15 11:34:57 +08:00
pandamicro 216af377d0 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans 2014-07-15 11:32:12 +08:00
pandamicro db8f0ea3ab Fixed #5724: Use correct transform in CCSkin's updateTransform function 2014-07-15 11:31:10 +08:00
pandamicro 67c07f94f4 Issue #5724: Correction of property name in CCBone 2014-07-15 11:30:36 +08:00
Huabing.Xu 4b059689d3 add CC_DLL for functions 2014-07-15 11:18:05 +08:00
Huabing.Xu 9db59c0046 add CC_DLL for Event and Physics 2014-07-15 10:55:40 +08:00
Huabing.Xu cd9e42eb99 add CC_DLL for colorXXX 2014-07-15 10:04:24 +08:00
Huabing.Xu 60334e8b3e add CC_DLL for 3d 2014-07-15 09:45:43 +08:00
boyu0 2354c79c3f Fix compile error 2014-07-14 23:05:16 +08:00
Huabing.Xu 8bbce767f3 add CC_DLL for ActionEase 2014-07-14 22:42:44 +08:00
minggo ff31144bd2 Merge pull request #7438 from Dhilan007/v3-320final 
disable warn on zero-sized structure[android].
 2014-07-14 21:04:03 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
boyu0 7fd0ca217c Implement utils::atof() 2014-07-14 20:42:08 +08:00
Huabing.Xu 91314ed504 remove CC_DLL for template class and CC_DLL for CCValue 2014-07-14 18:40:10 +08:00
samuele3hu 7757df222a Add bit extend module 2014-07-14 18:26:39 +08:00
Dhilan007 5e10575ab0 disable warn on zero-sized structures. 2014-07-14 17:53:55 +08:00
Huabing.Xu 9806b37398 add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
Huabing.Xu 952ca0eb75 add CC_DLL in Renderer folder 2014-07-14 17:02:06 +08:00
CocosRobot 1ef1a809b5 [AUTO]: updating luabinding automatically 2014-07-14 08:53:13 +00:00
Huabing.Xu 190264c090 add CC_DLL in Event systems 2014-07-14 16:43:28 +08:00
Huabing.Xu 09a75f73cf add CC_DLL in math folder 2014-07-14 16:40:54 +08:00
minggo 981922eb95 Merge pull request #7432 from joshuastray/transition_ctor_access 
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
 2014-07-14 16:28:18 +08:00
samuele3hu 4cb6c1c74f Add lua bindings for TextureCache::addImageAsync and update the related test cases 2014-07-14 16:05:48 +08:00
Huabing.Xu 52c0bd365b add chipmunk.lib for release 2014-07-14 14:47:00 +08:00
Huabing.Xu 469dbea7da window dll version work now 2014-07-14 14:40:47 +08:00
joshuastray 98b1c0bbed add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
joshuastray e14c2587b5 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
minggo 92cfe90937 Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont 
Fix the bug that UITextField doesn't support TTF font
 2014-07-14 13:57:54 +08:00
edwardzhou c0254c9318 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-14 11:14:03 +08:00
Dhilan007 b3017fb773 fixed crash cause by incorrect font name. 2014-07-14 10:01:29 +08:00
zhangbin 272146cfb6 Solve the error when compiling lua projects on android. 2014-07-14 09:48:16 +08:00
zhangbin e4319bf534 Adjust the dependencies of cocosbuilder & cocostudio on android. 2014-07-14 09:48:16 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
kyokomi 915bdae4a6 Fix the bug that UITextField doesn't support TTF font 2014-07-12 22:42:44 +09:00
minggo 7c43b59c6b Merge pull request #7422 from minggo/get-curent-language 
return correct language type
 2014-07-12 20:45:05 +08:00
minggo bf4b376ae5 return correct language type 2014-07-12 20:40:15 +08:00
minggo cfc291e49d Merge pull request #7379 from joshuastray/v3 
move JumoTo's copy constuctor and operator= to private
 2014-07-12 20:19:03 +08:00
minggo 5c26dc5db4 Merge pull request #7417 from geron-cn/chukongv3 
fix bug: crash in ui csbs
 2014-07-11 20:37:51 +08:00
geron-cn 64408a5d8f fix bug: crash in ui csbs 2014-07-11 19:02:14 +08:00
minggo 05b485cd41 Merge pull request #7407 from visiblelight/fix_wp8_errors 
Fix compile errors on WP8
 2014-07-11 18:51:23 +08:00
minggo 86e5b37f16 Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955 
[AUTO]: updating luabinding automatically
 2014-07-11 18:50:58 +08:00
minggo 8cdbe5a019 Merge pull request #7412 from Dhilan007/v3-320final 
fixed warning: deleting pointer to incomplete type.
 2014-07-11 18:50:25 +08:00
CocosRobot 87aaf7dcef [AUTO]: updating luabinding automatically 2014-07-11 09:48:20 +00:00
Dhilan007 d2e8154dc3 fixed warning: deleting pointer to incomplete type. 2014-07-11 17:45:15 +08:00
minggo 7308668e63 Merge pull request #7411 from minggo/warning-fix 
fix warnings
 2014-07-11 17:42:12 +08:00
minggo ecb915fabf fix warnings 2014-07-11 17:39:56 +08:00
samuele3hu 01c3f2a4ed Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/tolua/cocos2dx.ini
 2014-07-11 16:44:59 +08:00
samuele3hu d1bd21b1db Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:17:51 +08:00
samuele3hu d9291031cd Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 16:10:42 +08:00
vision 7495a611ea fix conflict 2014-07-11 16:03:40 +08:00
samuele3hu 54970c109f Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0 2014-07-11 15:34:21 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo c63983345b Merge pull request #7353 from andyque/addStudio1.4 
add studio v1.3, v1.4, v1.5 tests
 2014-07-11 14:15:07 +08:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo 41c267fdb7 Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491 
[AUTO]: updating luabinding automatically
 2014-07-11 13:52:38 +08:00
CocosRobot 563386a777 [AUTO]: updating luabinding automatically 2014-07-11 05:46:37 +00:00
minggo f205c0b704 Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build 
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
 2014-07-11 13:41:33 +08:00
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 72f8ab8483 Merge pull request #7395 from samuele3hu/v3_controller 
Add Lua bindings for controller and related test case project
 2014-07-11 13:39:30 +08:00
minggo 65404066ec Merge pull request #7396 from CocosRobot/update_lua_bindings_1405051544 
[AUTO]: updating luabinding automatically
 2014-07-11 13:37:55 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear 
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
 2014-07-11 13:36:52 +08:00
minggo 7cf8cf42d3 Merge pull request #7389 from Dhilan007/v3-gc-nibiru 
Update Nibiru SDK and remove prompt box of install driver .
 2014-07-11 13:36:19 +08:00
CocosRobot 20c4e6530d [AUTO]: updating luabinding automatically 2014-07-11 04:07:14 +00:00
minggo a0b16a29d1 Merge pull request #7394 from Dhilan007/v3-gc-annotation 
Add annotation for Controller class.
 2014-07-11 12:03:01 +08:00
samuele3hu 2cbe262842 Add newline for some files 2014-07-11 12:00:43 +08:00
samuele3hu 77a82731a5 Remove auto bindings files for controller 2014-07-11 11:57:40 +08:00
samuele3hu 9b9713073e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 2014-07-11 11:55:10 +08:00
samuele3hu dd76ae93f6 Update controller lua binding and related test cases 2014-07-11 11:52:05 +08:00
Huabing.Xu 60dd7a4514 Merge branch 'v3' into v3_dll 2014-07-11 11:10:26 +08:00
Dhilan007 4e4464c9c1 Add annotation for Controller class. 2014-07-11 10:56:09 +08:00
Jason Xu d94941243a Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed 2014-07-11 10:27:00 +08:00
Huabing.Xu f5cffba6c9 change pure virtual function to virtual function in action series 
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
 2014-07-11 10:19:49 +08:00
yangxiao fd8541e32d rename Bone to Bone3D 2014-07-11 10:17:36 +08:00
samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/scripting/lua-bindings/Android.mk
	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
	tools/tolua/genbindings.py
 2014-07-10 22:42:09 +08:00
Dhilan007 dfbeb0fb63 Update Nibiru SDK and remove prompt box of install driver . 2014-07-10 22:33:58 +08:00
CocosRobot c205bd0806 [AUTO]: updating luabinding automatically 2014-07-10 14:10:03 +00:00
minggo e876065d3e Merge pull request #7229 from samuele3hu/v3_VideoPlayer 
Add VideoPlayer Lua bindings and update bindings-generator submodule
 2014-07-10 22:04:46 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
minggo b30d758d09 Merge pull request #7383 from 2youyouo2/v3 
fixed call Bone::setRotation has no effect
 2014-07-10 21:16:48 +08:00
zhangcheng a0ecae21c3 1. fixes TextReader load default font error. 2014-07-10 19:29:39 +08:00
minggo e749a9a598 Merge pull request #7380 from huangshiwu/v3 
change "const static" to "static const"
 2014-07-10 18:31:09 +08:00
geron-cn 1c4cb78745 deal with null in string 2014-07-10 18:24:11 +08:00
joshuastray 7396f447a4 move initWithDuration to CC_CONSTRUCTOR_ACCESS 2014-07-10 17:56:20 +08:00
kaile.yin 04c63cc370 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-10 17:51:02 +08:00
kaile.yin 42f2302866 fixed call Bone::setRotation has no effect 2014-07-10 17:50:38 +08:00
huangshiwu 2a65b7d98e change "const static" to "static const" 2014-07-10 16:50:25 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
edwardzhou 814f45179e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-10 16:10:11 +08:00
edwardzhou efde627f5b no use JoinThread 2014-07-10 16:10:02 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix 
Node::enumerateChildren  just searches from itself
 2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn 
fixed warn and replace NULL with nullptr.
 2014-07-10 15:42:02 +08:00
joshuastray 30574af6c5 move JumoTo's copy constuctor and operator= to private 2014-07-10 14:30:08 +08:00
minggo 0ba3f6c1c9 Merge pull request #7376 from joshuastray/v3 
use CC_CONSTRUCTOR_ACCESS to replace protected/private
 2014-07-10 14:14:08 +08:00
joshuastray 6b22870e27 use CC_CONSTRUCTOR_ACCESS to replace protected 2014-07-10 14:00:23 +08:00
minggo cdc02aea7c Merge pull request #7368 from CocosRobot/update_lua_bindings_1404957724 
[AUTO]: updating luabinding automatically
 2014-07-10 13:54:21 +08:00
minggo 316564d58a Node::enumerateChildren just searches from itself 2014-07-10 11:07:39 +08:00
yangxiao 0b4c6b7f7a comment 2014-07-10 11:05:48 +08:00
yangxiao d7b88e86ff add comment 2014-07-10 10:56:52 +08:00
yangxiao ef1f6892e1 deprecated Mesh::create use less parameter ones instead 2014-07-10 10:54:37 +08:00
CocosRobot af460a1530 [AUTO]: updating luabinding automatically 2014-07-10 02:03:40 +00:00
minggo 345fb040e7 Merge pull request #7352 from super626/v3 
adjust api according feedback
 2014-07-10 09:53:27 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
Dhilan007 dbcb20b886 Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8. 
Make clear EVENT_COME_TO_FOREGROUND event.
 2014-07-09 23:03:04 +08:00
samuele3hu 2bc1cd0486 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller 
Conflicts:
	cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
 2014-07-09 22:31:05 +08:00
minggo 7d74be3158 Merge pull request #7356 from 2youyouo2/v3 
fixed Armature blend func effect
 2014-07-09 18:37:15 +08:00
samuele3hu 243fa49c09 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 2014-07-09 18:08:09 +08:00
samuele3hu 3546c131dd Add Lua bindings for controller and related test case project 2014-07-09 18:05:02 +08:00
kaile.yin c53cb42e83 fixed Armature blend func effect 2014-07-09 14:25:51 +08:00
yangxiao dbea3a4d04 deprecated functions 2014-07-09 14:07:33 +08:00
CocosRobot ae12030745 [AUTO]: updating luabinding automatically 2014-07-09 05:42:06 +00:00
yangxiao 0c28106b48 init playreverse 2014-07-09 09:59:18 +08:00
yangxiao 7b35f36ba3 Merge branch 'newcode' into v3 2014-07-09 09:56:23 +08:00
yangxiao 90b6841e25 adjust api according feedback 2014-07-09 09:53:15 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
minggo 0f7968de89 Merge pull request #7339 from super626/v3 
fix android, add 3d files to cocos2d.h and remove unused resources
 2014-07-08 22:09:50 +08:00
minggo f7af8938bd Merge pull request #7277 from darkdukey/fix_rotation3D 
Fix setRotation3D
 2014-07-08 22:05:27 +08:00
minggo eba1735d04 Merge pull request #7347 from Dhilan007/v3-memory-leak 
fixed memory leak cause by singleton.
 2014-07-08 21:13:56 +08:00
minggo c2474ea7c0 Merge pull request #7262 from pandamicro/origin_v3 
Indicate correct button and cursor position infomation in mouse move event
 2014-07-08 21:07:09 +08:00
minggo 36ef5dd3e8 Merge pull request #7346 from CocosRobot/update_lua_bindings_1404813827 
[AUTO]: updating luabinding automatically
 2014-07-08 20:19:22 +08:00
minggo 4f42df3cea Merge pull request #7336 from andyque/addMoreUITests 
fix opacity issue when replace Widget textures
 2014-07-08 20:15:21 +08:00
pandamicro d597a535c1 Refactor #5580: Make isDirectoryExist support relative path 2014-07-08 18:26:11 +08:00
Dhilan007 10defddc2e fixed memory leak cause by singleton. 2014-07-08 18:22:48 +08:00
CocosRobot 5838370b31 [AUTO]: updating luabinding automatically 2014-07-08 10:05:47 +00:00
minggo 2398f6b8f0 Merge pull request #7341 from samuele3hu/v3_3 
Fix some type conversion error and add manual lua binding for Node::enumerateChildren
 2014-07-08 18:00:23 +08:00
Frank.Xu 5db9fa6e4b Add getChildByName method for get a node that can be cast to Type T 2014-07-08 15:58:34 +08:00
yangxiao ae97d6ebc6 Bone conflict 2014-07-08 15:48:55 +08:00
minggo 5ec2f76a68 Merge pull request #7340 from Dhilan007/v3-opacity-issue 
fixed opacity issue in SpriteBatchNode.
 2014-07-08 15:29:48 +08:00
minggo 0e5e2cbe5e Merge pull request #7338 from Dhilan007/v3 
fixed duplicate definition.
 2014-07-08 15:29:02 +08:00
samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
 2014-07-08 14:57:19 +08:00
samuele3hu f7c8674584 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3 2014-07-08 14:25:10 +08:00
samuele3hu 7095298735 Add manual lua binding for Node::enumerateChildren 2014-07-08 14:22:05 +08:00
Dhilan007 e31abe3f54 fixed opacity issue in SpriteBatchNode. 2014-07-08 14:08:53 +08:00
minggo 2d20b282a4 Merge pull request #7334 from dabingnn/v3_rollBackTexture 
change the logic of texture loading
 2014-07-08 13:52:16 +08:00
yangxiao e9d3bc1b76 remove unused code 2014-07-08 13:36:22 +08:00
Dhilan007 7d924d2b64 fixed duplicate definition. 2014-07-08 12:50:47 +08:00
lvlong 6de3309f90 have two GL_UNSIGNED_INT delete one 2014-07-08 20:13:57 +08:00
samuele3hu c59ba7851e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3 2014-07-08 12:03:04 +08:00
samuele3hu a1615123a3 Fix some type conversion error 2014-07-08 12:01:35 +08:00
andyque 2a2184331e fix opacity issue when replace Widget textures 2014-07-08 11:30:27 +08:00
yangxiao b19ca902ce Merge branch 'newcode' into v3 2014-07-08 11:19:26 +08:00
yangxiao 61f4a4d6b3 add 3d file to cocos2d.h 2014-07-08 11:02:29 +08:00
yangxiao 8b482fdfcd remove gl_fixed 2014-07-08 11:02:00 +08:00
minggo b0d260d293 Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9 
Fix UITextField IME can't auto detach
 2014-07-08 10:56:16 +08:00
minggo 4ef666ef8b Merge pull request #7335 from Dhilan007/v3-labelttf-color 
fixed can's set color for LabelTTF correctly on IOS.
 2014-07-08 10:54:40 +08:00
Dhilan007 6e2caf1c78 fixed can's set color for LabelTTF correctly on IOS. 2014-07-08 10:31:14 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Huabing.Xu 9fb85e303f change the logic of texture loading 2014-07-08 10:08:02 +08:00
Dale Stammen 021ee7d1e7 check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
XiaoYang b0f5ce36ff Merge pull request #48 from lvlonggame/v3 
delete the cube model file and modify 3DBundle
 2014-07-07 21:51:10 +08:00
minggo e1b29a8ef6 Merge pull request #7329 from Dhilan007/v3-gc-refactor 
issue #4689:Fixed lose disconnected event and incorrect device name/id.
 2014-07-07 18:45:23 +08:00
Dhilan007 bbf0fead91 update API annotation. 2014-07-07 18:25:53 +08:00
minggo 38e74e7881 Merge pull request #7328 from dabingnn/v3_rollBackTexture 
roll back initWithImage logic
 2014-07-07 17:50:20 +08:00
Dhilan007 d1034fdaae 1.fixed lose disconnected event. 
2.fixed incorrect device name and device id;
 2014-07-07 17:47:07 +08:00
Huabing.Xu d935b5db38 roll back initWithImage logic 2014-07-07 17:35:05 +08:00
minggo 3f262568a2 [ci skip: update version] 2014-07-07 17:24:14 +08:00
lvlong e315ef527a parseGLType bug 2014-07-07 17:22:46 +08:00
lvlong a48d33ce31 Merge branch 'newcode' into v3 2014-07-07 17:06:37 +08:00
minggo cd77690032 Merge pull request #7326 from Dhilan007/v3-gc-refactor 
issue #4689: support external key.
 2014-07-07 17:04:27 +08:00
andyque 037a7dc882 fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
andyque 0483c64286 fix widget ignoreContentSize issue 2014-07-07 15:21:14 +08:00
Dhilan007 ddfe82ae08 Replace log with CCLOG 2014-07-07 15:04:29 +08:00
Dhilan007 68bd717ea7 issue #4689: support external key. 2014-07-07 12:06:24 +08:00
lvlong 0a9e96bfdf modify Bundle3D::parseGLType add other type 2014-07-07 09:16:08 +08:00
minggo 2d504dcc9b Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig 
Remove redundant comment in ccConfig.h
 2014-07-06 21:09:39 +08:00
CocosRobot 4c1da7d89a [AUTO]: updating luabinding automatically 2014-07-06 13:05:59 +00:00
mannewalis f238593bfb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x: (78 commits)
  fix ui::Helper::seekWigetByName can not find pages in pageview
  [AUTO][ci skip]: updating cocos2dx_files.json
  add const for getter. fixed redefinition of 'registerListeners'
  Update CCController-android.cpp
  fixed missing function
  issue #4689: Refactoring game controller API[ios]
  Add resources
  version1.2
  Remove useless codes
  Refactoring game controller API
  should not include android cpp files in win/wp project
  Remove useless codes
  Remove useless codes
  Add Lua bindings for utils and CaptureScreen test case
  revert Android.mk
  issue #4689: Refactor controller API.
  add setXXTEAKeyAndSign
  fix indent problems
  initialize member variable
  fix windows compile and running error
  ...
 2014-07-05 12:26:44 -07:00
yangxiao c7ad436d8a Merge branch 'newcode' into v3 2014-07-05 13:57:51 +08:00
minggo 9d6c5748dc Merge pull request #7320 from andyque/fixSeekFile 
fix ui::Helper::seekWigetByName can not find pages in pageview
 2014-07-05 13:44:35 +08:00
andyque 841efea783 fix ui::Helper::seekWigetByName can not find pages in pageview 2014-07-05 12:53:56 +08:00
minggo 9db0f36c33 Merge pull request #7313 from Dhilan007/v3-gc-refactor 
issue #4689: Refactoring game controller API.
 2014-07-05 01:05:48 +08:00
Dhilan007 2b3de76819 add const for getter. 
fixed redefinition of 'registerListeners'
 2014-07-04 23:07:48 +08:00
Dhilan007 e6c4bb454b Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass 2014-07-04 22:53:33 +08:00
LinWenhai 46435952f8 Update CCController-android.cpp 2014-07-04 21:31:10 +08:00
Dhilan007 eee26b5029 fixed missing function 2014-07-04 21:29:30 +08:00
LinWenhai 2ca5c01902 issue #4689: Refactoring game controller API[ios] 2014-07-04 21:24:32 +08:00
minggo a942aae84f Merge pull request #7316 from cocoscodeide/v3 
lua runtime template 1.2
 2014-07-04 18:33:36 +08:00
minggo b710dc590b Merge pull request #7315 from samuele3hu/v3_animation3D 
Add Lua bindings for utils and CaptureScreen test case
 2014-07-04 17:58:18 +08:00
yangxiao 4304d740b4 delete call back 2014-07-04 17:22:39 +08:00
LinWenhai 3fb02acbde Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor 2014-07-04 17:03:48 +08:00
Dhilan007 6d48cd9523 Refactoring game controller API 2014-07-04 17:01:41 +08:00
minggo 83b7dccdfc Merge pull request #7314 from joshuastray/fix_win_proj 
should not include android cpp files in win/wp project
 2014-07-04 16:51:27 +08:00
joshuastray 8ab8caf751 should not include android cpp files in win/wp project 2014-07-04 16:44:10 +08:00
samuele3hu 4725388646 Remove useless codes 2014-07-04 16:43:33 +08:00
yangxiao e2a49ca9c4 Merge branch 'newcode' into v3 2014-07-04 16:36:38 +08:00
samuele3hu 3b23b0c1ff Remove useless codes 2014-07-04 16:30:22 +08:00
samuele3hu d9ffa33601 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D 2014-07-04 16:25:53 +08:00
samuele3hu 85dd2e55bf Add Lua bindings for utils and CaptureScreen test case 2014-07-04 16:24:00 +08:00
yangxiao 0af286c3be fix android background to foreground 2014-07-04 16:10:43 +08:00
chuanweizhang2013 39b03de8a9 revert Android.mk 2014-07-04 15:39:07 +08:00
LinWenhai 992245e744 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor 2014-07-04 15:29:40 +08:00
Dhilan007 552a9251c4 issue #4689: Refactor controller API. 2014-07-04 15:22:53 +08:00
minggo 8b00e72f33 Merge pull request #7311 from andyque/fixWindowsError 
fix windows compile and running error
 2014-07-04 13:44:55 +08:00
chuanweizhang2013 e32eadc364 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-07-04 13:36:51 +08:00
andyque c8165bb2d9 fix indent problems 2014-07-04 11:53:06 +08:00
andyque a429182765 fix windows compile and running error 2014-07-04 11:22:36 +08:00
yangxiao d2cd2449d8 adjust code 2014-07-04 10:42:02 +08:00
minggo 95fe74a34b Merge pull request #7299 from dabingnn/fast_tmx 
Fast tmx
 2014-07-04 09:49:30 +08:00
yangxiao 05d20d59d4 change position attributes to vec3 2014-07-04 09:25:06 +08:00
mannewalis 4b1f2ccc91 prefixing ivars 2014-07-03 10:16:10 -07:00
mannewalis 96605f801c prefixing ivars 2014-07-03 10:13:46 -07:00
mannewalis 69341095fe adding accessors to the on*Callback variables 2014-07-03 09:13:52 -07:00
mannewalis 92e08265cd changes needed for swift bindings to work 2014-07-03 08:42:06 -07:00
minggo eb97b9ad45 Merge pull request #7305 from andyque/fixLayoutReader 
fix layout background image default color & opacity
 2014-07-03 17:16:56 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
Pisces000221 1596848979 Also cascade the colours 2014-07-03 14:08:00 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00