Dale Stammen
b77e7a5a97
fixed reentrancy when closing flyout
2014-10-23 22:01:35 -07:00
Ahlwong
012683bf6e
Fix kerning on signle characters
2014-10-23 21:18:51 -07:00
James Chen
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
lvlong
799f375802
Fix bug: load sprite3D from cache, the attach node will be discarded.
2014-10-24 12:02:55 +08:00
Dale Stammen
afa052c5c7
added critical section
2014-10-23 20:49:10 -07:00
Dale Stammen
f42afaa6bb
updated project files with new pch files
2014-10-23 19:40:57 -07:00
Dale Stammen
6e92d169cd
changed implementation to use xaml flyout for editbox
2014-10-23 19:30:32 -07:00
Dale Stammen
c82a75d4f7
added xaml support functions
2014-10-23 19:29:38 -07:00
Dale Stammen
2ddb692628
added flyout xaml to support uieditbox on winrt
2014-10-23 19:29:18 -07:00
Dale Stammen
96054e9c29
updated headers for change in pch.h
2014-10-23 19:28:53 -07:00
Dale Stammen
b6329c6c7b
added correct options to compile c file
2014-10-23 13:27:24 -07:00
Dale Stammen
b520e80e04
updated 2d and base file locations
2014-10-23 09:03:35 -07:00
Dale Stammen
0af2f30d61
fixed WP8_SHADER_COMPILER checks
2014-10-23 08:40:34 -07:00
Dale Stammen
a4294c07c1
added check for WP8_SHADER_COMPILER
2014-10-23 08:32:31 -07:00
Dale Stammen
d2f852c3cb
added editbox support for universal apps
2014-10-23 07:39:38 -07:00
Dale Stammen
b5fdf892b2
added text input from keyboard support for winrt
2014-10-23 07:38:46 -07:00
Dale Stammen
cc3b784dd1
added windows 8.1 platform support files
2014-10-23 07:38:04 -07:00
Dale Stammen
a4f13a91ab
added CC_NO_GL_POINTSIZE preprocessor define
2014-10-23 07:36:23 -07:00
Dale Stammen
89d3d7b7cf
added missing cocos2d files
2014-10-23 07:29:57 -07:00
Dale Stammen
9b2adef6b2
added CC_PLATFORM_WINRT
2014-10-23 07:15:58 -07:00
Dale Stammen
c0ebee6bc7
gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE
2014-10-23 07:15:22 -07:00
Dale Stammen
14568361aa
gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE
2014-10-23 07:14:58 -07:00
Dale Stammen
01fbcfcd31
Windows 8.1 ANGLE reguires vert and frag shaders to use same precision
2014-10-23 07:13:38 -07:00
Dale Stammen
1112cad792
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 07:12:51 -07:00
Dale Stammen
3d16bbc6b9
added UIEditBoxEvent. namespace refactor
2014-10-23 07:09:03 -07:00
Dale Stammen
b20015f845
updated for Universal App support
2014-10-23 07:07:58 -07:00
Dale Stammen
06913670dc
use device orientation for acceleration values
2014-10-23 07:04:13 -07:00
Dale Stammen
8af672c588
moved messagebox code to winrt cceglview to handle threading issues
2014-10-23 07:03:41 -07:00
Dale Stammen
bf9843a905
removed CMakeLists.txt
2014-10-23 07:02:36 -07:00
Dale Stammen
38d5be5082
no mp3 for winrt
2014-10-23 07:01:53 -07:00
Dale Stammen
00f9e888d2
enable console for winrt
2014-10-23 07:01:04 -07:00
Dale Stammen
753bc5034a
removed winrt/wp8 code. no longer needed
2014-10-23 06:59:09 -07:00
Mircea Rila
3d276db6d2
fix some warnings / remove TABs
2014-10-23 12:54:15 +03:00
kaile.yin
0f184a4982
add arriving last frame event
2014-10-23 17:38:04 +08:00
kaile.yin
e7de544231
1.fixed frame event may forword emit
2014-10-23 17:37:18 +08:00
James Chen
dd6bb0b3eb
Uses reference in for loop inside ccvector_std_string_to_luaval
2014-10-23 10:18:09 +08:00
Dhilan007
20d372b356
Fixed Label shifting when outline feature enabled
2014-10-22 14:34:01 +08:00
yangxiao
1a5ab908fd
Merge branch 'newcode' into v3
2014-10-21 19:31:15 +08:00
yangxiao
9be19cf5ac
remove nodetoparent
2014-10-21 19:29:56 +08:00
lvlong
63a47534ab
fix 0.2 version load bug.
2014-10-21 18:44:10 +08:00
minggo
14cb7518d6
Merge pull request #8894 from Dhilan007/v3-testcase-android
...
Fixed incorrect file path of audio resource in AudioEngine on Android.
2014-10-21 18:36:44 +08:00
Dhilan007
c66348435c
Fixed incorrect file path of audio resource in AudioEngine on Android.
2014-10-21 18:34:05 +08:00
James Chen
22776dcd88
Removes uthash in CCGLProgram
2014-10-21 17:29:24 +08:00
minggo
47697daf03
remove unneeded codes
2014-10-21 17:28:14 +08:00
lvlong
622df56614
fix OBB intersects bug
2014-10-21 17:22:42 +08:00
lvlong
8664111e4a
modify camera attach bug!
2014-10-21 17:19:50 +08:00
minggo
78fd325ac7
Merge pull request #8889 from Dhilan007/v3-testcase-android
...
Fixed line wrap error for system font on MAC
2014-10-21 16:55:22 +08:00
Dhilan007
90b2d8464b
Fixed line wrap error for system font on MAC
2014-10-21 16:46:00 +08:00
samuele3hu
8a2c66fc0e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-21 15:58:07 +08:00
samuele3hu
2f9dbb7142
Update cocos2d basic lua files and LabelTestNew.lua
2014-10-21 15:56:38 +08:00
Dhilan007
b741767b37
Rolling back text color of system font on Linux
2014-10-21 14:14:08 +08:00
minggo
65f007f5ff
Merge pull request #8857 from zhongfq/patch-2
...
fix memory leak when add listener to ui object
2014-10-21 13:57:07 +08:00
minggo
60ecec2ff6
Merge pull request #8881 from super626/v3
...
Fix Bugs
2014-10-21 13:55:48 +08:00
minggo
5c2ad2b151
Merge pull request #8878 from minggo/fix-warning
...
fix warning
2014-10-21 13:54:49 +08:00
yangxiao
25409b441a
adjust code
2014-10-21 11:59:03 +08:00
minggo
38e4acb120
Merge pull request #8880 from huangshiwu/v3_wp8fixbug
...
fix WP8 debug mode crash - update WP8's precompileshader.h
2014-10-21 11:58:07 +08:00
XiaoYang
9a7ecbf22b
Merge pull request #146 from tangziwen/v3
...
fix some bugs when loading Animation3D from binary file
2014-10-21 11:47:45 +08:00
tangziwen
61a6fda1c0
fix some bugs when loading Animation3D from binary file
2014-10-21 11:43:28 +08:00
minggo
db8dc25b01
fix warning
2014-10-21 11:40:34 +08:00
huanghsiwu
e392bf9b17
fix wp8 debug mode crash - update WP8's precompileshader.h to match shader's modify
2014-10-21 11:14:07 +08:00
SunLightJuly
0cb8a3922b
fixed bug of definition of utils:: getCascadeBoundingBox()
2014-10-21 11:07:11 +08:00
XiaoYang
bf931d5883
Merge pull request #145 from tangziwen/v3
...
fix animation3D ID bug
2014-10-21 10:04:46 +08:00
minggo
6313f9a622
Merge pull request #8868 from samuele3hu/v3_new_spine
...
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
2014-10-21 09:33:40 +08:00
yangxiao
1a72d89194
fix AABB computation
2014-10-20 22:53:24 +08:00
tangziwen
8f7d202816
fix animation3D ID bug
2014-10-20 19:22:00 +08:00
CocosRobot
e02558e391
[AUTO]: updating luabinding automatically
2014-10-20 10:17:27 +00:00
minggo
b2d1549686
Merge pull request #8869 from Dhilan007/v3-movefile
...
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 18:10:52 +08:00
samuele3hu
20bcafa143
Fix the bug that callbacks aren’t triggered when response failed
2014-10-20 17:43:04 +08:00
minggo
0dd8e89bb2
Merge pull request #8863 from Dhilan007/v3-labelfix
...
Fix wrong text color for system font on Linux/Window
2014-10-20 16:38:32 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
samuele3hu
72a98c154d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-20 16:07:01 +08:00
samuele3hu
38b462100b
Update LuaMinXmlHttpRequest.h/.cpp
2014-10-20 16:05:13 +08:00
minggo
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +08:00
Dhilan007
4765ed8494
Fix wrong text color for system font on Linux/Window
2014-10-20 14:33:33 +08:00
minggo
1fba616ba7
Merge pull request #8859 from super626/v3
...
3d shader optimize
2014-10-20 14:12:54 +08:00
minggo
1ae3dd7fc9
Merge pull request #8860 from CocosRobot/update_lua_bindings_1413785078
...
[AUTO]: updating luabinding automatically
2014-10-20 14:12:21 +08:00
CocosRobot
5e09b1e3b1
[AUTO]: updating luabinding automatically
2014-10-20 06:06:43 +00:00
minggo
f661703307
Merge pull request #8852 from zhongfq/patch-1
...
fix memory leak when reload texture
2014-10-20 14:06:09 +08:00
minggo
49bd79d14a
Merge pull request #8853 from 2youyouo2/v3_EventFrame
...
fixed emit frame event
2014-10-20 13:57:38 +08:00
minggo
2c3f22eb11
Merge pull request #8854 from Dhilan007/v3-labelfix
...
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 13:52:38 +08:00
yangxiao
30733cf35e
shader optimize
2014-10-20 13:41:26 +08:00
pipu
50a8f9f3fb
Modify that parse "AnchorPointFrame"
2014-10-20 12:43:01 +08:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
Eric Zhong
2206e4edb8
fix memory leak when add listener to ui object
2014-10-20 11:20:53 +08:00
samuele3hu
29bf39bfab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-20 11:09:41 +08:00
minggo
8d3e4818a5
Merge pull request #8842 from joshuastray/v3
...
add needed link library for linux
2014-10-20 10:56:54 +08:00
Eric Zhong
fdd20b4d73
fix memory leak when reload texture
2014-10-20 10:43:18 +08:00
Dhilan007
0bb02fb34f
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 10:41:01 +08:00
samuele3hu
1195960ea7
Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32
2014-10-20 10:22:44 +08:00
kaile.yin
400cceeae8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-20 10:18:29 +08:00
pipu
0134e9247d
Fixed #8838
2014-10-20 10:15:44 +08:00
kaile.yin
959844d9bb
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame
2014-10-20 10:03:33 +08:00
youyou
03ebe0152b
fixed timeline loop
2014-10-19 21:32:23 +08:00
minggo
c1128a227d
Merge pull request #8847 from samuele3hu/v3_new_spine
...
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 20:10:12 +08:00
samuele3hu
634d42775e
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
2014-10-19 17:00:05 +08:00
Jialong Zhai
2befd74b0e
add needed link library for linux
2014-10-18 15:40:47 +08:00
CocosRobot
96d709aff3
[AUTO]: updating luabinding automatically
2014-10-18 07:36:54 +00:00
minggo
bca15538e3
Merge pull request #8823 from super626/v3
...
add isVisibleByVisitingCamera check
2014-10-18 15:11:45 +08:00
minggo
8218804c52
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
...
[LUA]Add New AudioEngine on window
2014-10-18 15:11:29 +08:00
Dhilan007
5ca3483dd8
fixed compile error
2014-10-18 13:44:19 +08:00
Dhilan007
c9bc80f831
Fix compile error
2014-10-18 13:03:28 +08:00
samuele3hu
529ee72432
Fix compile error triggered by UIHelper.cpp
2014-10-18 00:25:55 +08:00
samuele3hu
6502beaf95
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-18 00:14:53 +08:00
samuele3hu
3348f8300e
Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case
2014-10-18 00:13:22 +08:00
minggo
7e6ee9c15a
Merge pull request #8801 from 2youyouo2/v3
...
add deprecated information for Armature::drawContour
2014-10-17 23:02:49 +08:00
CocosRobot
20781825f2
[AUTO]: updating luabinding automatically
2014-10-17 14:56:22 +00:00
kaile.yin
5b0e2f0304
fixed emit last frame several times
2014-10-17 20:43:01 +08:00
Liam
3089317eb7
Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3
2014-10-17 19:18:12 +08:00
Liam
3f954857a8
update for lay out
2014-10-17 19:13:37 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
Dhilan007
81a8e80496
[LUA]Add New AudioEngine on window
2014-10-17 17:53:33 +08:00
minggo
58601fd8ec
Merge pull request #8804 from pipu/v3_Modify_Parse_Protobuf_Plist
...
Modify reader in order to parse attribute "Plist"
2014-10-17 17:50:02 +08:00
minggo
d241e568b0
Merge pull request #8788 from samuele3hu/v3_new_spine
...
Update the deprecated Func and update bindings-generator
2014-10-17 16:35:51 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
minggo
7b5e4f9eba
Merge pull request #8800 from joshuastray/v3
...
fix typo of file name
2014-10-17 16:33:34 +08:00
joshuastray
32c6bc05b9
fix typo of file name
2014-10-17 16:29:37 +08:00
youyou
351ef8ea66
add DEPRECATED deprecated information for Armature::drawContour
2014-10-17 16:28:37 +08:00
samuele3hu
936510411b
Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache
2014-10-17 15:04:16 +08:00
minggo
31664d979a
Merge pull request #8783 from andyque/adjustUITestProject
...
fix scrollView rotate issue
2014-10-17 14:54:32 +08:00
samuele3hu
14f91ea9f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
2014-10-17 14:38:07 +08:00
CocosRobot
e8373e9b41
[AUTO]: updating luabinding automatically
2014-10-17 06:28:36 +00:00
samuele3hu
066d94530c
Update the Deprecated Func
2014-10-17 14:15:30 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
minggo
7138933344
Merge pull request #8760 from samuele3hu/v3_new_spine
...
Update lua bindings for Spine and related test case
2014-10-17 13:43:26 +08:00
minggo
91ef975c57
Merge pull request #8667 from super626/v3
...
Modify return type of Mesh::getAABB, add Animate3D::create from start frame and end frame
2014-10-17 13:40:53 +08:00
minggo
52f6fb7819
Merge pull request #8774 from joshuastray/v3
...
add missing CC_DLL for localstorage
2014-10-17 13:32:52 +08:00
yangxiao
4991b2308d
fix warning
2014-10-17 11:58:12 +08:00
joshuastray
eba3642aef
add missing CC_DLL for localstorage
2014-10-17 11:52:59 +08:00
yangxiao
9e1656e5b0
simplify compute global z when it is transparent
2014-10-17 11:52:39 +08:00
Dhilan007
4586954e0a
fixed miss sqlite3 for release build on window.
2014-10-17 11:39:06 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
yangxiao
87850d0378
rename Animate::createWithFrames
2014-10-17 11:16:07 +08:00
XiaoYang
ed5f5d7229
Merge pull request #143 from tangziwen/v3
...
fix Zorder for transparent mesh
2014-10-17 11:14:01 +08:00
tangziwen
d14b30ecac
fix tab style
2014-10-17 10:59:53 +08:00
samuele3hu
71f7520732
Fix win32 compile error
2014-10-17 10:19:41 +08:00
Dhilan007
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
minggo
ec4d83b646
Merge pull request #8738 from pipu/v3_Modify_Reader
...
Modify Reader:
2014-10-17 09:35:07 +08:00
minggo
8b1fe93269
Merge pull request #8762 from Dhilan007/v3-33rc
...
disable warn on zero-sized structure[android].
2014-10-17 09:34:41 +08:00
tangziwen
69cda9ccae
fix duplicate function in create dummy texture
2014-10-17 08:58:05 +08:00
Dale Stammen
41fe4a3e17
dpi for wp8 only
2014-10-16 11:16:26 -07:00
Dale Stammen
53302789a0
added missing files
2014-10-16 11:16:02 -07:00
Dale Stammen
d5b0830c3b
added missing files
2014-10-16 11:15:39 -07:00
Dhilan007
5595947dc3
disable warn on zero-sized structure[android].
2014-10-16 21:41:52 +08:00
minggo
b4867bf6e5
Merge pull request #8715 from iSevenDays/v3
...
CMakes support for Mac Os X & iOS
2014-10-16 21:16:02 +08:00
minggo
07253cfb60
Merge pull request #8743 from andyque/removeWebView
...
remove UIWebView.cpp in win32
2014-10-16 21:06:53 +08:00
minggo
2d6bfc74ea
Merge pull request #8757 from 2youyouo2/v3
...
set tag for ActionTimeline
2014-10-16 21:05:38 +08:00
samuele3hu
4d75c977ca
Remove useless binding code for SkeletonAnimation
2014-10-16 20:53:40 +08:00
samuele3hu
7198ae509c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 20:35:43 +08:00
samuele3hu
c5f19c20ca
Add SpineConstants.lua
2014-10-16 20:24:47 +08:00
samuele3hu
079df20541
Update lua bindings for Spine and related test case
2014-10-16 20:23:58 +08:00
minggo
a92f485d71
Merge pull request #8754 from zawasp/decrease-logging-verbosity
...
decrease logging verbosity - CCFileUtils-android
2014-10-16 19:28:20 +08:00
pipu
20cb663746
Delete the blank block
2014-10-16 19:02:39 +08:00
kaile.yin
7faf2fe1e6
set tag for ActionTimeline
2014-10-16 18:14:58 +08:00
Mircea Rila
0678601f61
decrease logging verbosity - CCFileUtils-android
2014-10-16 13:03:39 +03:00
CocosRobot
4a084a4ebc
[AUTO]: updating luabinding automatically
2014-10-16 09:55:07 +00:00
minggo
064f0d9042
Merge pull request #8708 from dabingnn/v3_updateSpine
...
V3 update spine
2014-10-16 17:50:07 +08:00
pipu
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08:00
CocosRobot
c4985c45e4
[AUTO]: updating luabinding automatically
2014-10-16 08:55:11 +00:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
minggo
8c06d6b981
Merge pull request #8737 from samuele3hu/v3_rc_fix
...
Update the related cocosstudio lua test cases and lua-bindings
2014-10-16 16:28:31 +08:00
pipu
85bbcdd537
Deleting original code that parsing "Visible"
2014-10-16 16:26:46 +08:00
samuele3hu
8b5f6ae52a
Merge branch 'v3_updateSpine' of https://github.com/dabingnn/cocos2d-x into v3_new_spine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:04:09 +08:00
minggo
a4d31262ac
Merge pull request #8735 from dabingnn/v3_OptimizeQuadCommand
...
V3 optimize quad command
2014-10-16 16:01:37 +08:00
pipu
e77f7f02b0
Modify Reader:
...
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
2014-10-16 15:55:38 +08:00
samuele3hu
3ba1289710
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_rc_fix
2014-10-16 15:54:41 +08:00
samuele3hu
b4c91f0712
Update the related cocosstudio lua test cases
2014-10-16 15:51:01 +08:00
minggo
04839b0e8f
[ci skip]update version
2014-10-16 15:41:43 +08:00
Huabing.Xu
97aa69a7c2
works on no VAO devices
2014-10-16 15:33:31 +08:00
Huabing.Xu
90030140d5
fix some format problem
2014-10-16 14:56:17 +08:00
Huabing.Xu
93ea1b9078
separate trianglesCommand and QuadCommand
2014-10-16 14:15:29 +08:00
minggo
fef079aee6
Merge pull request #8682 from super626/fixbillboard
...
Fixbillboard
2014-10-16 12:04:50 +08:00
minggo
58480f8486
Merge pull request #8712 from pipu/v3_modify_warning_of_reader
...
Modifying warning of *Reader
2014-10-16 12:03:59 +08:00
CocosRobot
2bfad920ce
[AUTO]: updating luabinding automatically
2014-10-16 04:01:10 +00:00
samuele3hu
7fe2b6c0ad
Update the CCFileUtils.h
2014-10-16 11:07:15 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
samuele3hu
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
Anton Sokolchenko
a49b337bbc
Update CMakeLists.txt
2014-10-15 17:37:58 +03:00
Anton Sokolchenko
8f150f8610
revert default settings
2014-10-15 16:45:25 +03:00
Anton Sokolchenko
4f1430d25d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2014-10-15 16:36:18 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
minggo
68d58b05e9
Merge pull request #8700 from iSevenDays/v3
...
CMake fix for Mac Os X
2014-10-15 21:24:18 +08:00
Huabing.Xu
c12f88d63c
lua compiles ok-need to make it works later
2014-10-15 17:33:58 +08:00
pipu
d3f972c139
Modifying warning of *Reader
2014-10-15 17:20:54 +08:00
tangziwen
f7888d9798
tab style fix
2014-10-15 17:01:56 +08:00
yangxiao
9b4ec6dfe2
Merge branch 'newcode' into v3
2014-10-15 16:53:07 +08:00
tangziwen
6ed31fa47e
fix some dummy texture bugs , supply some comments
2014-10-15 16:25:14 +08:00
Huabing.Xu
8135b09c98
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-15 15:55:17 +08:00
minggo
16ad1977b0
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
...
Add clipping rectangle node
2014-10-15 15:09:29 +08:00
samuele3hu
6c79ce50d2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
tests/lua-tests/src/mainMenu.lua
2014-10-15 15:07:30 +08:00
samuele3hu
a0c8ffb943
Modify Xcode project’s configure
2014-10-15 14:32:11 +08:00
Huabing.Xu
85ba18b4db
spine works on windows now
2014-10-15 14:29:30 +08:00
SunLightJuly
74952d7258
added CCClippingRectangleNode.cpp to CMakeList
2014-10-15 14:17:04 +08:00
SunLightJuly
3352fb7bf3
reset wp8 project files
2014-10-15 14:14:02 +08:00
Huabing.Xu
f3d91d17ce
spine linux works now
2014-10-15 13:47:32 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
SunLightJuly
f2286eaf94
added ClippingRectangleNode
2014-10-15 13:38:14 +08:00