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

6684 Commits

Author SHA1 Message Date
Dale Stammen 209f67f222 fixed property sheet 2014-09-26 11:01:43 -07:00
Dale Stammen f24312bc77 added UNICODE 2014-09-26 11:01:05 -07:00
CocosRobot 021d21a2a7 [AUTO]: updating luabinding automatically 2014-09-26 15:37:17 +00:00
minggo 99064b091f Merge pull request #8164 from super626/v3 
move logic about camera from Director to scene
 2014-09-26 23:29:58 +08:00
lite3 da361810a3 fix compile error when CC_SPRITE_DEBUG_DRAW 2014-09-26 17:14:55 +08:00
yangxiao abd960725a add to linux project 2014-09-26 16:54:01 +08:00
yangxiao c335df1071 fix normal flag check error 2014-09-26 16:46:15 +08:00
samuele3hu 2ac96ed06e Fix the lua-tests compile error and some bugs in the NewAudioEngineTest and update cocos2dx_audioengine.ini to support macro_judgement 2014-09-26 16:39:54 +08:00
Huabing.Xu d7a5c464dd remove test code 2014-09-26 16:37:05 +08:00
Huabing.Xu 7cfcdc1af8 fix egl config chooser bug 2014-09-26 16:23:54 +08:00
huanghsiwu 7a2a44ad88 Enable screen orientation change handling - by Teivaz 2014-09-26 16:16:34 +08:00
samuele3hu 691074eb7c Add Camra3DTest and update sprite3DTest 2014-09-26 16:00:57 +08:00
yangxiao 11a7bf8697 ligthmask to unsigned int 2014-09-26 15:52:04 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao db2ff49f26 adjust according to minggo 2014-09-26 14:13:26 +08:00
CocosRobot 963c02eb3d [AUTO]: updating luabinding automatically 2014-09-26 05:45:33 +00:00
minggo 7d33aef5cb Merge pull request #8156 from samuele3hu/v3_check_lua 
Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector
 2014-09-26 11:49:09 +08:00
Hong Liang 9448345de3 bugfix for UI animation playing crash if GUI JSON file is loaded again. 2014-09-26 11:29:48 +08:00
minggo bd56a71b1b CC_USE_MEM_LEAK_DETECTION -> CC_REF_LEAK_DETECTION 2014-09-26 10:44:29 +08:00
yangxiao 6626655308 move render logic from Director to scene 2014-09-26 09:36:43 +08:00
yangxiao e2f1b91117 remove unused variable 2014-09-25 22:25:43 +08:00
yangxiao 90523fc3d5 fix light check 2014-09-25 22:24:47 +08:00
yangxiao 02489ecad6 add light to cocos2d.h 2014-09-25 22:18:50 +08:00
yangxiao ca9eb3d203 support ambient light without normal & optimaze code 2014-09-25 18:32:33 +08:00
minggo 615b367277 Merge pull request #8158 from dabingnn/v3_neon 
V3 neon
 2014-09-25 18:02:46 +08:00
yangxiao 8f3f37c2bb auto switch shader according to light status 2014-09-25 17:13:46 +08:00
Huabing.Xu af0c9ce2fa reverse target=android-10 on android 2014-09-25 16:54:33 +08:00
yangxiao 2317720fd2 move uniformnames to cpp 2014-09-25 16:18:55 +08:00
Huabing.Xu ed9848a782 neon works on android(only on armeabi-v7a) 2014-09-25 16:09:28 +08:00
yangxiao eab0951c2d reset 2014-09-25 16:07:57 +08:00
yangxiao 567c632d98 config max support light number in shader 2014-09-25 15:29:32 +08:00
samuele3hu 38530772ae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 15:26:03 +08:00
samuele3hu 3e5638fe91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_lua 2014-09-25 15:17:55 +08:00
samuele3hu 23fb2062c9 Fix the bug that passing the wrong stack index to luaval_to_ccvaluemap and luaval_to_ccvaluevector 2014-09-25 15:05:42 +08:00
CocosRobot 7192681618 [AUTO]: updating luabinding automatically 2014-09-25 06:50:06 +00:00
minggo 9509f4cf9a Merge pull request #8139 from tttreal/label-getStringNumLines-bugfix 
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
 2014-09-25 14:44:28 +08:00
minggo d491d9e6db Merge pull request #8149 from andyque/fixIOS8EditBox 
fix ios8 EditBox orientation problem
 2014-09-25 13:47:23 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
minggo 9510d6d946 Merge pull request #8136 from andyque/moveWinEditBox 
remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp
 2014-09-25 13:38:19 +08:00
andyque 34fbca9c50 fix ios8 EditBox orientation problem 2014-09-25 11:46:42 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
Huabing.Xu ab19c81371 add neon64 implementation 2014-09-25 10:53:44 +08:00
Huabing.Xu a897f23023 refactor neon code 2014-09-25 10:46:25 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
minggo 6a437d79b1 Merge pull request #8138 from MSOpenTech/wp8-v3.3 
WP8 v3.3 bug fixes
 2014-09-25 10:39:37 +08:00
minggo 04aa44aeea Merge pull request #8141 from huangshiwu/v3_wp8test 
fix Class TextFieldTTF's keyboard input bug on WP8 platform
 2014-09-25 09:40:10 +08:00
