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
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