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