Ricardo Quesada
92caf4026a
Merge pull request #9011 from ricardoquesada/perf_fixes
...
Performance improvements
2014-11-04 16:47:00 -08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Ricardo Quesada
a95f689842
Merge pull request #9010 from ricardoquesada/treat_warnings_as_errors_in_samples
...
treat warnings as errors in samples
2014-11-04 15:43:16 -08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
Jialong Zhai
6e35e91642
Update CCFileUtils-linux.cpp
2014-11-04 18:23:12 +08:00
峰 正博
828715ab8b
;; -> ;
2014-11-04 11:54:48 +09:00
峰 正博
9d2c1a6075
Merge branch 'v3' of https://github.com/aeonmine/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.cpp
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-11-04 11:51:56 +09:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
峰 正博
dc8fb94bc8
fix memory leak cocos studiov2.0 engine v3.3 #8998
...
fix memory leak for zipUtils
2014-11-04 10:21:57 +09:00
峰正博
85fb2c91ab
fix memory leak cocos studiov2.0 engine v3.3
2014-11-04 01:25:58 +09:00
minggo
5ee8f0a134
Merge pull request #8976 from hongliang-goudou/runtime_addSearchPath_argc
...
overrided addSearchPath() by Runtime.cpp should support second argument
2014-11-01 11:35:05 +08:00
samuele3hu
08d6b0dcff
Fix the type judgment of lua value would parse string —> int or int —> string
2014-10-31 17:50:59 +08:00
hongliang
adb221babe
init arg1 as false for safety
2014-10-31 15:23:46 +08:00
yangxiao
642a601502
fix wrong look at
2014-10-31 11:32:10 +08:00
minggo
b73ae5715c
Merge pull request #8982 from CocosRobot/update_lua_bindings_1414723317
...
[AUTO]: updating luabinding automatically
2014-10-31 10:45:18 +08:00
CocosRobot
9592b1f661
[AUTO]: updating luabinding automatically
2014-10-31 02:44:25 +00:00
minggo
d0edba2db3
Merge pull request #8975 from 2youyouo2/v3_EventFrame
...
update event frame
2014-10-31 10:32:53 +08:00
minggo
543c65c7b3
Merge pull request #8970 from super626/v3
...
refact 3d bundle code and fix sprite
2014-10-31 10:27:16 +08:00
minggo
87d7b7e8ee
Merge pull request #8973 from joshuastray/fix_constructor_access
...
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-31 10:26:32 +08:00
minggo
e87e0290fd
Merge pull request #8958 from MSOpenTech/wp8-shader-fix
...
WP8 Shader fix for cocos2d-x issue 8933
2014-10-31 09:43:31 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
pipu
2ed51e042d
Modify that parsing attribute "fontName" of TextReader
2014-10-30 18:00:03 +08:00
hongliang
0d006ce6d1
overrided addSearchPath() by Runtime.cpp should support second argument as CCFileUtils.cpp does.
2014-10-30 17:07:37 +08:00
Jialong Zhai
ce85ea3946
fix indentation
2014-10-30 14:38:55 +08:00
Jialong Zhai
4113929fc0
Update UIVideoPlayer.h
2014-10-30 14:36:15 +08:00
Jialong Zhai
fd238cab36
modify protected -> CC_CONSTRUCTOR_ACCESS
2014-10-30 14:24:37 +08:00
minggo
e99ea7a9fe
Merge pull request #8961 from Appgeneration/winrt_link_fix
...
Winrt link fix
2014-10-30 12:54:48 +08:00
minggo
363aa4d57f
[ci skip]Update Authors
2014-10-30 12:45:22 +08:00
minggo
2e1e78f95b
Merge pull request #8960 from kyokomi/feature/CSLoader_setPropsForNodeFromProtocolBuffers
...
bugfix: setting forget the contentSize.
2014-10-30 12:43:16 +08:00
minggo
2dee8f8f69
Merge pull request #8957 from jonhari/patch-1
...
XCode:4.6 to 5.1
2014-10-30 12:42:24 +08:00
yangxiao
77aebb657d
merge cocos
2014-10-30 11:56:20 +08:00
XiaoYang
9f96f2caa9
Merge pull request #150 from lvlonggame/v3
...
new axe.c3b (ver 0.4)
2014-10-30 10:09:03 +07:00
kaylyun
97c076337a
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
...
Sometimes app directly at the startup on android platform.
2014-10-30 10:21:19 +08:00
kaile.yin
ec5081798c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-30 09:57:01 +08:00
minggo
0e48deed6e
Merge pull request #8956 from samuele3hu/v3_new_spine
...
Add include directories to fix compile error on the window and remove useless `PreBuildEvent` for lua-template-default
2014-10-30 09:33:57 +08:00
Dale Stammen
fa70e066a1
enabled FastTileMap test for WP8
2014-10-29 09:17:31 -07:00
Miguel Ferreira
ad8ffa5de1
Fixed winrt DLL link errors when using extern consts
2014-10-29 10:47:02 +00:00
kyokomi
2b4cf9ae59
bugfix: setting forget the contentSize.
2014-10-29 19:38:12 +09:00
jonathna
fbee1e4b52
XCode:4.6 to 5.1
2014-10-29 16:28:12 +07:00
samuele3hu
ef2f87a27a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-29 16:12:23 +08:00
minggo
d2c36d604f
[ci skip] Update CHANGELOG
2014-10-29 16:11:00 +08:00
samuele3hu
c9daa8244e
Add include directories to fix compile error on the window and remove useless `PreBuildEvent`
2014-10-29 16:09:35 +08:00
Dale Stammen
32a5a2cbb8
Merge branch 'v3' into wp8-shader-fix
2014-10-28 22:08:04 -07:00
Dale Stammen
7794314ef1
added missing libcocos2d project file
2014-10-28 21:02:14 -07:00
Dale Stammen
060779c138
added check for WP8_SHADER_COMPILER
2014-10-28 21:01:26 -07:00
Dale Stammen
a8e0987b8d
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:59:44 -07:00
Dale Stammen
ee83a8a6e0
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:57:40 -07:00
Dale Stammen
145156d698
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:56:49 -07:00
minggo
0f6c926e66
Merge pull request #8953 from samuele3hu/v3_new_spine
...
Update vs project setting for lua-empty-test
2014-10-29 11:16:08 +08:00
yangxiao
4d74e7f19f
skip getMeshArrayByName
2014-10-29 10:38:13 +08:00