huanghsiwu 49f1927d5d fix Class TextFieldTTF's keyboard input bug on WP8 platform 2014-09-25 07:41:51 +08:00
toma d1faf75b58 [CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty 2014-09-25 01:46:17 +09:00
andyque 3c434ec354 remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp 2014-09-24 17:47:38 +08:00
Huabing.Xu cc39ed288a android can link with neon(neon code has some bugs) 2014-09-24 17:21:38 +08:00
andyque 53d28168fe remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32 2014-09-24 16:39:32 +08:00
Huabing.Xu 2a75b7192a enable neon on IOS and refactor code 2014-09-24 16:12:47 +08:00
yestein b19b2c5786 replace tab to 4 spaces 2014-09-24 15:14:47 +08:00
minggo 79446999bb Merge pull request #8116 from Dhilan007/v3-labelfix 
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
 2014-09-24 15:03:40 +08:00
minggo dd3c295caa Merge pull request #8125 from cpascal/fix_invalid_windows_definition 
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
 2014-09-24 15:02:30 +08:00
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
yestein 72c5d77273 Add Cocostudio Armature getOffsetPoints API for Lua 2014-09-24 11:20:36 +08:00
Huabing.Xu e1d11ae5c3 move sse code to mathUtil.cpp 2014-09-24 11:06:07 +08:00
Huabing.Xu b18e0501fc move code to mathUtil.cp 2014-09-24 10:32:29 +08:00
Sergey Perepelitsa 0a46a83794 fix missing includes 2014-09-23 23:19:25 +04:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dale Stammen 2226aa5c8a need to reset the accelerometer before trying to enable it again 2014-09-23 10:01:42 -07:00
Huabing.Xu e74b2f3164 add macro to enable neon on IOS 2014-09-23 18:15:26 +08:00
songchengjiang d956148a94 Tab Format 2014-09-23 17:19:27 +08:00
songchengjiang b51dc584d5 Light optimization 2014-09-23 17:08:28 +08:00
cpascal a70f51b1e3 Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode 
I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32.

--
In the CCPlatformConfig.h,
the definitions are..

// win32
#if defined(WIN32) && defined(_WINDOWS)
#undef
CC_TARGET_PLATFORM
#define CC_TARGET_PLATFORM
CC_PLATFORM_WIN32
#endif
 2014-09-23 17:35:57 +09:00
minggo 34799958b5 Merge pull request #8101 from SunLightJuly/get_cascade_bounding_box 
added utils::getCascadeBoundingBox()
 2014-09-23 11:13:09 +08:00
Dmitry Bushtets d242d79443 * added default value for _batchNode in CCSprite 2014-09-22 19:00:21 +03:00
Guy Kogus 6e91c65e74 Windows Phone 8 can now open URLs. 2014-09-22 17:47:38 +04:00
Guy Kogus a9a0ff35f6 Added method for converting from std::string to Platform::String. 2014-09-22 17:47:38 +04:00
Sergey 2255cf91ba openUrl function for all platform but on windows RT empty function 2014-09-22 17:47:38 +04:00
songchengjiang 216c40fe9e Modified Light Shader 2014-09-22 18:08:58 +08:00
Dhilan007 ac916c3027 Cocos2d-x used a deprecated method to get the content size of a CCLabelTTF on iOS 7. 2014-09-22 18:01:13 +08:00
Dhilan007 c37371a543 fix noise on mac 2014-09-22 16:59:24 +08:00
Dhilan007 077ffb2b43 update lua binding 2014-09-22 15:54:35 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
yangxiao 61def04ca6 add light mask 2014-09-22 11:14:30 +08:00
minggo 533a454914 Merge pull request #8113 from huangshiwu/v3_wp8test 
fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp
 2014-09-22 09:54:39 +08:00
huanghsiwu 41b4ba8307 fix v3.3beta wp8 compile error --rename viriable in CCFileUtils.cpp 2014-09-22 09:42:33 +08:00
minggo 3f7fc6ead1 Merge pull request #8111 from joewan/v3 
fix compile on ubuntu.
 2014-09-22 09:38:52 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
joewanchen 3f2895beab fix compile on ubuntu. 2014-09-21 23:49:43 +08:00
minggo c2bac086a7 [ci skip]update version info 2014-09-19 21:54:01 +08:00
minggo 6569f1a7f0 Merge pull request #8108 from huangshiwu/v3_wp8test 
fix wp8 directory control bug
 2014-09-19 16:57:02 +08:00
huanghsiwu f73f1a5379 fix wp8 directory control bug --modify 2014-09-19 16:52:11 +08:00
minggo 653986a3a2 Merge pull request #8106 from super626/v3 
add OBBs to OBB collision test by default, Fix 0.1 version static model load bug and remove unused resource
 2014-09-19 16:16:33 +08:00
huanghsiwu d42cec0708 fix wp8 directory control bug 2014-09-19 15:54:18 +08:00
yangxiao 5b61e569f5 light mask 2014-09-19 14:50:20 +08:00
XiaoYang d1328cfb41 Merge pull request #132 from lvlonggame/v3 
Deal read string length problem!
 2014-09-19 14:47:59 +08:00
lvlong eb89efe510 deal the length problem! 2014-09-19 14:30:02 +08:00
yangxiao dd3a312eeb Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-09-19 11:24:47 +08:00
yangxiao c4d25d318f light config 2014-09-19 11:11:23 +08:00
songchengjiang f052e45c04 Move Light Uniforms into Meshcommand 2014-09-19 10:54:07 +08:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
Jeff e4e2cea97a link error 2014-09-18 19:59:22 +08:00
Jeff 476ede6ccb link error 2014-09-18 19:56:53 +08:00
songchengjiang 62777e9552 compile Android 2014-09-18 18:35:18 +08:00
songchengjiang b9ceccda74 Format 2014-09-18 18:07:20 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
Jeff 6152b70945 LE 2014-09-18 16:33:46 +08:00
minggo 7c8e1c9de5 Merge pull request #8099 from super626/billboard 
Transparent Queue adjustment
 2014-09-18 16:07:54 +08:00
minggo d6e086d4dd Merge pull request #8098 from CocosRobot/update_lua_bindings_1411009391 
[AUTO]: updating luabinding automatically
 2014-09-18 16:06:52 +08:00
Jeff 0ee4ee03c1 CE 2014-09-18 16:00:18 +08:00
SunLightJuly f9fbb1b789 call getCascadeBoundingBox() properly 2014-09-18 15:40:28 +08:00
SunLightJuly 855d8d7a72 moved getCascadeBoundingBox() to utils 2014-09-18 15:27:11 +08:00
Huabing.Xu cf4d0faad3 optimise update of particle system for free mode 2014-09-18 15:24:27 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
SunLightJuly 1af68e9274 replaced "NULL" with "nullptr" 2014-09-18 14:30:21 +08:00
Jeff ac6b83f8f9 fix compile error 2014-09-18 14:22:40 +08:00
Jeff c5cc16336a fix compile error 2014-09-18 14:04:54 +08:00
SunLightJuly ff776d813b added Node::getCascadeBoundingBox() 2014-09-18 13:11:10 +08:00
yangxiao 720264fb98 add comment 2014-09-18 12:04:42 +08:00
yangxiao 25091ca849 add transparent flag to render command 2014-09-18 12:00:44 +08:00
Jeff b9ec99d7f4 compile error & code spelling error 
1.fix compile error on win32
2.modify spelling error
 2014-09-18 11:52:23 +08:00
CocosRobot 7920ff425b [AUTO]: updating luabinding automatically 2014-09-18 03:05:04 +00:00
minggo 5e5129d0d1 Merge pull request #8085 from super626/v3 
Shared GLProgramState by default and Fix BillBoard Anchor Point
 2014-09-18 10:52:35 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
Steve Kanter 05f0f71cc5 Update CCDevice-ios.mm 
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
 2014-09-17 14:52:30 -04:00
Jeff ed530454b2 fix compile error 2014-09-18 02:11:20 +08:00
Jeff 1dffbd0a7b fix link errors 2014-09-18 01:52:08 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff 08e8963b1a fix compile errors 2014-09-18 00:04:48 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
yangxiao 8c77130ae0 refactor light compile 2014-09-17 18:58:35 +08:00
Huabing.Xu 3a0e9be97e new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
yangxiao 34f642377e fix billboard anchor point 2014-09-17 18:01:18 +08:00
yangxiao 41caef878b refactor light 2014-09-17 17:59:10 +08:00
minggo ccbf694927 Merge pull request #8086 from huangshiwu/v3_test 
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
 2014-09-17 14:50:42 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
huangshiwu c8bdba69ad fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView 2014-09-17 14:00:40 +08:00
yangxiao 18717cfc86 Merge branch 'newcode' into v3 2014-09-17 13:44:28 +08:00
yangxiao c5f6f8de5b share glprogramstate 2014-09-17 13:42:08 +08:00
minggo 6a7cfc812a Merge pull request #8083 from CocosRobot/update_lua_bindings_1410924831 
[AUTO]: updating luabinding automatically
 2014-09-17 11:42:44 +08:00
CocosRobot 9b5d47c61e [AUTO]: updating luabinding automatically 2014-09-17 03:35:46 +00:00
minggo 38810eeb2e Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices 
change indices to short for fast tmx
 2014-09-17 11:31:58 +08:00
minggo 32ed437e6d Merge pull request #8081 from andyque/addInterfaceToUI 
add getTitleRenderer interface to UIButton
 2014-09-17 11:31:16 +08:00
Huabing.Xu 725d107ae5 change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
minggo 38259bd311 Merge pull request #8075 from dabingnn/v3_FixVertsAndDrawCallsForPrimitiveCommand 
add draw calls and draw verts for PrimitiveCommand
 2014-09-17 11:04:43 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
Huabing.Xu 34e3e23af5 Fix compile error 2014-09-17 10:35:42 +08:00
minggo 77371a025d Merge pull request #8062 from zhongfq/v3 
optimize decompress jpg data
 2014-09-17 10:22:57 +08:00
Eric Zhong ae5f6e63e5 optimize decompress jpg data and fix warnings 2014-09-16 21:55:05 +08:00
CocosRobot b37659a448 [AUTO]: updating luabinding automatically 2014-09-16 09:16:17 +00:00
minggo da29b92ff4 Merge pull request #8072 from Dhilan007/v3-audio903 
move AudioEngine to cocos2d:experimental namespace
 2014-09-16 17:12:03 +08:00
Dhilan007 369c14ed49 fix compile error 2014-09-16 14:57:58 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
Huabing.Xu f702b4e9b3 add draw calls and draw verts for PrimitiveCommand 2014-09-16 12:04:35 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00
minggo afd1271078 Merge pull request #8071 from huangshiwu/v3_wp8test 
fix wp8 and winrt compile error --add chipmunk static lib
 2014-09-16 10:07:50 +08:00
huangshiwu d0d3e185ce fix wp8 and winrt compile error --add chipmunk static lib 2014-09-16 10:03:00 +08:00
CocosRobot 526c28bea9 [AUTO]: updating luabinding automatically 2014-09-15 15:21:18 +00:00
Eric Zhong 8de3657f3c optimize decompress jpg data 
it may be unnecessary copy jpg bytes one by one when decompress jpg data
 2014-09-15 23:15:01 +08:00
minggo 9a29ab2113 Merge pull request #8058 from andyque/fixWebView 
improve webview coding style
 2014-09-15 22:49:53 +08:00
andyque af3dd215cb improve android web view 2014-09-15 18:14:04 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
andyque 126ec18a89 add video player debug draw config 2014-09-15 17:59:51 +08:00
Dhilan007 39a8b8d5ea Fix a potential crash in AudioEngine on Android. 2014-09-15 17:36:00 +08:00
andyque 71b6be678e fix header guard 2014-09-15 16:56:51 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work 
isPopupNotify() doesn't work
 2014-09-15 14:06:04 +08:00
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903 
Lua bindings of AudioEngine.
 2014-09-15 13:43:27 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
minggo cc221e5e16 Merge pull request #8036 from CocosRobot/update_lua_bindings_1410745737 
[AUTO]: updating luabinding automatically
 2014-09-15 09:56:20 +08:00
CocosRobot 8c7eb81271 [AUTO]: updating luabinding automatically 2014-09-15 01:50:32 +00:00
minggo df78ec90f1 Merge pull request #8032 from joewan/v3-fix-leak 
fix memory leak when use menu_selector.
 2014-09-15 09:50:05 +08:00
minggo 70f922d07a Merge pull request #8030 from andyque/fixButtonScaleIssue 
fix button scale issue
 2014-09-15 09:49:06 +08:00
minggo 6bcab3b05d Merge pull request #7920 from rny/audio_win32 
win32 can not stop looping sound effect
 2014-09-15 09:37:11 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding 
fix Editbox lua binding
 2014-09-15 09:36:36 +08:00
minggo 8b1e928741 Merge pull request #8026 from super626/v3 
Transparent Mesh support
 2014-09-15 09:36:17 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
Dhilan007 51c19d4b06 update project for lua bindings of AudioEngine 2014-09-14 23:17:39 +08:00
Dhilan007 cf2a60898f Lua bindings of AudioEngine. 2014-09-14 22:54:04 +08:00
Dhilan007 f6992b94de fix crash in AudioEngine 2014-09-14 22:48:41 +08:00
joewan 93fdcf1f04 fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
Keisuke Kobayashi c4d2c5eaed Rename setSSLVerification 2014-09-14 00:28:11 +09:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
Keisuke Kobayashi 6b0879fe93 HttpClient SSL verification 2014-09-13 20:37:36 +09:00
yangxiao 2e0e4e58c8 support transparent object 2014-09-12 17:57:54 +08:00
minggo 0f42d9bbd8 Merge pull request #8022 from Dhilan007/v3-labelfix 
Label:It may display incorrectly with outline feature enabled.
 2014-09-12 17:54:02 +08:00
yangxiao df5da80439 Merge branch 'newcode' into v3 2014-09-12 17:43:05 +08:00
minggo 34a015895d Merge pull request #8020 from dabingnn/v3_MaterialIDBug 
fix bug for MeshCommand materialID generation
 2014-09-12 17:15:49 +08:00
andyque 02d2282b83 add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox 2014-09-12 17:07:06 +08:00
andyque d4b2e8d154 remove deprecated warning 2014-09-12 17:06:13 +08:00
CocosRobot 29f9cbfd6a [AUTO]: updating luabinding automatically 2014-09-12 08:15:54 +00:00
Dhilan007 23f1b740bf Label:It may display incorrectly with outline feature enabled. 2014-09-12 16:03:01 +08:00
Huabing.Xu 1571367042 fix bug for MeshCommand materialID generation 2014-09-12 15:43:10 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
minggo cecdab4d62 Merge pull request #8015 from andyque/fixButtonIssue 
Fix text only button can't be touched issue
 2014-09-12 15:06:33 +08:00
huangshiwu 11d8829b3a Deprecate DrawPrimitives and enhance DrawNode --little modify 2014-09-12 14:50:41 +08:00
andyque 294271682b change return const value to value 2014-09-12 14:39:22 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
huangshiwu 6182a872c6 Deprecate DrawPrimitives and enhance DrawNode --more modify 2014-09-12 11:12:20 +08:00
yangxiao 9eb62ed1f6 Merge branch 'newcode' into v3 2014-09-12 10:00:13 +08:00
huangshiwu 147bb7301b fix wp8 compile error --add BillBoard and BillBoardTest 2014-09-12 09:33:30 +08:00
Ricardo Quesada 525fecc4ce even more cmake fixes 2014-09-11 17:36:49 -07:00
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu 8d8f4436db Deprecate DrawPrimitives and enhance DrawNode --fix android compile error 2014-09-11 17:55:47 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
yangxiao 75b46e9a09 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-11 16:06:00 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +08:00
yangxiao df9ab144fe light work 2014-09-11 15:46:32 +08:00
andyque 67ad24e7c1 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
minggo e0df8114fa Merge pull request #7968 from Dhilan007/v3-audio903 
New Audio Engine[ios/android]
 2014-09-11 15:23:17 +08:00
CocosRobot 434d4fbfdd [AUTO]: updating luabinding automatically 2014-09-11 07:11:40 +00:00
minggo 138d419505 Merge pull request #8005 from andyque/fixWin32CompileError 
fix compile error
 2014-09-11 15:01:10 +08:00
minggo a5855baac4 Merge pull request #7976 from samuele3hu/v3_check_mat 
Added Math SSE implementation on x86 and update bindings-generator submodule
 2014-09-11 14:47:39 +08:00
andyque 1945c4f31e fix compile error 2014-09-11 14:45:55 +08:00
yangxiao e849b997ed modify interface 2014-09-11 12:05:49 +08:00
Dhilan007 518fd7ab6f Optimized seek for large file and log output on IOS. 2014-09-11 10:53:01 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao 33cabb553a add transparent property 2014-09-11 09:15:24 +08:00
Ricardo Quesada e46fa14be9 Fixes Xcode 6 warnings 2014-09-10 12:01:35 -07:00
Ricardo Quesada 11dcc37d4d Fixes cmakefile for mac 2014-09-10 09:51:56 -07:00
yangxiao 55fdcf3629 fix linux 2014-09-10 21:57:37 +08:00
Dhilan007 26142e1300 fix compile error on android. 2014-09-10 17:49:26 +08:00
Dhilan007 1d43c6ec82 Fix name of variables and coding style. 2014-09-10 17:12:46 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-09-10 14:35:33 +08:00
Dhilan007 e588b371bd Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
minggo f032286787 Merge pull request #7961 from andyque/addChipmunkStaticLib 
Add chipmunk static lib
 2014-09-10 14:05:10 +08:00
andyque 8aea6330a5 modify linux cmakelist 2014-09-09 22:59:55 -07:00
Dhilan007 e45a4ff1bd 1.Fix name of variables. 
2.Fix control of volume on android.
 2014-09-10 13:47:17 +08:00
andyque 499d828179 add chipmunk static library for linux 2014-09-10 10:58:20 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
CocosRobot 0e49107514 [AUTO]: updating luabinding automatically 2014-09-10 01:52:43 +00:00
Ricardo Quesada f5cd48f154 Android properties back to 10 2014-09-09 18:46:47 -07:00
Ricardo Quesada d5a6289a9b compiles on wp8 2014-09-09 18:22:11 -07:00
Ricardo Quesada 6b4323642a compiles on winphone8 2014-09-09 18:15:16 -07:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
Ricardo Quesada fdabaa3082 Compiles on Android 2014-09-09 17:53:08 -07:00
Ricardo Quesada 0972506bf5 compiles and runs on linux 2014-09-09 17:41:49 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 73450be715 compiles and runs in Linux 2014-09-09 17:11:06 -07:00
Ricardo Quesada f5e54f8e69 Fixes for linux compilation 2014-09-09 17:01:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
samuele3hu 8c0f8e1eb6 Reset marco limited to `#ifdef __SSE__` 2014-09-09 23:01:37 +08:00
giginet e9e9741a74 SceneReader sets contentSize by canvasSize. 
We could not get the canvas size of the scene which created on CocosStudio.

Thanks to this commit, we can get scene's canvas size by Node::getContentSize()

```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
int width = scene->getContentSize().width;
int height = scene->getContentSize().height;
cocos2d::log("canvasSize = %d, %d", width, height);
```
 2014-09-09 22:30:52 +09:00
samuele3hu 3151c54879 Update macro define limited 2014-09-09 19:08:01 +08:00
songchengjiang 4099015421 Sprite3D set default _contentSize by AABB 2014-09-09 17:47:34 +08:00
samuele3hu 40ace8f539 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_mat 2014-09-09 16:27:43 +08:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
CocosRobot ed8835d262 [AUTO]: updating luabinding automatically 2014-09-09 06:43:49 +00:00
minggo 1ee9cebebd Merge pull request #7925 from super626/transition 
Animation3D
 2014-09-09 14:39:15 +08:00
minggo 2ba6e73212 Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097 
[AUTO]: updating luabinding automatically
 2014-09-09 14:20:16 +08:00
minggo 162fb3ec18 Merge pull request #7967 from minggo/remove-_setLocalZOrder 
deprecated Node::_setZOrder()
 2014-09-09 14:20:00 +08:00
minggo 9373d096e8 Merge pull request #7969 from andyque/fixUI 
deprecated ui::TextField getStringValue and setText, use getString and
 2014-09-09 14:18:07 +08:00
liuliang be72d5730c Modify the environment configuration 2014-09-09 14:03:27 +08:00
andyque 83e14259ad deprecated ui::TextField getStringValue and setText, use getString and 
setString instead
 2014-09-09 13:59:35 +08:00
samuele3hu cd478a3c0d Merge branch 'cocos2d-v3' of https://github.com/sunzhuoshi/cocos2d-x into v3_check_mat 2014-09-09 13:45:29 +08:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +08:00
yangxiao b88c462c8f remove Sequence3D 2014-09-09 11:34:17 +08:00
minggo 905c429ff5 remove unneeded code 2014-09-09 10:58:07 +08:00
minggo 31c508ef6d deprecated Node::_setZOrder() 2014-09-09 10:55:27 +08:00
CocosRobot a2dcb71a24 [AUTO]: updating luabinding automatically 2014-09-09 02:53:20 +00:00
minggo 6b99ce6ec0 Merge pull request #7939 from minggo/remove-_setLocalZOrder 
remove Node::_setLocalZOrder()
 2014-09-09 10:49:09 +08:00
yangxiao a295159a3a Merge branch 'newcode' into transition 2014-09-09 10:37:08 +08:00
oleg-akatsuki 511ee30b6e Move constructor from private to public 
In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.
 2014-09-09 11:34:48 +09:00
Dhilan007 1b96b2ac87 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 2014-09-09 10:32:56 +08:00
CocosRobot af6b6bb7b9 [AUTO]: updating luabinding automatically 2014-09-09 02:32:49 +00:00
sunzhuoshi 66070868f7 Added Math SSE implementation on x86 2014-09-08 20:58:59 +08:00
Chuanren Wu 0b58ff7fce introduce substeps for accurate physics 2014-09-08 00:14:40 +02:00
andyque d6b96d1e46 add chipmunk to wp project 2014-09-06 13:28:00 +08:00
Ricardo Quesada 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
minggo 78d4e9797c Merge pull request #7955 from dabingnn/v3_reverse_VBOSIZE 
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
 2014-09-05 18:22:46 +08:00
Huabing.Xu 73b201b702 roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5 2014-09-05 16:01:17 +08:00
andyque 2a8601ee1f Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib 2014-09-05 15:43:59 +08:00
huangshiwu 01358f0b62 fix wp8 compile error and modify default resource path 2014-09-05 15:43:08 +08:00
samuele3hu f100dac9b8 Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create 2014-09-05 15:43:07 +08:00
andyque 08c7f32627 add chipmunk static library for win32 2014-09-05 15:38:12 +08:00
yangxiao 730ab846c3 code adjustment 2014-09-05 14:59:14 +08:00
Dhilan007 1d900940ab Refactoring API: 
1.Remove Singleton Pattern
2.Make AudioProfile clear.
 2014-09-05 14:34:30 +08:00
minggo 1bf6c79329 Merge pull request #7953 from samuele3hu/v3_check_newnon 
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
 2014-09-05 11:37:57 +08:00
minggo 0fc1baee65 Merge pull request #7954 from huangshiwu/v3_wp8fix_pr 
fix wp8 compile error and modify default resource path
 2014-09-05 11:36:32 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
Dhilan007 6b4b5ed943 Refactoring API: 
1.Remove Singleton Pattern
2.Make AudioProfile clear.
 2014-09-05 11:13:51 +08:00
samuele3hu 6209530e66 Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create 2014-09-05 09:39:43 +08:00
samuele3hu 8c2ab3a4e7 Add manual lua bindings for GLView::getAllTouches 2014-09-04 22:12:59 +08:00
samuele3hu 61d1b67116 Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon 2014-09-04 18:17:05 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
minggo 060dfd94f3 Merge pull request #7948 from super626/v3 
Bugs on creating user custom mesh
 2014-09-04 17:39:40 +08:00
yangxiao 88ec0392a0 remove unused method 2014-09-04 17:15:28 +08:00
yangxiao 31dc3301b3 add space line 2014-09-04 17:03:46 +08:00
yangxiao a5e1e692e8 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-04 17:00:49 +08:00
liuliang c42bef1f02 Add a bulletin board test example 2014-09-04 16:58:00 +08:00
yangxiao d114e11a0b android, linux and lua 2014-09-04 16:45:42 +08:00
yangxiao 226e60a3ee rename billboard 2014-09-04 16:26:36 +08:00
yangxiao 86d9ce381b rename billboard 2014-09-04 16:26:11 +08:00
yangxiao 08a1405bdc fix bug on custom mesh 2014-09-04 14:26:23 +08:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
minggo 659ba68199 Merge pull request #7942 from andyque/deleteRedundantCode 
remove dead code
 2014-09-04 13:45:12 +08:00
minggo cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
minggo 7b1be80eb8 Merge pull request #7192 from kezhuw/bugfix_http_client 
bugfix: condition variable sleep on unrelated mutex
 2014-09-04 13:34:33 +08:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
Huabing.Xu 6f03e97a6d add trianglesCommand head file to cocos2d 
remove invoking of base class constructor
 2014-09-04 11:20:43 +08:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00
andyque a1edd4a819 remove dead code 2014-09-04 11:00:48 +08:00
minggo 99f3b371ed Merge pull request #7744 from lite3/customguireader 
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
 2014-09-04 10:53:00 +08:00
andyque 3451672365 restore some configs 2014-09-04 10:49:45 +08:00
minggo 83719db8d4 Merge pull request #7934 from wohaaitinciu/loc_ver 
fix: win32 cpp-tests sometimes cannot display font correctly
 2014-09-04 10:49:30 +08:00
minggo 0d777bfa95 Merge pull request #7099 from newnon/v3_edit_box_fixes 
EditBox fixes & improvements
 2014-09-04 10:34:44 +08:00
minggo 139af3faa8 Merge pull request #7938 from super626/v3 
fix bundle
 2014-09-04 10:03:15 +08:00
Sergey 14853d46f2 setPlaceholderFontSize fix 2014-09-03 23:38:44 +04:00
Sergey 89ed897f47 getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
Kezhu Wang 925fb9aa38 bugfix: condition variable sleep on unrelated mutex 2014-09-03 23:56:54 +08:00
Dhilan007 d5c023740f Implement logical codes of new audio engine on android. 2014-09-03 18:19:47 +08:00
Dhilan007 fc9a0f9be9 Implement logical codes of new audio engine on IOS. 2014-09-03 18:19:21 +08:00
yangxiao 4e65d070a1 rename BillBoard Model 2014-09-03 18:19:12 +08:00
Dhilan007 ca652cefee New audio engine API[2d] 2014-09-03 18:18:47 +08:00
XiaoYang 58f4e84b9a Merge pull request #126 from songchengjiang/billboard 
Billboard
 2014-09-03 18:12:08 +08:00
songchengjiang 114de83a0b Added View_Oriented and View_Plane_Oriented Mode 2014-09-03 18:04:48 +08:00
andyque 87af0ecdd6 add back libbox2d and libspine project to our solution 2014-09-03 17:37:34 +08:00
minggo 5cca8cc87d remove Node::_setLocalZOrder() 2014-09-03 17:26:50 +08:00
songchengjiang 68ce6449e8 repaired camera orientation 
Testing RotateBy action
 2014-09-03 17:17:57 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
XiaoYang f03c4d4790 Merge pull request #125 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 15:59:49 +08:00
liuliang c167ed17ee Set the node name 2014-09-03 15:55:11 +08:00
yangxiao 1bd09f21d0 merge cocos 2014-09-03 15:42:58 +08:00
yangxiao 5a85cb405e fix billboard face 2014-09-03 15:28:15 +08:00
samuele3hu 45f08d54cb Fix the member name error in the `vec4_to_luaval ` 2014-09-03 15:07:31 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
XiaoYang 4e0c358a90 Merge pull request #124 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 13:12:33 +08:00
yangxiao adda886210 tmp work 2014-09-03 11:58:09 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
liuliang 278a3441ce Set the node name 2014-09-03 11:43:42 +08:00
Jeff ed849a1863 fix: win32 cpp-tests sometimes cannot display font correctly 
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
 2014-09-03 11:34:40 +08:00
CocosRobot ffb36d577e [AUTO]: updating luabinding automatically 2014-09-03 03:29:43 +00:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
minggo 9351caaa58 Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer 
fix transition scene stencil buffer
 2014-09-03 10:26:28 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
yangxiao 8dff467b27 Merge branch 'newcode' into transition 2014-09-03 09:15:12 +08:00
yangxiao fed2021707 Fixme: frustum culling 2014-09-03 09:02:32 +08:00
lite3 6ff1289aed fix compile error on Xcode 2014-09-02 20:26:21 +08:00
andyque aa929fe106 add chipmunk prebuilt lib for linux 2014-09-02 03:51:41 -07:00
andyque 3743f02c7e finish ios/mac/android 2014-09-05 11:39:11 +08:00
lvlong 387f190ff1 Merge newcode into v3 2014-09-02 17:52:02 +08:00
lvlong 27f771744a static model load problem of old version . 2014-09-02 17:33:22 +08:00
yangxiao f84c6a5d27 Merge branch 'newcode' into transition 2014-09-02 17:15:05 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
andyque a429959e65 fix lua compile error 2014-09-02 01:31:02 -07:00
andyque 51e160beff fix EditBox lua compile error 2014-09-02 17:37:55 +08:00
lite3 5d935c2cea fix compile error on android 2014-09-02 16:16:36 +08:00
andyque 8033b1f7bb Merge branch 'v3' into mergeExtensionEditBox 2014-09-02 00:03:16 -07:00
minggo 4749205b61 Merge pull request #7917 from super626/v3 
bundle code adjustment
 2014-09-02 14:58:53 +08:00
CocosRobot dc15287ac3 [AUTO]: updating luabinding automatically 2014-09-02 05:45:07 +00:00
songchengjiang 8a88ba6142 Tab Format 2014-09-02 11:50:09 +08:00
songchengjiang 045af3f7a3 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:24:38 +08:00
songchengjiang 18d06015c6 Added More Models 
Code optimization
 2014-09-02 11:24:19 +08:00
yangxiao de80d8c344 fix warning 2014-09-02 11:22:01 +08:00
andyque dffdef1118 fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
kaishiqi 8f11dd7f8b Update CCGLViewImpl.cpp 
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
 2014-09-02 11:13:30 +08:00
yangxiao 39e33cbf71 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-02 11:12:24 +08:00
yangxiao de3921c101 fix render stats bug 2014-09-02 11:12:15 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
yangxiao d542624bfd remove from map when release 2014-09-02 10:40:29 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
XiaoYang 2a0743e5a5 Merge pull request #121 from liuliang2004/transition 
Configure project file
 2014-09-01 17:58:22 +08:00
yangxiao 9ce30bdabd add to linux 2014-09-01 17:52:13 +08:00
liuliang c4242b4d0b Configure project file 2014-09-01 17:45:45 +08:00
andyque ffee7b27d4 fix linux and android compile error 2014-09-01 17:43:40 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
yangxiao 57a70b629f add sequence3d 2014-09-01 16:00:50 +08:00
yangxiao 33005bedcb add to cocos3d 2014-09-01 15:32:06 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00
yangxiao 97c8764ae7 remove unused header 2014-09-01 15:21:47 +08:00
Huabing.Xu 57dd8fd4e1 remove commented code 2014-09-01 15:19:02 +08:00
yangxiao 538fe2e543 Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00
yangxiao c24701ac79 Merge branch 'newcode' into v3 2014-09-01 15:11:27 +08:00
Huabing.Xu 6824453804 windows work for trianglesCommand 2014-09-01 15:08:09 +08:00
yangxiao b5a3bb1c03 sequence3d work 2014-09-01 15:07:06 +08:00
Ningyu 1df8d423d0 win32 can not stop looping sound effect 2014-09-01 15:03:57 +08:00
Huabing.Xu dad62ad6df Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/renderer/CCQuadCommand.h
 2014-09-01 14:27:19 +08:00
Huabing.Xu bfaef3574a android works for trianglesCommand 2014-09-01 13:57:33 +08:00
Huabing.Xu 06eb6c2425 put TrianglesCommand in a seperate file 2014-09-01 11:49:04 +08:00
minggo 840f311f5c Merge pull request #7916 from andyque/fixChipumnk 
remove chipmunk.h include in header file
 2014-09-01 11:38:12 +08:00
minggo bb85ecf0da Merge pull request #7913 from chuanweizhang2013/v3fixed 
make debug writable path the same as release
 2014-09-01 10:15:52 +08:00
yangxiao 49e6b098a6 check running scene when checkVisibility 2014-09-01 09:56:05 +08:00
songchengjiang 97f7d21f50 Format 2014-09-01 09:36:07 +08:00
yangxiao f3e017e139 normalize quat 2014-09-01 09:34:09 +08:00
songchengjiang 3f8b430b3e deleted Meshcommand 2014-09-01 09:33:08 +08:00
andyque ff321ba1dc fix chipmunk 2014-08-30 21:09:28 +08:00
lite3 6d462c5013 fix ccs.CustomGUIReader not in ccs table 2014-08-30 12:23:03 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
lite3 3872ee9b59 add CustomGUIReader for lua 2014-08-29 18:50:21 +08:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
yangxiao a039d6b0fc animate3d transition 2014-08-29 18:25:42 +08:00
songchengjiang 4aa4287d28 test on Android 2014-08-29 17:29:15 +08:00
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +08:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
minggo afaea360fd Merge pull request #7908 from dabingnn/v3_fix_bugs 
V3 fix bugs
 2014-08-29 16:45:52 +08:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
lite3 4a374a1a2a Merge branch 'v3' into customguireader 2014-08-29 16:36:42 +08:00
CocosRobot 3b3747d518 [AUTO]: updating luabinding automatically 2014-08-29 08:12:40 +00:00
Huabing.Xu 8e51377f2d fix primitive draw error 2014-08-29 16:00:04 +08:00
minggo 1dcdbca4e0 revert lua-bindings 2014-08-29 15:54:20 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo 58dd2f4a69 Merge pull request #7882 from andyque/addWebView 
add WebView
 2014-08-29 13:42:14 +08:00
songchengjiang 71d722854c added mesh command 2014-08-29 12:08:28 +08:00
lvlong 496aad2fe7 remove 0.3 branch logic 2014-08-29 11:59:30 +08:00
lvlong cbe61a4b73 modify log 2014-08-29 11:56:33 +08:00
andyque 4c046336da fix linux 2014-08-29 11:53:39 +08:00
andyque cf0baef7c0 add web view javascript support 2014-08-29 11:50:08 +08:00
andyque 043acb2fd4 rename webview to UIWebView 2014-08-29 11:28:28 +08:00
lvlong 15c945d89b Merge branch 'newcode' into v3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-29 11:04:15 +08:00
songchengjiang 43eb725c27 resolve conflict 2014-08-29 11:02:34 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
lvlong 5a1e0601a7 Code Standards 2014-08-29 10:43:26 +08:00
songchengjiang 96e6595e95 Added getInverseViewMatrix 2014-08-29 10:42:02 +08:00
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
yangxiao 18a0f34c5c Merge branch 'newcode' into billboard 2014-08-29 10:12:00 +08:00
Huabing.Xu 528f4b5c0c fix TextureAtlas drawNumberofQuads bug 2014-08-29 10:06:44 +08:00
minggo a125ed0453 Merge pull request #7906 from Teivaz/v3_WP8 
[WP8] Fixed project compilation.
 2014-08-29 10:03:25 +08:00
Huabing.Xu 7c870cfcc1 fix skew matrix bug 2014-08-29 09:50:26 +08:00
songchengjiang 06e3eb955f repaired BillBoard Depth Test 2014-08-29 09:30:59 +08:00
Ricardo Quesada 20d22a1c8a Users new `// MARK: ` feature to mark sections 
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
 2014-08-28 14:56:15 -07:00
songchengjiang e6f055f3fd calculated Z in View 
Transparent Render
 2014-08-28 19:22:01 +08:00
yangxiao a3dd4e101a animation transition 2014-08-28 18:53:15 +08:00
teivaz 1d08acac08 * [WP8] Fixed project compilation. Removed references to deleted source files 2014-08-28 13:47:14 +03:00
minggo 50a2cb2b86 remove unneeded includes 2014-08-28 17:32:23 +08:00
minggo 7baf873bf6 remove unneeded includes 2014-08-28 17:03:29 +08:00
CocosRobot ebe75e702a [AUTO]: updating luabinding automatically 2014-08-28 08:58:52 +00:00
lite3 2b6bdac05d Merge branch 'v3' into customguireader 2014-08-28 15:13:10 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 681c3c06f1 Merge pull request #7558 from newnon/v3_actions_by_tag_improvements 
stopAllActionsByTag && removeAllActionsByTag
 2014-08-28 14:24:37 +08:00
yangxiao 16ab05a8cf sequence3d 2014-08-28 13:47:17 +08:00
songchengjiang 7751762893 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-28 13:37:37 +08:00
yangxiao c5a152708d clear transparent queue 2014-08-28 13:35:32 +08:00
yangxiao fdcef01244 remove v_normal when no lights 2014-08-28 13:04:49 +08:00
lvlong a05d50d66e Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle 2014-08-28 12:02:33 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
minggo f0f1bf1b92 Merge pull request #7883 from giginet/set-node-name-via-ccs-scene 
Add the feature that CCSSceneReader can load name properties as node names.
 2014-08-28 11:14:15 +08:00
songchengjiang 6a2f4c635e Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-28 11:06:02 +08:00
Huabing.Xu 08006aa47a Merge branch 'v3' into v3_trianglesCommand 2014-08-28 10:56:38 +08:00
yangxiao 52b2b1d2cb transparent render queue 2014-08-28 10:53:57 +08:00
songchengjiang 014ba0d12e Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new 2014-08-28 10:17:32 +08:00
minggo 45b382cb1f Merge pull request #7898 from CocosRobot/update_lua_bindings_1409191992 
[AUTO]: updating luabinding automatically
 2014-08-28 10:17:26 +08:00
minggo d3ce2acff6 Merge pull request #7892 from Dhilan007/v3-androidmk 
Adjust android.mk for cocos2d and related module
 2014-08-28 10:16:39 +08:00
songchengjiang 5067741140 Deleted Plane Model 2014-08-28 10:16:15 +08:00
CocosRobot 31a9997922 [AUTO]: updating luabinding automatically 2014-08-28 02:15:00 +00:00
minggo b8447baf73 Merge pull request #7893 from slackmoehrle/glview_fix 
Glview fix
 2014-08-28 10:10:17 +08:00
Huabing.Xu bdf92cfbd4 Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched 2014-08-28 09:58:39 +08:00
yangxiao 6b686ae0db android light 2014-08-28 09:46:54 +08:00
Dhilan007 837e8665b5 remove redundant LOCAL_STATIC_LIBRARIES 2014-08-28 09:46:09 +08:00
yangxiao d0943afb62 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-28 09:24:04 +08:00
yangxiao 74f98b36d6 merge cocos 2014-08-28 09:22:57 +08:00
Ricardo Quesada 781b0bc478 properties revert back to 10 2014-08-27 16:35:13 -07:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Slack-Moehrle 1b5413d8b4 comment out [glview release]; and [eaglview release]; 2014-08-27 10:42:27 -07:00
Slack-Moehrle d4d2b8c83e comment out [glview release]; and [eaglview release]; 2014-08-27 10:26:09 -07:00
songchengjiang 365c57bc2b replaced Light Shader by optimized Light Shader 2014-08-27 23:40:49 +08:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
Dhilan007 9135236bb0 Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk 2014-08-27 21:15:57 +08:00
songchengjiang 26dc7de802 Repaired Light Shader BUG On ios 2014-08-27 21:03:52 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
songchengjiang 72773a806c decompose Light Struct 2014-08-27 19:12:49 +08:00
lvlong e05f6bc874 modify for compress 2014-08-27 18:44:31 +08:00
Huabing.Xu c627affa5e add triangles command, make quad command inherit from triangles command 2014-08-27 18:39:49 +08:00
yangxiao a71f42c817 add transparent queue 2014-08-27 17:53:46 +08:00
songchengjiang 731d1165c3 Spot Light Shader optimization 2014-08-27 17:09:20 +08:00
Huabing.Xu 91e332c253 dynamic update index for quad command 2014-08-27 16:43:14 +08:00
songchengjiang 682bcf9755 Tab Format 2014-08-27 16:28:53 +08:00
songchengjiang 53ad652463 Light Shader optimization 2014-08-27 16:26:01 +08:00
minggo 17ab047b7d fix compiling error on windows 2014-08-27 15:13:41 +08:00
Huabing.Xu c4ecff9804 temp backup 2014-08-27 14:54:35 +08:00
yangxiao 8cb3edf91f merge cocos light work 2014-08-27 14:53:39 +08:00
yangxiao fdc0fad935 tmp work 2014-08-27 14:46:24 +08:00
andyque 3d97ddc739 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/ui/Android.mk
 2014-08-27 14:08:16 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
minggo ac029c3d0d Merge pull request #7887 from super626/v3 
2d cull only for default camera
 2014-08-27 13:39:13 +08:00
yangxiao 26f7345693 2d cull only for default camera 2014-08-27 12:09:23 +08:00
samuele3hu 7a9a16d6aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-08-27 11:11:21 +08:00
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +08:00
samuele3hu 471820568f Update android.mk of cocos and lua-templates 2014-08-27 10:28:04 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
minggo 31f406bbdd Merge pull request #7884 from minggo/cocos2dxrendererjava-onpause-fix 
invoke nativeOnPause after onSurfaceCreated is invoked
 2014-08-27 10:17:42 +08:00
minggo d290076917 invoke nativeOnPause after onSurfaceCreated is invoked 2014-08-27 10:13:03 +08:00
andyque 4597de069d improve test case and make program more robust 2014-08-27 08:02:22 +08:00
giginet d07903827d Add the feature that CCSSceneReader can load name properties as node names. 
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.

Thanks to this commit. We are enable to access to each nodes on scene via its names.

```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
 2014-08-27 03:49:07 +09:00
andyque fc3a30b9ca modify cmakeList.txt 2014-08-26 23:25:07 +08:00
andyque 84c5542a0e Merge branch 'v3' into addWebView 2014-08-26 22:11:35 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
andyque 15815118a2 finish android version 2014-08-26 16:53:37 +08:00
minggo 3d4f22ca74 add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
songchengjiang 0bfa76b375 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-26 15:09:56 +08:00
yangxiao 8a38ce10be first version billboard 2014-08-26 15:07:37 +08:00
yangxiao 7d6b8ea706 merge cocos 2014-08-26 14:58:58 +08:00
minggo c935a39090 Merge pull request #7879 from dabingnn/v3_fixLabelStatus 
fix LabelStatus string error when labelStatus is recreated
 2014-08-26 14:51:08 +08:00
yangxiao 65b0cca132 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-26 14:37:56 +08:00
andyque 631e1a70c4 add WebView-inl.h and refactor Android code 2014-08-26 14:26:37 +08:00
songchengjiang 3369bb7e51 Replaced Tab Format 2014-08-26 14:25:01 +08:00
yangxiao 7ff75fb397 remove warning 2014-08-26 14:19:08 +08:00
songchengjiang cf964d62de Light Shader optimization 2014-08-26 14:18:22 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
andyque e12db46866 fix style 2014-08-26 12:08:26 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
andyque 736b83acb1 Merge branch 'add_webview' of https://github.com/gin0606/cocos2d-x into addWebView 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-26 10:56:10 +08:00
yangxiao cff5b65314 Merge branch 'newcode' into v3 2014-08-25 21:20:49 +08:00
Huabing.Xu ef472d6250 fix LabelStatus string error when labelStatus is recreated 2014-08-25 17:19:45 +08:00
samuele3hu 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
gin0606 41011824c1 Add WebView to libui Android 2014-08-25 15:01:37 +09:00
songchengjiang 1a1ccda3ed repaired Action BUG 2014-08-25 13:58:15 +08:00
gin0606 de429591c3 Add WebView to libui iOS 2014-08-25 14:47:42 +09:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
yangxiao c7f7623320 reserve animation size 2014-08-25 11:30:34 +08:00
minggo 7ece79e7d3 Merge pull request #7867 from CocosRobot/update_lua_bindings_1408933963 
[AUTO]: updating luabinding automatically
 2014-08-25 11:01:27 +08:00
minggo e5ac6e204b Merge pull request #7864 from minggo/module-devide 
Module devide
 2014-08-25 11:01:19 +08:00
CocosRobot 5db16cdc23 [AUTO]: updating luabinding automatically 2014-08-25 02:34:32 +00:00
minggo 74fc9931e7 fix compiling error of cpp-tests on linux 2014-08-24 19:12:36 -07:00
samuele3hu c495e5266a Remove useless win32 module project and adjust the related project setting 2014-08-25 09:59:50 +08:00
samuele3hu 1126e950b2 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the win32 platform and adjust the related test cases 2014-08-25 09:52:48 +08:00
samuele3hu 281da9f1d7 Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the iOS/Mac platform and adjust the related test cases 2014-08-25 09:51:08 +08:00
samuele3hu 25aab05b1f Integrate libluacocosdenshion,libluacocos3d,libluanetwork,libluacocostudio and libluaextension into libluacocos2d on the android platform 2014-08-25 09:48:14 +08:00
minggo dcea3b6134 Merge pull request #7843 from huangshiwu/v3_glviewattrs 
V3 glviewattrs
 2014-08-25 09:46:19 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
zii e8a5fc9fef Update CCActionManager.cpp 2014-08-23 17:06:46 +08:00
zii 4763531085 Update CCActionManager.cpp 2014-08-23 17:03:26 +08:00
CocosRobot 899e0a4182 [AUTO]: updating luabinding automatically 2014-08-22 11:25:33 +00:00
minggo 0701fe1dfb Merge pull request #7853 from super626/v3 
Better reskin model support
 2014-08-22 19:18:47 +08:00
huangshiwu 07af58c0c2 OpenGL context attributions setting revise -2 2014-08-22 16:22:16 +08:00
yangxiao 1db3d14896 reset bone number to 60, put test in alphabetical order 2014-08-22 16:06:36 +08:00
samuele3hu d1b4d43a0b Remove CCModuleManager.h/cpp and adjust the related project 2014-08-22 15:10:46 +08:00
yangxiao 6ff2aa2755 change skin joint count to 40 2014-08-22 15:00:34 +08:00
yangxiao 3a0d63caa6 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-22 14:55:11 +08:00
yangxiao a102946d35 android and linux 2014-08-22 14:54:26 +08:00
XiaoYang e4737f9070 Merge pull request #112 from liuliang2004/Meshv3 
Modify project file
 2014-08-22 14:46:46 +08:00
yangxiao 39cc03173b remove unused variable 2014-08-22 14:43:48 +08:00
liuliang c7c091e4b6 Modify project file 2014-08-22 14:32:27 +08:00
yangxiao 81dbb0bca4 add comment 2014-08-22 14:02:51 +08:00
samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	cocos/Android.mk
 2014-08-22 14:01:17 +08:00
minggo aba973b1ea Merge pull request #7834 from andyque/improveUI 
add click event listener to all Widget classes
 2014-08-22 14:00:10 +08:00
yangxiao d90572fc10 engine refactor hide concept of submesh 2014-08-22 13:52:03 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
samuele3hu 523dcdb6fb Update cocos2d android.mk 2014-08-22 13:43:18 +08:00
samuele3hu ada7fa23d3 Add CC_DLL for related network files 2014-08-22 13:42:46 +08:00
samuele3hu 700699a37f Modify MciPlayer.cpp to support Unicode 2014-08-22 13:41:48 +08:00
minggo a0b19db670 Merge pull request #7840 from minggo/fix-warning 
fix warnings
 2014-08-22 13:41:31 +08:00
minggo 0c9c873edb Merge pull request #7846 from andyque/addUILuaBindings 
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
 2014-08-22 13:40:02 +08:00
minggo ab9c35616e Merge pull request #7847 from andyque/addLuabindingsToUI 
add deprecated options for ui, add Scale9Sprite bindings
 2014-08-22 13:38:45 +08:00
yangxiao 7818b28ee3 Merge branch 'newcode' into v3 2014-08-22 13:32:57 +08:00
yangxiao 022b7e3fd3 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-22 13:27:14 +08:00
yangxiao 2d5431353a engine adjust 2014-08-22 13:25:26 +08:00
andyque 13003fe0a6 add deprecated options for ui, add Scale9Sprite bindings 2014-08-22 11:56:13 +08:00
andyque 84cf0ee834 add disableCascadeOpacity to ProtectedNode and Scale9Sprite 2014-08-22 11:49:39 +08:00
minggo 7fd1521bbf update version 2014-08-22 11:48:14 +08:00
huangshiwu 7f57d15cb3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_glviewattrs 2014-08-22 11:04:13 +08:00
huangshiwu 7dec715288 OpenGL context attributions setting revise 2014-08-22 10:55:39 +08:00
minggo 21cb90bf12 Merge pull request #7841 from pandamicro/3.2-cocos-engine-PR 
Migrate some changes from Cocos2d-JS to -x
 2014-08-21 22:38:59 +08:00
pandamicro bb5e189f30 Fix warning or Bundle3D 2014-08-21 20:02:22 +08:00
pandamicro 59cedea6dc Reverse useless change 2014-08-21 19:40:18 +08:00
pandamicro 634847412b Reverse CC_CONSTRUCTOR_ACCESS modification 2014-08-21 19:36:28 +08:00
lvlong 4ce334c0c3 Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle 2014-08-21 18:16:21 +08:00
lvlong d00bcbccb0 add texture coord2-7 2014-08-21 18:14:24 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
minggo 4563e65427 fix compiling error on android and fix some coding style 2014-08-21 15:41:05 +08:00
pandamicro 5fb9f59633 Fix small issues 2014-08-21 15:40:53 +08:00
pandamicro 9544482058 Fix Android.mk s 2014-08-21 15:40:42 +08:00
pandamicro 485dd1f7da Update #3897: Refactor missed protected constructors 2014-08-21 15:40:22 +08:00
minggo b349ce43ae use macro to control whether to use jpeg, tiff, webp or not 2014-08-21 15:19:26 +08:00
pandamicro 909dd0d397 Update #3897: Refactor missed protected constructors 2014-08-21 15:11:33 +08:00
minggo c0d1bfca26 Merge pull request #7832 from Teivaz/v3 
Fixed WinRT project
 2014-08-21 13:37:03 +08:00
teivaz aecdb832a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-21 13:48:05 +03:00
teivaz a70688dc96 + [WINRT] Inserted newly added files to cocos WIN RT project 2014-08-21 13:47:53 +03:00
lvlong 7753f4c471 modify assert(0) 2014-08-21 13:30:51 +08:00
songchengjiang e42eb950a3 Name modification 2014-08-21 11:33:00 +08:00
liuliang 9ee6683569 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 2014-08-21 11:24:11 +08:00
liuliang 082689971d Modify the model resolution 2014-08-21 11:23:31 +08:00
XiaoYang 7cf00c535d Merge pull request #109 from lvlonggame/merge-bundle 
fix binary load bug.
 2014-08-21 10:44:00 +08:00
lvlong 1f349cb3fe fix binary load bug. 2014-08-21 10:38:33 +08:00
songchengjiang 5bad6e216b Added No Normal Shader 2014-08-21 10:33:16 +08:00
andyque 3f51926c5d add click event listener to Widget 2014-08-21 10:21:07 +08:00
huangshiwu 2369a5900d merge v3 to v3_glviewattrs 2014-08-21 10:18:55 +08:00
yangxiao c26a81bb55 Merge branch 'newcode' into v3 2014-08-21 09:53:06 +08:00
teivaz 4697cb07e6 ! Set version to 3.3 (as it is no longer 3.2) 2014-08-21 18:04:46 +03:00
andyque 34b3f1f0e3 remove warnings 2014-08-21 09:36:12 +08:00
huangshiwu 2a03bea1a4 OpenGL context attributions setting 2014-08-21 09:35:32 +08:00
lite3 c136e8e079 fix indent 2014-08-21 02:15:27 +08:00
lite3 679d525453 Merge branch 'v3' into customguireader 2014-08-21 01:22:07 +08:00