yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
youyou
70052b2a3f
support animation list
2014-12-22 18:57:48 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
Liam
ce9f269680
update object reader for new lay out system
2014-12-22 15:38:47 +08:00
minggo
6ac611bd1d
Merge pull request #9573 from pipu/update_parse_resource_path
...
Update that parse resource path with flat buffers for readers
2014-12-22 15:11:24 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
pipu
0c6e22dd77
Update that parse resource path with flat buffers for readers
2014-12-22 13:42:18 +08:00
kaile.yin
a8dd2a4e80
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
2014-12-22 11:15:07 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
minggo
8f3e9d9fb1
Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers
...
Update that avoid crash during load resource which serialize by flat buffers.
2014-12-19 09:58:26 +08:00
pipu
79acf80fb1
Update that avoid crash during load resource which serialize by flat buffers
2014-12-17 19:00:24 +08:00
minggo
9da1317f10
Merge pull request #9453 from sxd1140/v3
...
add stopActionByName()
2014-12-17 18:32:04 +08:00
minggo
b3731fa06a
Merge pull request #9486 from 2youyouo2/v3_EventFrame
...
fixed frame event
2014-12-16 09:53:43 +08:00
youyou
69824ff07b
add space for readable
2014-12-15 09:36:21 +08:00
Vladimir Timofeev
be01bede63
Fix couple of warnings. Make forward declarations to match to real declarations.
2014-12-14 21:04:14 +03:00
Vladimir Timofeev
6494a7abae
Hide tinyxml2 from user visible header.
2014-12-14 20:32:24 +03:00
Vladimir Timofeev
9bd1ab74c7
Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory.
...
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
2014-12-14 12:14:16 +03:00
youyou
579bb3f8d8
fixed frame event
2014-12-12 18:02:03 +08:00
pipu
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08:00
Sxd
5f47bef320
add stopActionByName()
2014-12-11 02:57:13 +08:00
pipu
d3351a4b11
1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic.
...
2. Update how to parse attribute scale9Enabled
2014-12-10 17:35:39 +08:00
pipu
e81dca372a
Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader
2014-12-10 15:46:58 +08:00
pipu
6b6fe4129d
Update Reader
2014-12-10 12:36:14 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
youyou
41c86de0d4
update csloader
2014-12-09 22:13:17 +08:00
kaile.yin
9fdd8cee06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-09 16:03:33 +08:00
pipu
f54254494c
Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp
2014-12-09 15:13:09 +08:00
minggo
5ab4f16fb1
Merge pull request #9411 from pipu/v3_reader_update
...
V3 reader update
2014-12-09 13:44:55 +08:00
kaile.yin
cb509aa69f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-09 13:33:39 +08:00
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
pipu
56a25a2644
Update reader
2014-12-08 15:48:24 +08:00
pipu
c3365a4654
Add interface that create node with flat buffers object for simulator
2014-12-08 14:32:33 +08:00
Liam
e4b6a2bf57
update for cocos reader
2014-12-05 19:43:40 +08:00
yusheng.lu
2f456a5668
ListViewReader completed and listview callback feature.
2014-12-05 19:31:10 +08:00
Liam
be929dcde6
update for cocos reader
2014-12-05 19:19:53 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
youyou
0235c4c377
change head file
2014-12-05 00:10:42 +08:00
pipu
56f7895e27
Modify bugs for flatbuffers
2014-12-04 20:38:46 +08:00
kaile.yin
9f9c4782f1
change file name
2014-12-04 18:51:32 +08:00
kaile.yin
a6653c7d8d
change name
2014-12-04 18:50:00 +08:00
kaile.yin
3f1cb4338a
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
2014-12-04 15:33:38 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
youyou
4af869fdeb
update make file
2014-12-03 18:47:41 +08:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
pipu
6a64b867df
Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader
2014-12-03 15:24:21 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
pipu
ec978905d7
Modify that load .csb file serialized by flat buffers
2014-12-03 10:54:16 +08:00
pipu
fc97a3d0c6
Modify serialize property "value" of VisibleFrame
2014-12-02 16:11:46 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +08:00
pipu
57dbb214ca
Modify that serialize "percent" default property for SilderReader
2014-12-01 19:58:48 +08:00
pipu
69729bcd65
Add that parse "color" in NodeReader
2014-12-01 16:27:21 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
1447919be1
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
2014-12-01 11:49:11 +08:00
pipu
27261ddcc0
Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader
2014-12-01 11:48:04 +08:00
Dale Stammen
301e947c37
no initialization list for WP8
2014-11-27 05:21:04 -08:00
pipu
5d3d839886
Update Android.mk for cocostudio
2014-11-27 17:28:20 +08:00
pipu
ce3ca169d7
Modify that calls createNodeFromProtocolBuffers() for CSLoader
2014-11-27 17:23:22 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
pipu
e1c287d500
Modify that parse "actionTag" for WidgetReader
2014-11-27 12:12:29 +08:00
pipu
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
pipu
6b999d53f3
Modify that declare and definition that function return value of createNodeWithFlatBuffers() for all kinds of "NodeReader"
2014-11-26 11:50:42 +08:00
kaile.yin
2a86677619
fixed setCurrentFrame
2014-11-24 10:49:22 +08:00
youyou
966100a511
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-11-24 10:35:51 +08:00
pipu
5d50a8ef92
Modify that initialize Color4B for WidgetReader
2014-11-21 19:36:20 +08:00
zhangcheng
32ce3dca2e
1, Update windows project.
2014-11-21 18:12:46 +08:00
pipu
6be17520c7
Config android, linux, wp8
2014-11-21 18:08:09 +08:00
pipu
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
minggo
340e21d57e
Merge pull request #9050 from joewan/fix-armature-spriteframe
...
fix sprite frame cache, and remove unnecessary headers dependencies.
2014-11-20 10:54:30 +08:00
youyou
769b2cbc75
add file to mac project
2014-11-19 20:06:10 +08:00
joewanchen
7c4355c60d
rename functions.
2014-11-19 15:27:55 +08:00
kaile.yin
d764c18271
update Android.mk
2014-11-19 10:57:22 +08:00
Vladimir Timofeev
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08:00
Vladimir Timofeev
27ef26270c
Unify TinyXML2 usage.
...
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
2014-11-15 14:43:50 +03:00
minggo
d6eea4dc3c
Merge pull request #9037 from G17hao/patch-8
...
Update CCBone.cpp
2014-11-13 18:46:48 +08:00
minggo
6c67c6921d
Merge pull request #8977 from pipu/v3_Modify_TextReader
...
Modify that parsing attribute "fontName" of TextReader
2014-11-11 12:05:49 +08:00
minggo
e7d5e79e88
Merge pull request #8998 from aeonmine/v3
...
fix memory leak cocos studiov2.0 engine v3.3
2014-11-09 23:24:16 +08:00
joewanchen
c4b1aeb0ec
fix momery leak (partly fix, memory leak still exist).
2014-11-07 11:43:55 +08:00
joewanchen
b05f558214
fix compile error.
2014-11-07 10:14:07 +08:00
joewanchen
b682438b68
revert some modifications.
2014-11-07 09:17:32 +08:00
joewanchen
c2b97a3b13
fix sprite frame cache, and remove unnecessary headers dependencies.
...
we should add private headers for ccs, do not expose privae headers to users.
2014-11-07 09:13:59 +08:00
G17hao
c7f5c3052d
Update CCBone.cpp
...
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
2014-11-06 17:51:19 +08:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
minggo
98073632d4
Merge pull request #8908 from zawasp/v3-source
...
fix some warnings / remove TABs
2014-11-05 13:39:20 +08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
峰 正博
828715ab8b
;; -> ;
2014-11-04 11:54:48 +09:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
峰正博
85fb2c91ab
fix memory leak cocos studiov2.0 engine v3.3
2014-11-04 01:25:58 +09:00
minggo
d0edba2db3
Merge pull request #8975 from 2youyouo2/v3_EventFrame
...
update event frame
2014-10-31 10:32:53 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
pipu
2ed51e042d
Modify that parsing attribute "fontName" of TextReader
2014-10-30 18:00:03 +08:00
kyokomi
2b4cf9ae59
bugfix: setting forget the contentSize.
2014-10-29 19:38:12 +09:00
kaile.yin
dd517813a8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-25 23:02:38 +08: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
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
minggo
47697daf03
remove unneeded codes
2014-10-21 17:28:14 +08:00
minggo
db8dc25b01
fix warning
2014-10-21 11:40:34 +08:00
minggo
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +08:00
minggo
49bd79d14a
Merge pull request #8853 from 2youyouo2/v3_EventFrame
...
fixed emit frame event
2014-10-20 13:57:38 +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
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
7e6ee9c15a
Merge pull request #8801 from 2youyouo2/v3
...
add deprecated information for Armature::drawContour
2014-10-17 23:02:49 +08:00
kaile.yin
5b0e2f0304
fixed emit last frame several times
2014-10-17 20:43:01 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
youyou
351ef8ea66
add DEPRECATED deprecated information for Armature::drawContour
2014-10-17 16:28:37 +08:00
minggo
18ca7c936c
Merge pull request #8768 from Dhilan007/v3-33rc
...
Improve Android.mk
2014-10-17 14:09:49 +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
Dale Stammen
53302789a0
added missing files
2014-10-16 11:16:02 -07:00
minggo
2d6bfc74ea
Merge pull request #8757 from 2youyouo2/v3
...
set tag for ActionTimeline
2014-10-16 21:05:38 +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
pipu
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08: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
pipu
85bbcdd537
Deleting original code that parsing "Visible"
2014-10-16 16:26:46 +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
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
pipu
d3f972c139
Modifying warning of *Reader
2014-10-15 17:20:54 +08:00
Huabing.Xu
85ba18b4db
spine works on windows now
2014-10-15 14:29:30 +08:00
Huabing.Xu
f3d91d17ce
spine linux works now
2014-10-15 13:47:32 +08:00
Huabing.Xu
c882fc02f1
spine runs on android platform
2014-10-15 13:35:22 +08:00
Huabing.Xu
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08:00
Dale Stammen
94f53ecaa3
added universal app project files
2014-10-14 16:30:23 -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
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
andyque
96660cb653
fix linux compile
2014-10-13 18:19:49 +08:00
pipu
a8febf9656
1. update wp8 projects.
2014-10-13 15:31:29 +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
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
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
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
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
pipu
ffd83bbdd0
Modifying win32 and wp8 protocol buffers lib
2014-10-10 22:38:34 +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
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
pipu
d699b5809b
Modifying libprotocolbuf.a as protocolbuffer.a
2014-10-10 12:52:42 +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
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
martell
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +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
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
Frank.Xu
1c1d917620
Fix pull request #6894 merge conflicts
2014-09-29 16:22:55 +08:00
andyque
c9b959ec82
replace raw string literal with const external variables to keep consistence.
2014-09-29 11:35:03 +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
Hong Liang
9448345de3
bugfix for UI animation playing crash if GUI JSON file is loaded again.
2014-09-26 11:29:48 +08:00
yestein
b19b2c5786
replace tab to 4 spaces
2014-09-24 15:14:47 +08:00
yestein
72c5d77273
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-24 11:20:36 +08:00
andyque
d4b2e8d154
remove deprecated warning
2014-09-12 17:06:13 +08:00
andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07: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
minggo
659ba68199
Merge pull request #7942 from andyque/deleteRedundantCode
...
remove dead code
2014-09-04 13:45:12 +08:00
minggo
6539ff293d
Merge pull request #7940 from andyque/fixVs2013CompileError
...
Fix vs2013 compile error
2014-09-04 13:41:15 +08:00
andyque
a1edd4a819
remove dead code
2014-09-04 11:00:48 +08:00
minggo
99f3b371ed
Merge pull request #7744 from lite3/customguireader
...
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
2014-09-04 10:53:00 +08:00
andyque
87af0ecdd6
add back libbox2d and libspine project to our solution
2014-09-03 17:37:34 +08:00
lite3
74d8bf6f27
fix
2014-09-02 10:51:17 +08:00
andyque
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
Ricardo Quesada
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
minggo
444b298028
fix compiling error on windows
2014-08-29 16:44:20 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
lite3
2b6bdac05d
Merge branch 'v3' into customguireader
2014-08-28 15:13:10 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
minggo
f0f1bf1b92
Merge pull request #7883 from giginet/set-node-name-via-ccs-scene
...
Add the feature that CCSSceneReader can load name properties as node names.
2014-08-28 11:14:15 +08:00
minggo
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
Dhilan007
837e8665b5
remove redundant LOCAL_STATIC_LIBRARIES
2014-08-28 09:46:09 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
Dhilan007
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
Dhilan007
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
samuele3hu
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
minggo
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
samuele3hu
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
samuele3hu
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
giginet
d07903827d
Add the feature that CCSSceneReader can load name properties as node names.
...
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.
Thanks to this commit. We are enable to access to each nodes on scene via its names.
```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
2014-08-27 03:49:07 +09:00
minggo
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
minggo
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
samuele3hu
70cba1f64a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
cocos/Android.mk
2014-08-22 14:01:17 +08:00
samuele3hu
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
minggo
a0b19db670
Merge pull request #7840 from minggo/fix-warning
...
fix warnings
2014-08-22 13:41:31 +08:00
minggo
2afbc7a698
fix warnings
2014-08-21 16:21:23 +08:00
pandamicro
34b93a24ff
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
...
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
2014-08-21 16:07:19 +08:00
pandamicro
9544482058
Fix Android.mk s
2014-08-21 15:40:42 +08:00
pandamicro
485dd1f7da
Update #3897 : Refactor missed protected constructors
2014-08-21 15:40:22 +08:00
lite3
679d525453
Merge branch 'v3' into customguireader
2014-08-21 01:22:07 +08:00
lite3
9f348962c7
Merge branch 'v3' into customguireader
2014-08-21 00:18:30 +08:00
minggo
74fba21fc0
Merge pull request #7825 from 2youyouo2/v3
...
remove cascade color for CorlorFrame
2014-08-20 10:23:15 +08:00
minggo
cdd67be77a
use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES
2014-08-19 15:29:40 +08:00
kaile.yin
d884054ec9
remove cascade color for CorlorFrame
2014-08-19 15:19:47 +08:00
kaile.yin
6abaf27b14
fixed ArmatureAnimation::setSpeedScale
2014-08-18 16:19:54 +08:00
Daisuke Hashimoto
5b620fbfe1
use fileName for _actionDic key
2014-08-14 21:10:51 +09:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
lite3
8f59d8ac93
add GUIReader::registerTypeAndCallBack for std::function
2014-08-12 17:19:52 +08:00
lite3
69e2b815ed
fix: copy map when getParseCallBackMap() and getParseObjectMap()
2014-08-12 17:05:23 +08:00
kaile.yin
358b1f6736
fixed bone rotation isn't right
2014-08-11 19:53:51 +08:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
kaile.yin
3dcdb1cde4
remove some update condition of Frame::apply function
2014-08-01 14:40:42 +08:00
kaile.yin
2fc082cac1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-31 17:52:49 +08:00
kaile.yin
170e1a5d7b
init widget properties
2014-07-31 17:48:45 +08:00
Huabing.Xu
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
Huabing.Xu
c722c0fcd0
libcocostudio for windows
2014-07-29 11:31:37 +08:00
Huabing.Xu
e91fa0e9fc
libcocosbuilder rename for windows
2014-07-29 11:09:02 +08:00
Huabing.Xu
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
Huabing.Xu
bf287252df
change libnetwork and libSpine
2014-07-29 09:31:52 +08:00
Huabing.Xu
d6bc2f4998
liuGUI->libui for windows
2014-07-28 22:12:07 +08:00
Huabing.Xu
c6956504bf
change CocosDenshion to libcocosdenshion
2014-07-28 21:35:16 +08:00
Huabing.Xu
8f9ce2e282
change cocosbuilder to lowercase
2014-07-28 21:09:43 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
Huabing.Xu
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
minggo
fa1d9ecf0c
Merge pull request #7568 from 2youyouo2/v3
...
fixed init Armature blendfunc state
2014-07-24 17:44:56 +08:00
Huabing.Xu
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
kaile.yin
3b1ee96aef
fixed armature blendfunc effect
2014-07-23 21:35:08 +08:00
kaile.yin
01d85340ad
fixed black edge in Armature
2014-07-23 20:07:33 +08:00
Huabing.Xu
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
kaile.yin
bdad6d9b67
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-23 15:24:36 +08:00
kaile.yin
5aae024a7b
fixed cannot set blendfunc to Armature
2014-07-23 15:21:20 +08:00
minggo
2e56a4ce21
Merge pull request #7546 from nutty898/v3_nutty_modifynodereader
...
Fixed bug of NodeReader
2014-07-22 18:34:36 +08:00