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
lvlong
2c18db5b18
create animate by frame section.
2014-10-10 17:44:45 +08:00
andyque
ad1e44a254
try to fix ubuntu 12.04 compile error
2014-10-10 17:27:15 +08:00
Dhilan007
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
CocosRobot
53cde3f3b2
[AUTO]: updating luabinding automatically
2014-10-10 08:39:46 +00:00
minggo
63e4d7ce27
Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac
...
fix setMaxLength issue of EditBox-mac
2014-10-10 16:28:21 +08:00
minggo
4b7d5694b8
Merge pull request #8573 from Dhilan007/v3-labelatlas
...
fix #8569 : LabelAtlas opacity do not change when setting parent node's opacity
2014-10-10 15:52:50 +08:00
minggo
44f3dcdfca
Merge pull request #8608 from Dhilan007/v3-fileutil-ios
...
issue #8568 : Fixed FileUtils::removeFile doesn't work on iOS
2014-10-10 15:35:43 +08:00
minggo
7d4a235d46
Merge pull request #8611 from dabingnn/v3_fixGLProgramCrash
...
V3 fix gl program crash
2014-10-10 15:28:23 +08:00
andyque
2013cdb4ef
fix setMaxLength issue of EditBox-mac
2014-10-10 15:26:33 +08:00
minggo
01e3ae2c61
Merge pull request #8606 from andyque/fixButtonContentSize
...
fix button title only content size issue
2014-10-10 15:23:25 +08:00
minggo
49b3e907e9
Merge pull request #8604 from samuele3hu/v3_3D
...
Add CameraTest、OBBTest and related lua bindings
2014-10-10 15:22:17 +08:00
Dhilan007
7fb448e90f
add 'static' for global function
2014-10-10 15:13:05 +08:00
minggo
df60fde7ab
Merge pull request #8610 from andyque/fixCocostudioIncludePath
...
fix cocostudio include path
2014-10-10 15:05:39 +08:00
Huabing.Xu
a08d0e4be3
Merge branch 'v3' into v3_fixGLProgramCrash
2014-10-10 15:05:09 +08:00
yangxiao
a67825e950
use shader without light by default
2014-10-10 15:01:14 +08:00
minggo
4856b6782a
Merge pull request #7979 from giginet/scene-reader-canvas-size
...
SceneReader sets contentSize by canvasSize.
2014-10-10 15:00:28 +08:00
Huabing.Xu
e69465e428
remove texture unit 4-7, only 0 -3 is reserved
2014-10-10 14:06:37 +08:00
Huabing.Xu
f097c76e46
fix compile error for macro redefinition
2014-10-10 14:05:57 +08:00
Dhilan007
250875b081
fixed compile error
2014-10-10 14:03:20 +08:00
andyque
d5fe0758ed
fix cocostudio include path
2014-10-10 13:48:49 +08:00
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +08:00
Dhilan007
6a8c4f4194
Fixed FileUtils::removeFile doesn't work on iOS
2014-10-10 11:59:35 +08:00
minggo
2a95286329
Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug
...
use fileName for _actionDic key
2014-10-10 11:13:41 +08:00
andyque
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
minggo
ba5ff2e8e3
Merge pull request #8586 from super626/v3
...
Fix warning of Bundle3D and modify light
2014-10-10 10:46:24 +08:00
pipu
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
minggo
3aa6337974
Merge pull request #8599 from dabingnn/v3_fixEGLConfigOnAndroid
...
fix egl config error on android
2014-10-10 10:41:52 +08:00
Huabing.Xu
254ee5b873
Merge branch 'v3' into v3_fixGLProgramCrash
2014-10-10 10:09:26 +08:00
yangxiao
7a23cc3c1a
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-10 09:55:56 +08:00
yangxiao
1ef511d31f
Merge branch 'newcode' into v3
2014-10-10 09:53:57 +08:00
samuele3hu
f97a7ae52d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-10-10 09:52:29 +08:00
samuele3hu
115d81574c
Add CameraTest、OBBTest and related lua bindings
2014-10-10 09:49:25 +08:00
Ahlwong
5027f24348
Fix UIButton Scale 9 Highlight
2014-10-09 12:48:09 -07:00
Huabing.Xu
d5e29d285d
fix gel Config error on android
2014-10-09 18:34:14 +08:00
XiaoYang
b77559fe5d
Merge pull request #136 from songchengjiang/new_v3
...
Fixed CosOuterAngle error
2014-10-09 18:31:24 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
minggo
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
yangxiao
88fc4258ca
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-09 17:02:10 +08:00
yangxiao
222bf570f2
Merge branch 'newcode' into v3
2014-10-09 17:01:35 +08:00
songchengjiang
34efbf189a
Fixed getCosOuterAngle errors
2014-10-09 16:16:02 +08:00
minggo
b8c5ce6db3
Merge pull request #8588 from Dhilan007/v3-label8582
...
fixed issue#8582: opacity of label
2014-10-09 15:50:44 +08:00
songchengjiang
88012cf86b
Merge branch 'v3_new' into v3
...
Conflicts:
tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
2014-10-09 15:49:50 +08:00
minggo
273863685c
Merge pull request #8595 from andyque/fixLinuxCompileError
...
Fix linux compile error
2014-10-09 14:51:56 +08:00
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
Dhilan007
462e38cbc6
fixed opacity of label
2014-10-09 10:54:35 +08:00
XiaoYang
7ecd8c519a
Merge pull request #135 from lvlonggame/v3
...
Remove string err that is no used
2014-10-09 10:14:06 +08:00
yangxiao
c087f31e94
modify return type of getDirection and getDirectionInWorld
2014-10-09 10:12:52 +08:00
Ricardo Quesada
d326db427f
removes the `3d_export.h` file
2014-10-08 18:30:23 -07:00
SunLightJuly
1062dec335
modified project files and make files
2014-10-08 18:44:58 +08:00
Dhilan007
6f50143e0a
Fixed LabelAtlas opacity do not change when setting parent node's opacity
2014-10-08 18:28:24 +08:00
Dhilan007
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
CocosRobot
70a2195ccf
[AUTO]: updating luabinding automatically
2014-10-08 09:53:11 +00:00
Naoyuki Totani
b0d1fb79b3
call detach method on thread exit
2014-10-08 18:34:06 +09:00
SunLightJuly
763b54e5cb
added LuaStack::loadChunksFromZIP()
2014-10-08 17:30:14 +08:00
lvlong
cba155b5bc
Remove string err no used
2014-10-08 15:23:31 +08:00
minggo
8aa03e107f
Merge pull request #8209 from boyu0/fix_physics_crash
...
fix bug: physics crashes when remove/add children too quick.
2014-10-08 13:48:03 +08:00
martell
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
martell
d420ae39e2
Added CC_STATIC support for 3d, all these commits will be squashed and renamed, structured and signed at the end
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:27 +01:00
martell
1a7ecbe427
Finalise Mac Support for cmake
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:19 +01:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
martell
ecd8a02ee6
Fixed up some more cmake errors
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:01 +01:00
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
fe32bcb952
added support for static and shared builds with audio and studio
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:52 +01:00
martell
c7f3594a1b
added support for static and shared builds with ui
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:38 +01:00
martell
d9228d31c0
added support for static and shared builds on windows
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:18 +01:00
martell
028d15921e
fix warning because of extra comma's
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:19:57 +01:00
martell
1ef0f41e0e
Changed WIN32 to _WIN32 to support gnu c++11
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:17:55 +01:00
Ricardo Quesada
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
Sergey
d9b0039517
Scale9Sprite capInsets set fix
2014-10-03 17:38:02 +04:00
Ricardo Quesada
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
Ricardo Quesada
cc3df75d1f
works on win32
...
std::iterators weren't used correctly
2014-10-02 15:46:47 -07:00
Ricardo Quesada
12e9d18ab7
Compiles on Windows Phone 8
2014-10-01 19:08:34 -07:00
minggo
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08:00
minggo
2ecfcee2a6
Merge pull request #8216 from Dhilan007/v3-audio-fix
...
fix audio issues(log output:Too Many Objects) after play audio many times on Android
2014-09-30 15:19:46 +08:00
CocosRobot
a96a2a992d
[AUTO]: updating luabinding automatically
2014-09-30 07:13:25 +00:00
minggo
d1a0adf1a9
Merge pull request #8200 from Dhilan007/v3-audio-win32
...
New Audio Engine[Win32]
2014-09-30 15:09:00 +08:00
Dhilan007
ed9c8b2693
fix audio issues(log output:Too Many Objects) after play audio many times.
2014-09-30 15:00:52 +08:00
Sergey Perepelitsa
d9204b009e
scale9Sprite without scale9enabled scale fix
...
scale9Sprite crop > border tile bug fix
2014-09-30 10:59:20 +04:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
SunLightJuly
c108616a01
standardized codes
2014-09-30 13:17:03 +08:00
SunLightJuly
4ba19791ed
fixed bug in Cocos2dxLuaLoader
2014-09-30 13:11:39 +08:00
minggo
804b26344e
fix warnings
2014-09-30 11:58:38 +08:00
Dhilan007
db45794625
fix macro
2014-09-30 09:57:28 +08:00
Dhilan007
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
Dhilan007
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
yangxiao
d680e58f80
merge cocos resolve conflict
2014-09-30 08:32:37 +08:00
boyu0
2b0afa6063
fix bug: physics crashes when remove/add children too quick.
2014-09-30 08:15:46 +08:00
lite3
21081b9e1a
use reference
2014-09-30 01:07:19 +08:00
Ricardo Quesada
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
lite3
240b922271
remove '../' at path on android.
...
because AAssetManager_open do not support '../' in path.
2014-09-29 19:31:05 +08:00
minggo
09ebebc6d2
Merge pull request #8203 from dabingnn/v3_changeTabtoSpace
...
change tab to space
2014-09-29 18:47:22 +08:00
Huabing.Xu
88679c2437
change tab to space
2014-09-29 18:44:01 +08:00
minggo
db9c5137a0
Merge pull request #8199 from CocosRobot/update_lua_bindings_1411985319
...
[AUTO]: updating luabinding automatically
2014-09-29 18:30:52 +08:00
minggo
0cd2f985e8
Merge pull request #8172 from dabingnn/v3_fixEGLConfigCrashBug
...
fix egl config chooser bug
2014-09-29 18:24:19 +08:00
CocosRobot
50a06a13ad
[AUTO]: updating luabinding automatically
2014-09-29 10:11:17 +00:00
minggo
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
minggo
f4b080a03f
Merge pull request #8192 from samuele3hu/v3_3D
...
Add Camera3DTest ,BillBoradTest and more Sprite3DTest for Lua, and update the related lua bindings files
2014-09-29 17:56:42 +08:00
Frank.Xu
1c1d917620
Fix pull request #6894 merge conflicts
2014-09-29 16:22:55 +08:00
SunLightJuly
fbbc90431e
standardized codes
2014-09-29 15:42:56 +08:00
SunLightJuly
e0b9878e58
added ClippingRegionNode
2014-09-29 15:07:05 +08:00
Dhilan007
65a14a6d3f
Improved thread safety
2014-09-29 14:17:51 +08:00
minggo
c4fac7b37d
Merge pull request #8193 from andyque/improveCocostudioReader
...
replace raw string literal with const external variables to keep consistence.
2014-09-29 13:49:28 +08:00
minggo
6583bf6b1f
Merge pull request #8179 from MSOpenTech/wp8-v3-fix
...
WP8 fixes for v3.3 app certification tests
2014-09-29 13:42:40 +08:00
andyque
c9b959ec82
replace raw string literal with const external variables to keep consistence.
2014-09-29 11:35:03 +08:00
samuele3hu
87fccd7881
Remove manaul lua-bindings for Armature::getOffsetPoints
2014-09-29 10:37:19 +08:00
samuele3hu
cb38f6bd5b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
2014-09-29 10:27:46 +08:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
samuele3hu
f00187d3bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-09-29 09:48:35 +08:00
samuele3hu
99e1c6640e
Add BillBoardTest and update related bindings files
2014-09-29 09:43:22 +08:00
CocosRobot
fd9ed15d6d
[AUTO]: updating luabinding automatically
2014-09-29 01:25:31 +00:00
Dhilan007
d52144d1e0
fix linker errors on WIN32
2014-09-28 21:45:09 +08:00
songchengjiang
39deb73c3a
move light from 3d to base(Windows)
2014-09-28 17:23:25 +08:00
minggo
9511f0deb5
Merge pull request #8130 from yestein/v3
...
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-28 16:48:37 +08:00
samuele3hu
6b2acf88fc
Modify CameraTest and update related lua-bindings files
2014-09-28 16:47:06 +08:00
minggo
8ed336c681
Merge pull request #8167 from hongliang-goudou/v3
...
bugfix for UI animation playing crash if GUI JSON file is loaded again.
2014-09-28 16:42:49 +08:00
minggo
289c1edfe7
Merge pull request #8174 from lite3/v3
...
fix compile error when CC_SPRITE_DEBUG_DRAW
2014-09-28 16:21:04 +08:00
yangxiao
38873dd999
move light fix linux and android
2014-09-28 16:05:20 +08:00
yangxiao
dbf564208b
move light from 3d to base
2014-09-28 16:02:12 +08:00
samuele3hu
e50eaf684f
Add CameraTest and update related lua-bindings files
2014-09-28 14:31:58 +08:00
Sergey Perepelitsa
c1f37a6926
Misprint fix
...
scale9Image double draw fix
2014-09-28 10:30:33 +04:00
yangxiao
744e09c141
reset change to getDirectionInWorld
2014-09-28 11:03:18 +08:00
yangxiao
53dee7ef86
can ci android compile?
2014-09-28 10:21:47 +08:00
yangxiao
75e5ca30ee
merge cocos
2014-09-28 09:55:31 +08:00
Sergey Perepelitsa
ab45c582a7
Scale9Sprite improvements
...
small bugs fix
small optimizations
support for cropped sprite frames
2014-09-28 01:58:26 +04:00
andyque
750c61dd30
fix linux compile error
2014-09-27 01:55:41 -07:00
andyque
aea729ef01
fix cmakelists.txt of linux platform
2014-10-09 12:01:22 +08:00
Dale Stammen
3c7a22f776
removed CMakeLists.txt
2014-09-26 12:42:20 -07:00
Dale Stammen
24e5df1644
updated wp8 precompiled shaders
2014-09-26 12:16:16 -07:00
Dale Stammen
67377b7d46
added check for WINRT_NO_WINSOCK
2014-09-26 12:05:19 -07:00
Dale Stammen
fd3177d350
removed WINRT
2014-09-26 11:41:12 -07:00
Dale Stammen
ef58fa7fd4
fixed winrt file functions to pass app certification tests.
2014-09-26 11:38:17 -07:00
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