minggo
2c3f22eb11
Merge pull request #8854 from Dhilan007/v3-labelfix
...
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 13:52:38 +08:00
yangxiao
30733cf35e
shader optimize
2014-10-20 13:41:26 +08:00
pipu
50a8f9f3fb
Modify that parse "AnchorPointFrame"
2014-10-20 12:43:01 +08:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
Eric Zhong
2206e4edb8
fix memory leak when add listener to ui object
2014-10-20 11:20:53 +08:00
samuele3hu
29bf39bfab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-20 11:09:41 +08:00
minggo
8d3e4818a5
Merge pull request #8842 from joshuastray/v3
...
add needed link library for linux
2014-10-20 10:56:54 +08:00
Eric Zhong
fdd20b4d73
fix memory leak when reload texture
2014-10-20 10:43:18 +08:00
Dhilan007
0bb02fb34f
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 10:41:01 +08:00
samuele3hu
1195960ea7
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
2014-10-20 10:22:44 +08:00
kaile.yin
400cceeae8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-20 10:18:29 +08:00
pipu
0134e9247d
Fixed #8838
2014-10-20 10:15:44 +08:00
kaile.yin
959844d9bb
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame
2014-10-20 10:03:33 +08:00
youyou
03ebe0152b
fixed timeline loop
2014-10-19 21:32:23 +08:00
minggo
c1128a227d
Merge pull request #8847 from samuele3hu/v3_new_spine
...
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 20:10:12 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
Jialong Zhai
2befd74b0e
add needed link library for linux
2014-10-18 15:40:47 +08:00
CocosRobot
96d709aff3
[AUTO]: updating luabinding automatically
2014-10-18 07:36:54 +00:00
minggo
bca15538e3
Merge pull request #8823 from super626/v3
...
add isVisibleByVisitingCamera check
2014-10-18 15:11:45 +08:00
minggo
8218804c52
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
...
[LUA]Add New AudioEngine on window
2014-10-18 15:11:29 +08:00
Dhilan007
5ca3483dd8
fixed compile error
2014-10-18 13:44:19 +08:00
Dhilan007
c9bc80f831
Fix compile error
2014-10-18 13:03:28 +08:00
samuele3hu
529ee72432
Fix compile error triggered by UIHelper.cpp
2014-10-18 00:25:55 +08:00
samuele3hu
6502beaf95
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-18 00:14:53 +08:00
samuele3hu
3348f8300e
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
2014-10-18 00:13:22 +08:00
minggo
7e6ee9c15a
Merge pull request #8801 from 2youyouo2/v3
...
add deprecated information for Armature::drawContour
2014-10-17 23:02:49 +08:00
CocosRobot
20781825f2
[AUTO]: updating luabinding automatically
2014-10-17 14:56:22 +00:00
kaile.yin
5b0e2f0304
fixed emit last frame several times
2014-10-17 20:43:01 +08:00
Liam
3089317eb7
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
2014-10-17 19:18:12 +08:00
Liam
3f954857a8
update for lay out
2014-10-17 19:13:37 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
minggo
58601fd8ec
Merge pull request #8804 from pipu/v3_Modify_Parse_Protobuf_Plist
...
Modify reader in order to parse attribute "Plist"
2014-10-17 17:50:02 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
minggo
7b5e4f9eba
Merge pull request #8800 from joshuastray/v3
...
fix typo of file name
2014-10-17 16:33:34 +08:00
joshuastray
32c6bc05b9
fix typo of file name
2014-10-17 16:29:37 +08:00
youyou
351ef8ea66
add DEPRECATED deprecated information for Armature::drawContour
2014-10-17 16:28:37 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
CocosRobot
e8373e9b41
[AUTO]: updating luabinding automatically
2014-10-17 06:28:36 +00:00
samuele3hu
066d94530c
Update the Deprecated Func
2014-10-17 14:15:30 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
minggo
7138933344
Merge pull request #8760 from samuele3hu/v3_new_spine
...
Update lua bindings for Spine and related test case
2014-10-17 13:43:26 +08:00
minggo
91ef975c57
Merge pull request #8667 from super626/v3
...
Modify return type of Mesh::getAABB, add Animate3D::create from start frame and end frame
2014-10-17 13:40:53 +08:00
minggo
52f6fb7819
Merge pull request #8774 from joshuastray/v3
...
add missing CC_DLL for localstorage
2014-10-17 13:32:52 +08:00
yangxiao
4991b2308d
fix warning
2014-10-17 11:58:12 +08:00
joshuastray
eba3642aef
add missing CC_DLL for localstorage
2014-10-17 11:52:59 +08:00
yangxiao
9e1656e5b0
simplify compute global z when it is transparent
2014-10-17 11:52:39 +08:00
Dhilan007
4586954e0a
fixed miss sqlite3 for release build on window.
2014-10-17 11:39:06 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
yangxiao
87850d0378
rename Animate::createWithFrames
2014-10-17 11:16:07 +08:00
XiaoYang
ed5f5d7229
Merge pull request #143 from tangziwen/v3
...
fix Zorder for transparent mesh
2014-10-17 11:14:01 +08:00
tangziwen
d14b30ecac
fix tab style
2014-10-17 10:59:53 +08:00
samuele3hu
71f7520732
Fix win32 compile error
2014-10-17 10:19:41 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
minggo
ec4d83b646
Merge pull request #8738 from pipu/v3_Modify_Reader
...
Modify Reader:
2014-10-17 09:35:07 +08:00
minggo
8b1fe93269
Merge pull request #8762 from Dhilan007/v3-33rc
...
disable warn on zero-sized structure[android].
2014-10-17 09:34:41 +08:00
tangziwen
69cda9ccae
fix duplicate function in create dummy texture
2014-10-17 08:58:05 +08:00
Dale Stammen
41fe4a3e17
dpi for wp8 only
2014-10-16 11:16:26 -07:00
Dale Stammen
53302789a0
added missing files
2014-10-16 11:16:02 -07:00
Dale Stammen
d5b0830c3b
added missing files
2014-10-16 11:15:39 -07:00
Dhilan007
5595947dc3
disable warn on zero-sized structure[android].
2014-10-16 21:41:52 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
minggo
07253cfb60
Merge pull request #8743 from andyque/removeWebView
...
remove UIWebView.cpp in win32
2014-10-16 21:06:53 +08:00
minggo
2d6bfc74ea
Merge pull request #8757 from 2youyouo2/v3
...
set tag for ActionTimeline
2014-10-16 21:05:38 +08:00
samuele3hu
4d75c977ca
Remove useless binding code for SkeletonAnimation
2014-10-16 20:53:40 +08:00
samuele3hu
7198ae509c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 20:35:43 +08:00
samuele3hu
c5f19c20ca
Add SpineConstants.lua
2014-10-16 20:24:47 +08:00
samuele3hu
079df20541
Update lua bindings for Spine and related test case
2014-10-16 20:23:58 +08:00
minggo
a92f485d71
Merge pull request #8754 from zawasp/decrease-logging-verbosity
...
decrease logging verbosity - CCFileUtils-android
2014-10-16 19:28:20 +08:00
pipu
20cb663746
Delete the blank block
2014-10-16 19:02:39 +08:00
kaile.yin
7faf2fe1e6
set tag for ActionTimeline
2014-10-16 18:14:58 +08:00
Mircea Rila
0678601f61
decrease logging verbosity - CCFileUtils-android
2014-10-16 13:03:39 +03:00
CocosRobot
4a084a4ebc
[AUTO]: updating luabinding automatically
2014-10-16 09:55:07 +00:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +08:00
pipu
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08:00
CocosRobot
c4985c45e4
[AUTO]: updating luabinding automatically
2014-10-16 08:55:11 +00:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
minggo
8c06d6b981
Merge pull request #8737 from samuele3hu/v3_rc_fix
...
Update the related cocosstudio lua test cases and lua-bindings
2014-10-16 16:28:31 +08:00
pipu
85bbcdd537
Deleting original code that parsing "Visible"
2014-10-16 16:26:46 +08:00
samuele3hu
8b5f6ae52a
Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:04:09 +08:00
minggo
a4d31262ac
Merge pull request #8735 from dabingnn/v3_OptimizeQuadCommand
...
V3 optimize quad command
2014-10-16 16:01:37 +08:00
pipu
e77f7f02b0
Modify Reader:
...
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
2014-10-16 15:55:38 +08:00
samuele3hu
3ba1289710
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_rc_fix
2014-10-16 15:54:41 +08:00
samuele3hu
b4c91f0712
Update the related cocosstudio lua test cases
2014-10-16 15:51:01 +08:00
minggo
04839b0e8f
[ci skip]update version
2014-10-16 15:41:43 +08:00
Huabing.Xu
97aa69a7c2
works on no VAO devices
2014-10-16 15:33:31 +08:00
Huabing.Xu
90030140d5
fix some format problem
2014-10-16 14:56:17 +08:00
Huabing.Xu
93ea1b9078
separate trianglesCommand and QuadCommand
2014-10-16 14:15:29 +08:00
minggo
fef079aee6
Merge pull request #8682 from super626/fixbillboard
...
Fixbillboard
2014-10-16 12:04:50 +08:00
minggo
58480f8486
Merge pull request #8712 from pipu/v3_modify_warning_of_reader
...
Modifying warning of *Reader
2014-10-16 12:03:59 +08:00
CocosRobot
2bfad920ce
[AUTO]: updating luabinding automatically
2014-10-16 04:01:10 +00:00
samuele3hu
7fe2b6c0ad
Update the CCFileUtils.h
2014-10-16 11:07:15 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
Anton Sokolchenko
a49b337bbc
Update CMakeLists.txt
2014-10-15 17:37:58 +03:00
Anton Sokolchenko
8f150f8610
revert default settings
2014-10-15 16:45:25 +03:00
Anton Sokolchenko
4f1430d25d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2014-10-15 16:36:18 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
minggo
68d58b05e9
Merge pull request #8700 from iSevenDays/v3
...
CMake fix for Mac Os X
2014-10-15 21:24:18 +08:00
Huabing.Xu
c12f88d63c
lua compiles ok-need to make it works later
2014-10-15 17:33:58 +08:00
pipu
d3f972c139
Modifying warning of *Reader
2014-10-15 17:20:54 +08:00
tangziwen
f7888d9798
tab style fix
2014-10-15 17:01:56 +08:00
yangxiao
9b4ec6dfe2
Merge branch 'newcode' into v3
2014-10-15 16:53:07 +08:00
tangziwen
6ed31fa47e
fix some dummy texture bugs , supply some comments
2014-10-15 16:25:14 +08:00
Huabing.Xu
8135b09c98
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-15 15:55:17 +08:00
minggo
16ad1977b0
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
...
Add clipping rectangle node
2014-10-15 15:09:29 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
Huabing.Xu
85ba18b4db
spine works on windows now
2014-10-15 14:29:30 +08:00
SunLightJuly
74952d7258
added CCClippingRectangleNode.cpp to CMakeList
2014-10-15 14:17:04 +08:00
SunLightJuly
3352fb7bf3
reset wp8 project files
2014-10-15 14:14:02 +08:00
Huabing.Xu
f3d91d17ce
spine linux works now
2014-10-15 13:47:32 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00
Huabing.Xu
c882fc02f1
spine runs on android platform
2014-10-15 13:35:22 +08:00
Huabing.Xu
b4526bd9e0
spine runs on android platform
2014-10-15 11:48:47 +08:00
tangziwen
cd1d2289a6
bug fix
2014-10-15 11:36:44 +08:00
samuele3hu
a95e391756
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-15 11:24:27 +08:00
Huabing.Xu
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08:00
tangziwen
29b255fa36
use a pure red dummy texture to indicate Sprite3d texture missing
2014-10-15 10:39:18 +08:00
Dale Stammen
2b4d1c204c
updated wp8 precompiled shaders
2014-10-14 18:39:12 -07:00
yangxiao
79558ab3db
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-15 09:19:03 +08:00
Dale Stammen
420a19f222
run app after setting delegates
2014-10-14 18:12:24 -07:00
Dale Stammen
4bed458371
added missing protobuf-lite files
2014-10-14 17:41:40 -07:00
Dale Stammen
d6912c3d84
updated winrt platform files
2014-10-14 16:32:39 -07:00
Dale Stammen
94f53ecaa3
added universal app project files
2014-10-14 16:30:23 -07:00
Anton Sokolchenko
518b5c2949
CMake settings for Mac Os X
...
Also works with CLion
2014-10-15 00:45:00 +03:00
Dale Stammen
180fa4c324
added new cocos2d wp8 dll project files
2014-10-14 14:28:06 -07:00
Dale Stammen
9ef5f3a48f
added wp8 and winrt property sheets
2014-10-14 14:27:29 -07:00
Dale Stammen
8983a57869
added Windows 8.1 universal app project files
2014-10-14 14:25:01 -07:00
Dale Stammen
eb74b642da
added Windows 8.1 universal app project files
2014-10-14 14:23:39 -07:00
Dale Stammen
d3aa4c0475
updated winrt included
2014-10-14 14:22:41 -07:00
Dale Stammen
8700c0b07e
added check for WinRT and WP8
2014-10-14 14:22:19 -07:00
Dale Stammen
21802abe13
added CC_DLL to export VolatileTextureMgr
2014-10-14 14:21:34 -07:00
Dale Stammen
20246d648b
check for PixelFormat::DEFAULT
2014-10-14 14:21:02 -07:00
Dale Stammen
c28e2c66c5
precompiled shaders for WP8 only
2014-10-14 14:20:32 -07:00
Dale Stammen
ad9c729f6b
updated winrt include files
2014-10-14 14:20:02 -07:00
Dale Stammen
2ef8b291bf
updated wp8 include files
2014-10-14 14:19:47 -07:00
Dale Stammen
eeeac0a398
updated wp8 include files
2014-10-14 14:19:35 -07:00
Anton Sokolchenko
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
Dale Stammen
ef13db4643
updated pch include files
2014-10-14 14:19:14 -07:00
Dale Stammen
946121ec71
added CC_DLL to export classes
2014-10-14 14:18:56 -07:00
Dale Stammen
adfe072937
fixed include paths
2014-10-14 14:18:31 -07:00
Dale Stammen
37cd3dc7f9
added check for WP8_SHADER_COMPILER
2014-10-14 14:18:14 -07:00
Dale Stammen
bbca4823f5
fixed check for WINRT_NO_WINSOCK
2014-10-14 14:17:49 -07:00
Dale Stammen
7a57ea4cb8
added Windows 8.1 ANGLE support
2014-10-14 14:17:28 -07:00
Dale Stammen
e0157f7471
check for WP8_SHADER_COMPILER
2014-10-14 14:16:52 -07:00
Dale Stammen
fbc25a055c
updated winrt include
2014-10-14 14:16:24 -07:00
Dale Stammen
867556eef4
updated property sheets and pch files
2014-10-14 14:16:03 -07:00
Dale Stammen
1404f15daa
added check for WinRT and WP8
2014-10-14 14:15:21 -07:00
Dale Stammen
f54b408744
added check for WP8_SHADER_COMPILER
2014-10-14 14:14:38 -07:00
Dale Stammen
c8e4fe1fbf
enabled console for WinRT
2014-10-14 14:14:12 -07:00
Dale Stammen
52fc6d618b
updated for Windows 8.1
2014-10-14 14:13:14 -07:00
Dale Stammen
ec5af7ae90
added missing CC_USE_PHYSICS
2014-10-14 14:12:27 -07:00
Dale Stammen
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
samuele3hu
70aa62a365
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-10-15 02:09:12 +08:00
CocosRobot
64a7ef9173
[AUTO]: updating luabinding automatically
2014-10-14 18:01:12 +00:00
samuele3hu
5b4e81aa3a
Update Android.mk for libluacocos2d
2014-10-15 00:25:12 +08:00
Anton Sokolchenko
1d02270c21
fix CMakeLists for Mac Os
2014-10-14 19:17:00 +03:00
samuele3hu
3e9900c40d
Update win32 project config
2014-10-15 00:08:52 +08:00
samuele3hu
4a67963420
Update CSLoader lua-bindings and adjust project config
2014-10-14 23:37:00 +08:00
samuele3hu
735e86788e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust
2014-10-14 21:36:44 +08:00
samuele3hu
3b4fbd8fff
Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes
2014-10-14 21:34:55 +08:00
minggo
abd2687cf5
Merge pull request #8683 from dualface/update_lua_template_runtime
...
update lua-template
2014-10-14 17:01:19 +08:00
tangziwen
473c9e90b2
fix Zorder for transparent mesh
2014-10-14 16:59:41 +08:00
dualface
cee999ebbb
update lua-template-default, lua-template-runtime, fix same proj problems.
2014-10-14 16:55:38 +08:00
andyque
5ea0f0c86a
move include
2014-10-14 15:27:36 +08:00
andyque
2d4761966a
fix jenkins linux compile error and add protobuf to ignore list
2014-10-14 15:11:50 +08:00
songchengjiang
081196c933
fixed BillBoard
...
Added New Test case
2014-10-14 15:08:36 +08:00
CocosRobot
51e714bdae
[AUTO]: updating luabinding automatically
2014-10-14 06:32:12 +00:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
minggo
dfdc446b34
Merge pull request #8204 from lite3/v3
...
normalize path on android.
2014-10-14 11:50:03 +08:00
yangxiao
530bc96dd5
add comment
2014-10-14 10:50:54 +08:00
yangxiao
70f4ca2a4a
Merge branch 'newcode' into v3
2014-10-14 09:28:17 +08:00
XiaoYang
c171a8772d
Merge pull request #140 from tangziwen/v3
...
fix mesh AABB incorrect calculation through using static variable
2014-10-14 09:23:13 +08:00
tangziwen
7566880d46
fix mesh's AABB calculation incorrect by using static variable
2014-10-14 09:14:46 +08:00
songchengjiang
ecd63db80b
Fixing bug
2014-10-13 19:10:42 +08:00
andyque
96660cb653
fix linux compile
2014-10-13 18:19:49 +08:00
tangziwen
e8007b9e63
fix mesh AABB incorrect calculation through using static variable
2014-10-13 17:49:00 +08:00
minggo
1d5652ad48
Merge pull request #8635 from ahlwong/v3
...
Fix UIButton setFontSize sync ContentSize
2014-10-13 17:25:18 +08:00
pipu
7dc837338e
Deleting cocos/scripting/lua-bindings/script/cocostudio
2014-10-13 16:34:31 +08:00
pipu
a8febf9656
1. update wp8 projects.
2014-10-13 15:31:29 +08:00
yangxiao
d81e4d7a92
fix light uniform array errors, and using shader without light by default fix #8612
2014-10-13 15:17:22 +08:00
pipu
72f5808678
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-13 14:48:10 +08:00
minggo
0351000c97
Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap
...
V3 add staggered tile map
2014-10-13 13:50:50 +08:00
pipu
fc8be6f0ff
Reverting cocos/scripting/lua-bindings/auto
2014-10-13 13:06:42 +08:00
pipu
96c8fde63a
1. Modifying UIButton.cpp
...
2. Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
2014-10-13 12:49:15 +08:00
minggo
cb220fe528
Merge pull request #8657 from coldfog/v3
...
Fix bug that ActionManagerEx::initWithBinary can only load one UI animation
2014-10-13 10:20:27 +08:00
pipu
8040955062
Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt
2014-10-12 20:21:32 +08:00
pipu
2d51724686
1. Update wp8 projects.
2014-10-12 19:32:13 +08:00
pipu
93a7e22eb6
Modifying libcocos2d.vcxproj.filters
2014-10-12 18:55:43 +08:00
pipu
0d73c51a09
Modifying cocostudio/CSParseBinary.pb.h
2014-10-12 17:46:09 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
pipu
798d103479
Reverting cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj, cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters
2014-10-12 17:06:26 +08:00
pipu
86aee1e548
Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk
2014-10-12 15:39:22 +08:00
pipu
779e73dad0
1. change config.h in win32.
2014-10-12 15:27:41 +08:00
pipu
10e390557e
Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters
2014-10-12 15:07:37 +08:00
Yuyao Feng
cc22ba9854
Fix bug that ActionManagerEx::initWithBinary can only load one UI animation
2014-10-12 08:58:28 +08:00
maldewar
e21dd9a10d
Fixing conflict, use of macro function.
2014-10-11 13:06:42 -07:00
maldewar
5a7febdf25
Fixing merging, identation only conflicts.
2014-10-11 12:00:17 -07:00
lite3
3419a38961
Merge remote-tracking branch 'upstream/v3' into v3
2014-10-11 17:40:47 +08:00
XiaoYang
72e6204426
Merge pull request #138 from lvlonggame/v3
...
add create Animate3D interface by frame section
2014-10-11 17:36:37 +08:00
minggo
b144eb345a
Merge pull request #8643 from huangshiwu/v3_fixDrawNodebug
...
fix DrawNode's memory leak -- delete vaos those are generated and forget...
2014-10-11 17:31:17 +08:00
lvlong
6be64fedd7
modify Animate3D::create
2014-10-11 17:02:42 +08:00
minggo
5a60e99131
Merge pull request #8577 from ntotani/detach-thread-on-exit
...
call detach method on thread exit
2014-10-11 16:54:59 +08:00
minggo
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
minggo
8b34ea98de
Merge pull request #8648 from Dhilan007/v3-zipfix
...
fixed compile error
2014-10-11 16:18:20 +08:00
CocosRobot
971d3a6653
[AUTO]: updating luabinding automatically
2014-10-11 08:12:44 +00:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
Dhilan007
d3733c4a45
fixed compile error
2014-10-11 16:05:34 +08:00
pipu
38ac6533a3
Removing ../../ in header file include
2014-10-11 15:50:44 +08:00
pipu
ab969db441
Modifying ImageViewReader, UIImageView
2014-10-11 15:43:37 +08:00
pipu
29eb552d00
1. Modifying ButtonReader
...
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
2014-10-11 15:35:09 +08:00
huangshiwu
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
Huabing.Xu
7747e2ecf5
Merge branch 'v3' into v3_addStaggeredTileMap
2014-10-11 15:15:12 +08:00
Huabing.Xu
27f48b0011
add implementation for staggered tmx map
2014-10-11 14:22:31 +08:00
pipu
583a756d33
Reverting build/cocos2d-win32.vc2012.sln
...
Reverting cocos/2d/libcocos2d.vcxproj
2014-10-11 14:13:56 +08:00
pipu
9ba51a1909
Reverting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 13:49:56 +08:00
Ricardo Quesada
1b6b91a63d
Merge pull request #8642 from martell/minizip
...
mingw64: mirgrate to upstream minizip
2014-10-10 21:30:11 -07:00
Ahlwong
dd5c5a29b9
Refactor UIButton ContentSize update
2014-10-10 21:13:04 -07:00
pipu
8b61c4677f
Deleting cocos/scripting/lua-bindings/auto/*.*
2014-10-11 12:09:11 +08:00
huangshiwu
184d9356b8
fix DrawNode's memory leak -- delete vaos those are generated and forget to release
2014-10-11 12:00:14 +08:00
SunLightJuly
a36dbf5362
ClippingRegionNode --> ClippingRectangleNode
2014-10-11 11:49:01 +08:00
martell
0d26b33eaa
mingw64: mirgrate to upstream minizip
2014-10-11 04:39:42 +01:00
lite3
e1814d0480
add virtual in FileUtilsAndroid::getNewFilename
2014-10-11 11:20:14 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
minggo
fdf405a17c
Merge pull request #8637 from dualface/migrate_lua_to_project_src
...
Migrate Deprecated Lua API from Luabinding of modules to folder src/cocos
2014-10-11 10:14:56 +08:00
Ahlwong
d95b1cef7a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Update from upstream.
2014-10-10 19:10:44 -07:00
Ricardo Quesada
e03fb86990
one more fix, oops
2014-10-10 18:28:05 -07:00
Ricardo Quesada
3cd2163558
more win fixes
2014-10-10 18:21:15 -07:00
Ricardo Quesada
ee3086ff8d
compiler fixes for windows
2014-10-10 17:41:11 -07:00
dualface
20cbbfdbe5
update luabinding scripts
2014-10-11 02:51:58 +08:00
Ahlwong
4aceaee08c
Fix UIButton setFontSize sync ContentSize
2014-10-10 11:17:43 -07:00
SunLightJuly
88acc56e56
restored cocos/CMakeList.txt
2014-10-11 02:15:29 +08:00
dualface
68f71b3df4
do not load deprecated Lua API from luabinding of modules
2014-10-10 23:59:41 +08:00
pipu
ffd83bbdd0
Modifying win32 and wp8 protocol buffers lib
2014-10-10 22:38:34 +08:00
minggo
4d084496a3
Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP
...
added LuaStack::loadChunksFromZIP()
2014-10-10 22:14:55 +08:00
minggo
09616d68d9
Merge pull request #8628 from andyque/ficChipmunkLinuxCompile
...
try to fix ubuntu 12.04 compile error
2014-10-10 22:14:33 +08:00
pipu
efe22a0dd7
Modifying protocol buffers for win32 version
2014-10-10 21:55:59 +08:00
SunLightJuly
ba064167a8
modified project files and make files
2014-10-10 18:43:40 +08:00
minggo
4a193c6d76
Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix
...
Scale9Sprite capInsets set fix
2014-10-10 18:05:32 +08:00
Huabing.Xu
766c9469d4
add staggered wrapper(using ortho for its implementation now)
2014-10-10 17:52:13 +08:00
lvlong
4bba69d578
add a param comment
2014-10-10 17:48:54 +08:00