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
mannewalis
cb547413d2
fix range error on reporting all allocators
2014-12-13 11:45:08 -08:00
mannewalis
58be92b35f
added more diagnostic info.
...
still crashing, but only on device. Suspect a free(p) that was allocated with new.
2014-12-13 11:42:35 -08:00
mannewalis
e81e9a7f47
fixing some issues, still crashing, but want to keep changes.
2014-12-13 10:40:45 -08:00
mannewalis
7b2fea798a
add total count and fix remaining reporting issues
2014-12-12 17:16:44 -08:00
mannewalis
00da483e1b
minor changes
2014-12-12 14:54:24 -08:00
mannewalis
595b3c1cd2
some minor tweaks comments and logging
2014-12-12 10:54:59 -08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
youyou
579bb3f8d8
fixed frame event
2014-12-12 18:02:03 +08:00
minggo
cf8b6120a0
Merge pull request #9481 from super626/v3
...
CullFace state change bug and fix #9465
2014-12-12 15:48:31 +08:00
XiaoYang
b106b2f7ce
Merge pull request #175 from lvlonggame/v3
...
fix bug: same model in mirror state cullFace problem.
2014-12-12 09:52:01 +07:00
minggo
7acb8bfddf
Merge pull request #9477 from pipu/update_serialize_plist_file_name
...
Update that serialize plist file name and load plist file
2014-12-12 10:13:18 +08:00
pipu
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
minggo
93561fcb8e
[ci skip]update version
2014-12-11 18:14:28 +08:00
minggo
07c9251557
Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize
...
Fix UIText miss copy contentSize for clone
2014-12-11 17:55:32 +08:00
minggo
f0f393654e
Merge pull request #9459 from pipu/fix_#9457
...
Fixes #9457
2014-12-11 15:12:48 +08:00
minggo
d7c722c67f
Merge pull request #9455 from samuele3hu/v3_cocostudio
...
Add Websocket support for Mac platform
2014-12-11 15:12:10 +08:00
lvlong
d0ce99413d
fix bug: same model in mirror state cullFace problem.
2014-12-11 14:24:26 +08:00
Edward Zhou
1ca92411fc
Fix UIText miss copy contentSize for clone
2014-12-11 13:33:28 +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
minggo
a1c60bcf24
Merge pull request #9452 from minggo/java-style
...
[ci skip]use java coding style
2014-12-11 10:55:14 +08:00
minggo
48345a0d65
Merge pull request #9441 from pipu/update_reader
...
Update Reader
2014-12-11 10:02:38 +08:00
minggo
7c07bc6a90
Merge pull request #9449 from Dhilan007/v3-keycode
...
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-11 09:58:57 +08:00
samuele3hu
5d3008d6ac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
2014-12-11 09:51:18 +08:00
Sxd
5f47bef320
add stopActionByName()
2014-12-11 02:57:13 +08:00
minggo
1d1028a68b
Merge pull request #9410 from andyque/fixEditBox_v3
...
Fix edit box v3
2014-12-10 18:54:20 +08:00
minggo
0e7470505f
replace tab with 4 spaces
2014-12-10 18:32:58 +08:00
Dhilan007
8b78c181ce
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
2014-12-10 18:11:07 +08:00
minggo
77ed7a47e2
use java coding style
2014-12-10 18:07:46 +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
33a8c0d49b
Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129
...
[AUTO]: updating luabinding automatically
2014-12-10 11:15:09 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
andyque
989c05cd2d
add TextureResType to LoadingBar
2014-12-10 10:21:17 +08:00
samuele3hu
4b43fab3e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
...
# 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-12-09 21:03:01 +08:00
CocosRobot
b0aacdc287
[AUTO]: updating luabinding automatically
2014-12-09 10:34:49 +00:00
samuele3hu
7e8da62ebc
Add Websocket support for Mac platform
2014-12-09 18:29:20 +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
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
minggo
7749e11614
Merge pull request #9414 from CocosRobot/update_lua_bindings_1418033522
...
[AUTO]: updating luabinding automatically
2014-12-08 18:16:50 +08:00
CocosRobot
e510f24663
[AUTO]: updating luabinding automatically
2014-12-08 10:14:41 +00:00
minggo
dd5659b6eb
Merge pull request #9401 from minggo/iss9398-not-close-dir
...
invoke closedir after invoke opendir
2014-12-08 18:10:41 +08:00
minggo
b6b9a5013f
Merge pull request #9404 from super626/v3
...
bug fix
2014-12-08 18:08:25 +08:00
pipu
56a25a2644
Update reader
2014-12-08 15:48:24 +08:00
andyque
119a68afd9
fix EditBox move animation position is wrong on iPhone6 Plus
2014-12-08 15:34:58 +08:00
andyque
d53d71610b
Merge branch 'v3' into fixEditBox_v3
2014-12-08 15:20:06 +08:00
pipu
c3365a4654
Add interface that create node with flat buffers object for simulator
2014-12-08 14:32:33 +08:00
minggo
3dd68b47b3
Merge pull request #9390 from liamcindy/UIReader
...
update for cocos reader
2014-12-08 14:25:57 +08:00
minggo
c067338c17
closedir when succeed
2014-12-08 11:36:11 +08:00
XiaoYang
a59d4ab2a3
Merge pull request #171 from tangziwen/v3
...
let billboard can rotate in the Z axis
2014-12-08 09:34:58 +07:00
yangxiao
a1ec27d0b1
calculate aabb if not exist
2014-12-08 10:30:06 +08:00
minggo
74c80296aa
invoke closedir after invoke opendir
2014-12-08 09:58:58 +08:00
Dale Stammen
1d908f94ab
fixed renameFile for wp8 and winrt to pass file and assetmangers tests
2014-12-05 18:12:25 -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
yangxiao
2a445ef1d9
correct unsuitable word
2014-12-05 16:44:49 +08:00
yangxiao
11d9f27c00
createAsync comment
2014-12-05 16:11:14 +08:00
yangxiao
5bc74e55df
modify comment
2014-12-05 15:59:21 +08:00
yangxiao
b665daf2f8
add comment
2014-12-05 15:55:01 +08:00
yangxiao
3439b7f68d
refactor async load callback funtion
2014-12-05 15:48:46 +08:00
yangxiao
60e1b54b1a
fix ~ThreadTasks() bug
2014-12-05 15:25:56 +08:00
yangxiao
c99185b755
add async load test
2014-12-05 15:01:30 +08:00
minggo
959f04cb20
Merge pull request #9378 from lite3/patch-1
...
print more info
2014-12-05 09:30:10 +08:00
minggo
68370ca229
Merge pull request #9381 from pipu/modify_bugs_for_flatbuffers
...
Modify bugs for flatbuffers
2014-12-05 09:28:19 +08:00
Huabing.Xu
697e1fd75e
Merge pull request #9377 from dabingnn/v3.3Perf
...
performance improvement
2014-12-04 21:08:24 +08:00
pipu
56f7895e27
Modify bugs for flatbuffers
2014-12-04 20:38:46 +08:00
lite3
8df8ee36db
print more info
2014-12-04 19:18:54 +08:00
Huabing.Xu
27ff06b1d2
performance improvement
2014-12-04 18:37:57 +08:00
yangxiao
bc57e47ddb
add async task callback dipatcher, call it in the main thread
2014-12-04 18:31:10 +08:00
minggo
fcfd33947f
[ci skip]
2014-12-04 15:36:09 +08:00
tangziwen
8605595a5b
let billboard can rotate in the Z axis
2014-12-04 15:19:41 +08:00
minggo
0d89b9b742
Merge pull request #9368 from huangshiwu/v3_wincpu
...
fix win32 high cpu occupancy rate
2014-12-04 15:17:26 +08:00
minggo
0badda268a
Merge pull request #9366 from Dhilan007/v3-33rc1
...
Fixed label may show nothing when using system font on Mac
2014-12-04 15:11:50 +08:00
minggo
8cd8a6d7b9
Merge pull request #9365 from andyque/updateExternalConfig
...
update external config to v3-deps-28.zip
2014-12-04 15:09:02 +08:00
huangshiwu
1212b4a6e9
fix win32 high cpu occupancy rate
2014-12-04 14:33:17 +08:00
andyque
8a5c78b213
update external config to v3-deps-28.zip and update cocos2d-x version to rc2
2014-12-04 14:23:44 +08:00
minggo
7fd037c416
Merge pull request #9359 from super626/v3
...
Initialize variable when defined
2014-12-04 13:40:21 +08:00
CocosRobot
0c54f8f7a0
[AUTO]: updating luabinding automatically
2014-12-04 02:11:58 +00:00
yangxiao
f17df4b0bc
add createAsync
2014-12-03 17:40:27 +08:00
Wenhai Lin
ed86f65270
Fixed label may show nothing when using system font on Mac
2014-12-03 17:07:51 +08:00
tangziwen
da8dc13601
avoid the case that "hasAmbient" use before assign
2014-12-03 16:00:52 +08:00
pipu
6d764bc2c8
Merge branch 'v3' into v3_flatbuffers
...
Conflicts:
tools/cocos2d-console
2014-12-03 15:47:03 +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
minggo
0d1baf4037
Merge pull request #9327 from samuele3hu/v3_manual_bindings
...
Add more useful trace back info when got invalid arguments by calling functions
2014-12-03 14:17:16 +08:00
minggo
77b5c40283
Merge pull request #9224 from pjc0247/v3
...
fix C4129 warning
2014-12-03 14:15:38 +08:00
minggo
4bee194a0b
Merge pull request #9285 from huangshiwu/v3_drawpolygon
...
DrawNode::drawPolygon refactor
2014-12-03 14:06:48 +08:00
minggo
2e45d7d0d6
Merge pull request #9302 from samuele3hu/v3_test
...
Fix some errors about cpp-tests and lua-tests
2014-12-03 14:05:50 +08:00
minggo
f13f649a7b
Merge pull request #9306 from super626/v3
...
refactor bundle
2014-12-03 14:04:59 +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
minggo
4d2ea40db0
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
...
Fix label crashed on android #9255
2014-12-02 15:48:10 +08:00
Wenhai Lin
1bfdd757a2
Fixed fail to play background music again after invoking stopBackgroundMusic
2014-12-02 15:03:26 +08:00
pipu
26a6c9a724
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
2014-12-02 12:30:34 +08:00
pipu
915449f77a
Modify UICheckBox
2014-12-02 12:23:15 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +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
samuele3hu
1da44b0897
Add more useful trace back info when got invalid arguments by calling functions
2014-12-01 15:53:41 +08:00
zhounan
7ffc6f9784
Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters
2014-12-01 13:18:57 +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
Park June Chul
9b792d97c4
Merge pull request #2 from cocos2d/v3
...
update project
2014-11-28 22:52:13 +09:00
samuele3hu
802ba311d6
Fix the error that SpritePerformanceTest lua does’t work
2014-11-28 11:54:38 +08:00
minggo
9894c738c1
Merge pull request #9294 from starwing/check_settexture
...
nullptr check when Sprite::setTexture with non-exists file
2014-11-28 10:19:01 +08:00
Ricardo Quesada
fe4b34fcc3
Merge pull request #9260 from ricardoquesada/sprite_perf_test_automated
...
Sprite Performance Test automation works OK
2014-11-27 10:06:10 -08:00
CocosRobot
f0c31172b8
[AUTO]: updating luabinding automatically
2014-11-27 13:39:15 +00:00
Dale Stammen
117d7bd5e8
fixed universal app project files for flatbuffers
2014-11-27 05:34:36 -08:00
Dale Stammen
267edeafd3
fixed wp8 project files for flatbuffers
2014-11-27 05:22:07 -08:00
Dale Stammen
301e947c37
no initialization list for WP8
2014-11-27 05:21:04 -08:00
StarWing
d5125ae179
nullptr check when Sprite::setTexture with non-exists file
2014-11-27 21:15:09 +08:00
minggo
dcc517e8d4
Merge pull request #9267 from samuele3hu/v3_strip
...
Adjust binding structure to decrease the package size of lua_empty_test
2014-11-27 20:21:06 +08:00
pipu
1633b7f475
Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters
2014-11-27 20:02:03 +08:00
samuele3hu
ed573149dd
Resolve the project setting error on the platforms
2014-11-27 19:42:32 +08:00
zhangcheng
12a5443834
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
2014-11-27 18:34:18 +08:00
zhangcheng
0c89db7675
Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp
2014-11-27 18:32:35 +08:00
huangshiwu
b866a58fc4
DrawNode::drawPolygon refactor
2014-11-27 18:31:04 +08:00
pipu
48f280b478
Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1
2014-11-27 18:27:22 +08:00
andyque
1bb60ab4bb
add null pointer check, make code more robust
2014-11-27 18:25:13 +08:00
lvlong
82241a74dd
fix bug: if the material's content that version 0.1 is empty.
2014-11-27 17:31:22 +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
Ricardo Quesada
bfb79b6a9e
CCRANDOM_() uses std::rand() because it can be seeded with std::srand()
...
plus other minor fixes in perf tests
2014-11-26 20:07:42 -08:00
Shrimpz
38a6aa30a2
* fixed android crash that a Label instance add to an invisibility parent node.
2014-11-27 10:59:47 +08:00
CocosRobot
36a5a170d2
[AUTO]: updating luabinding automatically
2014-11-27 02:55:33 +00:00
samuele3hu
dc00158d72
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-27 10:44:56 +08:00
CocosRobot
3ed78b820e
[AUTO]: updating luabinding automatically
2014-11-27 02:02:29 +00:00
minggo
e8cff91bd7
Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue
...
Fix text ignore content size issue
2014-11-27 09:57:33 +08:00
Ricardo Quesada
96e089be76
Sprite Performance Test automation works OK
2014-11-26 16:55:39 -08:00
Ricardo Quesada
1361f2c619
Director users a low-pass filter to display the FPS
...
FPS is more stable. Uses a 5% low-pass filter
2014-11-26 13:31:44 -08:00
samuele3hu
9fbf87c6db
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip
2014-11-26 21:59:57 +08:00
samuele3hu
222f2cbd51
Decrease the package size of lua_empty_test
2014-11-26 21:54:18 +08:00
minggo
51b4736740
Merge pull request #9149 from samuele3hu/v3_compile_binary
...
Resolve the bugs that XmlHttpRequest would truncate binary data
2014-11-26 20:05:21 +08:00
andyque
e118b085b8
add UIText bug fix tests
2014-11-26 15:05:20 +08:00
minggo
e93ff4f5b7
Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios
...
eaglview release leak in CCEAGLViewImpl-ios
2014-11-26 13:54:49 +08:00
minggo
4e84b4d4f6
Merge pull request #9130 from samael65535/patch-1
...
Add shader linking log
2014-11-26 13:51:15 +08:00
minggo
d7de8a48a3
Merge pull request #9241 from dumganhar/iss8988-left-ctrl
...
issue #8988 : Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
2014-11-26 13:47:36 +08:00
andyque
a2883aa097
fix UIText dimension error when set ignoreContentSize to false
2014-11-26 13:41:24 +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
minggo
5d58ffc5ab
Merge pull request #9212 from Dhilan007/v3-fontfnt-crash
...
Fix crash when missing image resource of FNT font.
2014-11-26 11:48:53 +08:00
minggo
dbb473fdcb
Merge pull request #9203 from dumganhar/arm64-juno
...
Some updates for neon64 instruction
2014-11-26 11:46:19 +08:00
yangxiao
35020c7c71
async task pool
2014-11-26 11:28:14 +08:00
CocosRobot
39c2c8a2cb
[AUTO]: updating luabinding automatically
2014-11-26 03:20:28 +00:00