Dale Stammen
|
88da5d5fdb
|
disabled custom shader tests for WP8
|
2014-07-17 08:13:49 -07:00 |
andyque
|
7ff78c61ba
|
fix richText UTF8
|
2014-07-17 18:36:09 +08:00 |
minggo
|
578af01ef1
|
Merge pull request #7499 from andyque/fixRichTextUTF8
fix richText utf8 error
|
2014-07-17 17:57:41 +08:00 |
andyque
|
fc2ab110cc
|
fix richText utf8 error
|
2014-07-17 17:58:40 +08:00 |
zhangcheng
|
6d0bf8e143
|
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
|
2014-07-17 17:25:32 +08:00 |
zhangcheng
|
24d87ad05b
|
1. fixes ActionManagerEx crashes.
|
2014-07-17 17:24:41 +08:00 |
minggo
|
c482e2e14f
|
Merge pull request #7491 from Dhilan007/v3-320final
fixed text line wrap issue in UITextField.
|
2014-07-17 16:48:41 +08:00 |
Dhilan007
|
8ac1398037
|
fixed text line wrap issue in UITextField.
|
2014-07-17 16:23:38 +08:00 |
geron-cn
|
4e9a710053
|
fix binary test crash bug
|
2014-07-17 16:16:49 +08:00 |
geron-cn
|
441f0ebca8
|
fix binary test crash bug
|
2014-07-17 16:13:12 +08:00 |
geron-cn
|
1a2caaeebf
|
fix binary test crash bug
|
2014-07-17 16:09:17 +08:00 |
geron-cn
|
8212ed3822
|
fix binary test crash bug
|
2014-07-17 16:01:03 +08:00 |
andyque
|
4f5cd2a368
|
change FastTileMap to TileMap
|
2014-07-17 14:09:53 +08:00 |
minggo
|
c6349ef246
|
Merge pull request #7480 from visiblelight/wp8_fast_tmx_fix
disable FastTileMapTest on WP8
|
2014-07-17 13:35:52 +08:00 |
vision
|
c29766a4ad
|
disable FastTileMapTest on WP8
|
2014-07-17 12:56:58 +08:00 |
minggo
|
5a5b245e84
|
Merge pull request #7474 from andyque/fixFastTileMap
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:52:40 +08:00 |
andyque
|
880c2c4c3f
|
change FastTiledMap namespace to cocos2d::experimental
|
2014-07-17 10:46:20 +08:00 |
minggo
|
4c7d777f25
|
Merge pull request #7471 from visiblelight/wp8_shader_update
Wp8 shader update
|
2014-07-17 10:14:54 +08:00 |
vision
|
40951d586c
|
update
|
2014-07-17 10:10:33 +08:00 |
vision
|
c47d844d20
|
update the buildin shaders on WP8. Disable the effect 3d test.
|
2014-07-17 10:08:49 +08:00 |
minggo
|
a653d0eb28
|
Merge pull request #7440 from boyu0/add_utils_atof
Add utils::atof(), fix bug: particle not shown on android.
|
2014-07-17 09:59:15 +08:00 |
zhangbin
|
7e7c3a1e55
|
Merge branch 'v3' into android-dependencies
|
2014-07-16 13:49:20 +08:00 |
zhangcheng
|
8bf4c8b6c9
|
1. Fixes CCTimeLine warning.
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
|
2014-07-15 18:07:33 +08:00 |
andyque
|
714048059c
|
fix loading bar switch loading method issue
|
2014-07-15 17:03:35 +08:00 |
andyque
|
52596dc97f
|
fix Text line wrap issue
|
2014-07-15 11:46:53 +08:00 |
boyu0
|
c7fec217ba
|
Change atof() to utils::atof()
|
2014-07-14 20:45:24 +08:00 |
minggo
|
6d063fb97b
|
Merge pull request #7431 from andyque/addTextFieldTTFTest
add TextField TrueTypeFont tests
|
2014-07-14 16:31:36 +08:00 |
Dhilan007
|
a5317dde87
|
fixed using the incorrect res in test case of 'TextureMemoryAlloc'.
|
2014-07-14 15:50:20 +08:00 |
andyque
|
4fe3723edf
|
add TextField TrueTypeFont tests
|
2014-07-14 14:29:28 +08:00 |
zhangbin
|
b0c465d96b
|
Adjust the dependencies between modules on android.
|
2014-07-14 09:48:16 +08:00 |
minggo
|
3b59b41116
|
3D:Sprite3D -> Node:Sprite3D
|
2014-07-12 22:26:46 +08:00 |
vision
|
7495a611ea
|
fix conflict
|
2014-07-11 16:03:40 +08:00 |
Dhilan007
|
d8cdb75851
|
Fix compile errors on WP8
|
2014-07-11 15:10:19 +08:00 |
andyque
|
74772e97c9
|
fix linux compile error
|
2014-07-11 14:17:57 +08:00 |
andyque
|
43255e2b96
|
Merge branch 'v3' into addStudio1.4
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
|
2014-07-11 13:55:13 +08:00 |
andyque
|
646f7c7e3f
|
Merge branch 'v3' into addStudio1.4
|
2014-07-11 13:39:34 +08:00 |
minggo
|
6c37541657
|
Merge pull request #7363 from Dhilan007/v3-event-clear
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
|
2014-07-11 13:36:52 +08:00 |
minggo
|
4895e6d54a
|
Merge pull request #7362 from geron-cn/chukongv3
Chukongv3
|
2014-07-10 21:17:19 +08:00 |
andyque
|
f76f71eb5d
|
fix win32 & win8 compile error
|
2014-07-10 16:37:15 +08:00 |
andyque
|
eec40ff2a8
|
fix linux and android compile
|
2014-07-10 16:37:15 +08:00 |
andyque
|
6de47ea53a
|
update ccs-res and add custom ImageView and custom particle widget support
|
2014-07-10 16:37:15 +08:00 |
andyque
|
afe5e7527a
|
update cocostudio resource path
|
2014-07-10 16:37:15 +08:00 |
andyque
|
8b42eb4ce9
|
add Cocostudio 1.3,1.4, 1.5 ui tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
41ccd5e465
|
add v1.4 tests
|
2014-07-10 16:37:15 +08:00 |
andyque
|
937b0ab52a
|
add cocostudio parser test template
|
2014-07-10 16:37:15 +08:00 |
minggo
|
831b0b332b
|
Merge pull request #7371 from minggo/enumerateChildren-fix
Node::enumerateChildren just searches from itself
|
2014-07-10 15:46:04 +08:00 |
minggo
|
c7856b21fd
|
Merge pull request #7366 from Dhilan007/v3-fixed-warn
fixed warn and replace NULL with nullptr.
|
2014-07-10 15:42:02 +08:00 |
gero
|
01e1508239
|
Merge pull request #3 from cocos2d/v3
merge V3
|
2014-07-10 11:33:59 +08:00 |
geron-cn
|
5b7852c5f6
|
update ccs-res hd csbs
|
2014-07-10 11:17:01 +08:00 |
minggo
|
316564d58a
|
Node::enumerateChildren just searches from itself
|
2014-07-10 11:07:39 +08:00 |
Dhilan007
|
6cff8cb564
|
fixed warn and replace NULL with nullptr.
|
2014-07-10 00:45:27 +08:00 |
Dhilan007
|
dbcb20b886
|
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
Make clear EVENT_COME_TO_FOREGROUND event.
|
2014-07-09 23:03:04 +08:00 |
geron-cn
|
2a64bd8945
|
udpate ccs-res
|
2014-07-09 18:35:10 +08:00 |
geron-cn
|
cd84081c37
|
udpate ccs-res
|
2014-07-09 18:02:17 +08:00 |
yangxiao
|
7b35f36ba3
|
Merge branch 'newcode' into v3
|
2014-07-09 09:56:23 +08:00 |
yangxiao
|
90b6841e25
|
adjust api according feedback
|
2014-07-09 09:53:15 +08:00 |
pandamicro
|
85d29ec803
|
Refactor #5580: Refactor Hungary style code in test case
|
2014-07-09 09:52:21 +08:00 |
minggo
|
0f7968de89
|
Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
|
2014-07-08 22:09:50 +08:00 |
minggo
|
f7af8938bd
|
Merge pull request #7277 from darkdukey/fix_rotation3D
Fix setRotation3D
|
2014-07-08 22:05:27 +08:00 |
andyque
|
2a2184331e
|
fix opacity issue when replace Widget textures
|
2014-07-08 11:30:27 +08:00 |
yangxiao
|
b19ca902ce
|
Merge branch 'newcode' into v3
|
2014-07-08 11:19:26 +08:00 |
yangxiao
|
75ee088631
|
resolve conflict Bone in cocos2d and cocostudio
|
2014-07-08 11:03:29 +08:00 |
minggo
|
3344ebbcdd
|
Merge pull request #7267 from andyque/addBinaryFileTests
add tests to GUI
|
2014-07-08 09:51:17 +08:00 |
lvlong
|
70b9d9b9ac
|
delete cube_anim
|
2014-07-07 17:11:37 +08:00 |
andyque
|
9a77ea9d57
|
add nested layout
|
2014-07-07 15:48:50 +08:00 |
andyque
|
6f33e4b84f
|
add UIPageView button tests
|
2014-07-07 15:31:06 +08:00 |
minggo
|
8b00e72f33
|
Merge pull request #7311 from andyque/fixWindowsError
fix windows compile and running error
|
2014-07-04 13:44:55 +08:00 |
andyque
|
fc3caa1845
|
initialize member variable
|
2014-07-04 11:48:55 +08:00 |
minggo
|
95fe74a34b
|
Merge pull request #7299 from dabingnn/fast_tmx
Fast tmx
|
2014-07-04 09:49:30 +08:00 |
heliclei
|
3e75a10362
|
merge upstream/v3
|
2014-07-03 16:15:01 +08:00 |
heliclei
|
1f768f80aa
|
update curl test url
|
2014-07-03 16:08:34 +08:00 |
minggo
|
0be6d27271
|
Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
|
2014-07-03 15:20:06 +08:00 |
Huabing.Xu
|
f3863eb072
|
add hex tile map test back
|
2014-07-03 11:31:30 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
zhangcheng
|
1551854c30
|
revert submodule res-ccs
|
2014-07-02 17:00:30 +08:00 |
zhangcheng
|
9204ac28df
|
1. merge v3
|
2014-07-02 15:37:15 +08:00 |
Huabing.Xu
|
187646ef3f
|
Merge branch 'v3' into fast_tmx
|
2014-07-02 11:38:19 +08:00 |
Dhilan007
|
bcf2b0e2b6
|
fixed no response in test case of curl.
|
2014-07-02 10:18:07 +08:00 |
andyque
|
3304bba017
|
add switch method to all the GUI tests
|
2014-07-02 10:00:34 +08:00 |
andyque
|
21b11cc3c6
|
add switch method to LoadingBar, ListView , pageView and scrollView
|
2014-07-02 10:00:34 +08:00 |
andyque
|
f492643755
|
add switch method to UILayout and UIIamgeView
|
2014-07-02 10:00:34 +08:00 |
andyque
|
7fdc37a70e
|
add switch method to checkBoxTest
|
2014-07-02 10:00:34 +08:00 |
andyque
|
3326941939
|
add switch loading method to buttonTest
|
2014-07-02 10:00:34 +08:00 |
andyque
|
c3a5692e84
|
add test frame to UIScene_Editor
|
2014-07-02 10:00:33 +08:00 |
Nite Luo
|
4cb59683e4
|
Add Sprite3DRotation test
|
2014-07-01 12:36:53 -07:00 |
minggo
|
ca7e95b342
|
Merge pull request #7274 from Dhilan007/v3-320beta
fixed crash cause by addChild on win 7.
|
2014-07-01 22:15:26 +08:00 |
Dhilan007
|
6294a3024f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter
|
2014-07-01 19:10:15 +08:00 |
Dhilan007
|
6ba111cbff
|
fixed crash cause by addChild on win 7.
|
2014-07-01 18:23:20 +08:00 |
zhangcheng
|
02c7c93e43
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
|
2014-07-01 16:36:37 +08:00 |
zhangcheng
|
4b8f818a1d
|
1、Update binary parse lib.
|
2014-07-01 16:31:17 +08:00 |
minggo
|
cc3a9d0737
|
fix crash caused by std::regex()
|
2014-07-01 16:09:25 +08:00 |
Huabing.Xu
|
e1d97ecb59
|
Merge branch 'v3' into v3_fix
|
2014-07-01 14:54:28 +08:00 |
Huabing.Xu
|
75c7777999
|
fix Effect3dSprite memory leak
|
2014-07-01 14:48:46 +08:00 |
minggo
|
80204e3048
|
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
Cleanup binary loader add scene binary parse
|
2014-07-01 13:47:35 +08:00 |
andyque
|
9ef0544953
|
call parent onExit method
|
2014-06-30 18:22:58 +08:00 |
minggo
|
100968e4e5
|
Merge pull request #7254 from dabingnn/v3_fix
fix outline bug
|
2014-06-30 17:26:11 +08:00 |
Huabing.Xu
|
395e61f977
|
fix outline bug
|
2014-06-30 17:21:04 +08:00 |
Dhilan007
|
26f3445311
|
add missing files for the projects
|
2014-06-30 17:07:55 +08:00 |
Huabing.Xu
|
98d3e22777
|
re add commented test case back
|
2014-06-30 11:23:41 +08:00 |
Huabing.Xu
|
47471e202d
|
Merge branch 'v3' into fast_tmx
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
|
2014-06-29 20:23:43 +08:00 |
minggo
|
4f79176da2
|
Merge pull request #7234 from boyu0/iss5614_physics_transform
closed #5614: add transform support for physics
|
2014-06-29 17:23:20 +08:00 |
Huabing.Xu
|
3771654e66
|
remove deprecated function
rename enum to static const member of class
remove hex tile map(we do not support it yet)
|
2014-06-27 18:00:06 +08:00 |
boyu0
|
fccc517eef
|
add test for physics transform.
|
2014-06-27 17:30:50 +08:00 |
yangxiao
|
4685a8654e
|
Animate3D transition
|
2014-06-27 17:02:08 +08:00 |
Huabing.Xu
|
33a8b6563f
|
windows works for fast tmx
|
2014-06-27 16:56:26 +08:00 |
yangxiao
|
2a6ce26335
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-27 16:36:36 +08:00 |
yangxiao
|
343ef9ae55
|
update sprite3d test
|
2014-06-27 16:36:01 +08:00 |
lvlong
|
a497cc0ed2
|
wrong suffix name
|
2014-06-27 15:53:25 +08:00 |
lvlong
|
fac17097a0
|
add a new model and change girl model to it
|
2014-06-27 11:44:44 +08:00 |
yangxiao
|
392a769c8f
|
merge cocos2d v3
|
2014-06-26 22:48:42 +08:00 |
yangxiao
|
ccb39e51b2
|
animation3d transition not finished
|
2014-06-26 18:35:12 +08:00 |
minggo
|
768eb4e1d0
|
Merge pull request #7222 from minggo/warnings-fix
fix warnings
|
2014-06-26 17:24:13 +08:00 |
minggo
|
dc635db163
|
fix warnings
|
2014-06-26 16:15:02 +08:00 |
minggo
|
e0e9d3379c
|
Merge pull request #6948 from lite3/v3
Add immediate send request
|
2014-06-26 16:05:58 +08:00 |
minggo
|
2917596d5e
|
add utils::findChildren()
|
2014-06-26 14:05:30 +08:00 |
zhangcheng
|
a6d6287b29
|
1. remove hungary style.
2. fixes build error.
|
2014-06-26 10:08:17 +08:00 |
andyque
|
a4bd3879ac
|
fix ListView addChild problem
|
2014-06-25 16:17:16 +08:00 |
zhangcheng
|
bdf7be6fa0
|
1. add classname = "" log.
|
2014-06-25 14:32:38 +08:00 |
minggo
|
7eb6ed75b8
|
Merge pull request #7197 from andyque/dimissListViewFocus
dimiss ListView focus tests
|
2014-06-25 14:11:36 +08:00 |
andyque
|
634f1b58c4
|
add todo to reminder me
|
2014-06-25 14:10:53 +08:00 |
andyque
|
1902fdc9f4
|
dimiss ListView focus tests
|
2014-06-25 14:04:32 +08:00 |
andyque
|
6df8079fd7
|
closed #5591, fix UIButton setTitleColor & getTitleColor not match
|
2014-06-25 13:47:29 +08:00 |
lvlong
|
7331ef49b6
|
don't rotate girl model
|
2014-06-25 13:29:45 +08:00 |
lvlong
|
8cc4520deb
|
add boss.c3b
|
2014-06-25 13:22:04 +08:00 |
lvlong
|
658a955e36
|
modify skindata binary reading
|
2014-06-25 13:20:42 +08:00 |
zhangcheng
|
644b61e261
|
1. add SceneBinary to 2.x
|
2014-06-25 11:58:36 +08:00 |
Huabing.Xu
|
290897af14
|
Merge branch 'v3' into fast_tmx
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-25 10:10:08 +08:00 |
minggo
|
63d0f66553
|
Merge pull request #7189 from andyque/feature5161
replace size with contentSize
|
2014-06-24 18:43:33 +08:00 |
pandamicro
|
9d450d6513
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
|
2014-06-24 14:57:12 +08:00 |
pandamicro
|
415f97b00f
|
Refactor #5580: Add test case for FileUtils' file and directory manipulations
|
2014-06-24 14:51:35 +08:00 |
lvlong
|
dc0101737c
|
test for tony
|
2014-06-24 14:43:20 +08:00 |
lvlong
|
431378a41e
|
commit for tony test
|
2014-06-24 14:10:03 +08:00 |
minggo
|
4bb6545250
|
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
closed #5541: Add rotation action support for physics.
|
2014-06-24 10:46:10 +08:00 |
andyque
|
199ad9c623
|
issue #5161, replace deprecated methods
|
2014-06-24 10:18:01 +08:00 |
andyque
|
312ab4f396
|
Merge branch 'v3' into feature5161
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
|
2014-06-24 09:51:18 +08:00 |
yangxiao
|
c65e5d6872
|
simplify shader, bath sprite3D render
|
2014-06-23 19:08:26 +08:00 |
minggo
|
fc7b42c0e5
|
Merge pull request #7157 from 2youyouo2/v3
update action timeline
|
2014-06-23 18:38:46 +08:00 |
andyque
|
7eae7625c1
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-23 18:30:03 +08:00 |
andyque
|
808c4bd763
|
remove unused override method
|
2014-06-23 15:46:07 +08:00 |
andyque
|
e72d89ba2f
|
fix windows tests compile error
|
2014-06-23 15:21:25 +08:00 |
boyu0
|
c40c461848
|
closed #5541: add warning code and comment.
|
2014-06-23 13:55:52 +08:00 |
andyque
|
c9bcbfb265
|
fix addEventListener hidden problem
|
2014-06-23 12:09:49 +08:00 |
andyque
|
5624da5448
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
|
2014-06-23 09:37:39 +08:00 |
lvlong
|
dfd68f128a
|
c3b file
|
2014-06-23 09:03:53 +08:00 |
lite3
|
ebbcb3ea33
|
change immediateSend to sendImmediate
|
2014-06-22 11:39:39 +08:00 |
lite3
|
7c65968b56
|
add immediateSend test
|
2014-06-22 00:11:20 +08:00 |
Dale Stammen
|
5e1f0b5799
|
added missing files and tests that broke wp8 build
|
2014-06-20 09:07:51 -07:00 |
yangxiao
|
2a6dfaf91b
|
Merge branch 'newcode' into v3
|
2014-06-20 22:55:27 +08:00 |
yangxiao
|
1e319bc1f8
|
fix compile bug
|
2014-06-20 22:38:09 +08:00 |
boyu0
|
2fa266e917
|
closed #5541: change PhysicsActionTest for rotate action.
|
2014-06-20 18:42:36 +08:00 |
lvlong
|
478ea8949a
|
Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
Conflicts:
tools/bindings-generator
tools/cocos2d-console
|
2014-06-20 16:14:46 +08:00 |
lvlong
|
69436ddd65
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
|
2014-06-20 16:02:22 +08:00 |
lvlong
|
e4bbfad773
|
1. binary loader is OK.
2. add some comment.
|
2014-06-20 15:30:08 +08:00 |
andyque
|
5f5b705bee
|
refactor setSize to setContentSize and deprecated the old interface
|
2014-06-20 14:03:33 +08:00 |
yinkaile
|
1aa07906a1
|
add new line at the end of the file
|
2014-06-20 11:36:48 +08:00 |
andyque
|
4ca184b58a
|
issue #5161, deprecated getSize
|
2014-06-20 11:18:53 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
minggo
|
9f0a566b8a
|
Merge pull request #6945 from John-He-928/mingw-build
Fix MinGW build
|
2014-06-19 22:08:28 +08:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
minggo
|
7553060ba7
|
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
[ci skip]Add new line at the end of a file to *.[cpp|h]
|
2014-06-19 20:47:17 +08:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09:00 |
boyu0
|
5f10ff2c29
|
issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
|
2014-06-19 15:57:13 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
minggo
|
e60e3c217d
|
Merge pull request #7046 from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
|
2014-06-19 09:44:51 +08:00 |
geron-cn
|
797085574c
|
add binary read to test-cpp
|
2014-06-18 20:13:06 +08:00 |
geron-cn
|
6abc9aba0e
|
add binary read to test-cpp
|
2014-06-18 20:09:12 +08:00 |
geron-cn
|
d2746f64a6
|
cpp-tests
|
2014-06-18 18:11:21 +08:00 |
Dhilan007
|
9351172baf
|
add test case for new API of Label.
|
2014-06-18 18:01:55 +08:00 |
andyque
|
aa5df68b96
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
|
2014-06-18 15:13:34 +08:00 |
andyque
|
f614e9a89b
|
fix tests
|
2014-06-18 15:06:45 +08:00 |
andyque
|
95f1bd7e72
|
update loader
|
2014-06-18 11:54:25 +08:00 |
minggo
|
6ecca08340
|
Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-18 11:30:14 +08:00 |
andyque
|
2cef0cb437
|
update ccs-res
|
2014-06-18 11:26:26 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
df798baa8b
|
Merge pull request #7059 from Rumist/v3
BUG FIX : #5553
|
2014-06-18 11:18:33 +08:00 |
Huabing.Xu
|
2c8c9dea01
|
use a small texture for sprite3D
|
2014-06-17 22:31:56 +08:00 |
minggo
|
26cca348cb
|
Merge pull request #7085 from super626/v3
Sprite3D animation
|
2014-06-17 21:05:58 +08:00 |
2youyou2
|
806d74b6f9
|
add change play section test
|
2014-06-17 15:57:30 +08:00 |
yangxiao
|
17854cd922
|
change speed
|
2014-06-17 13:45:58 +08:00 |
2youyou2
|
d2a6782a9e
|
fixed start frame not right
|
2014-06-17 11:45:57 +08:00 |
minggo
|
53963a2441
|
issue #4693:enumerateChildren() support regular expression
|
2014-06-17 11:43:03 +08:00 |
2youyou2
|
7ee90b4114
|
add performance test
|
2014-06-17 11:13:46 +08:00 |
andyque
|
9ab45744bb
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-17 09:45:16 +08:00 |
Dale Stammen
|
753167b5f2
|
updated xaml resources
|
2014-06-16 09:25:35 -07:00 |
yangxiao
|
9acd373a0e
|
make girl up
|
2014-06-16 19:41:10 +08:00 |
lvlong
|
32cc5b12d6
|
ready
|
2014-06-16 19:30:45 +08:00 |
lvlong
|
4b7f6a6185
|
static Sprite3D is ok
|
2014-06-16 19:08:43 +08:00 |
yangxiao
|
bc31d6b082
|
merge lv
|
2014-06-16 16:45:43 +08:00 |
lvlong
|
920b358764
|
new girl.c3t
|
2014-06-16 16:23:24 +08:00 |
lvlong
|
2282c98f2e
|
do some test
|
2014-06-16 15:38:03 +08:00 |
lvlong
|
2840409933
|
for tony test
|
2014-06-16 14:09:41 +08:00 |
2youyou2
|
fda54a21f1
|
change test title
|
2014-06-16 09:45:44 +08:00 |
2youyou2
|
414aab8553
|
update CMakeLists.txt
|
2014-06-16 09:40:27 +08:00 |
lvlong
|
0fa4e921f0
|
delete girl - 副本.c3t
|
2014-06-16 09:25:12 +08:00 |
yangxiao
|
79d2de3b67
|
make character up
|
2014-06-16 00:31:31 +08:00 |
yangxiao
|
dd8f66ce57
|
merge loader
|
2014-06-16 00:01:38 +08:00 |
yangxiao
|
9dd7241176
|
load c3t animation work 90%
|
2014-06-15 22:45:56 +08:00 |
andyque
|
1d01fe8bbc
|
refactor
|
2014-06-15 16:12:24 +08:00 |
2youyou2
|
71f74f0825
|
fixed android compile failed
|
2014-06-15 13:10:44 +08:00 |
lvlong
|
4ae01d148f
|
11
|
2014-06-13 19:26:46 +08:00 |
2youyou2
|
369ed3e6d3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-13 18:00:01 +08:00 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +08:00 |
2youyou2
|
1c5d9ba212
|
remove resource to use armature resource
|
2014-06-13 14:41:28 +08:00 |
elsanide
|
4b7b32e81e
|
BUG FIX : #5553
Texture2dTest.cpp typo in #ifdef
Notice the W in CC_PLATFORM_WINRT is missing.
|
2014-06-13 15:24:37 +09:00 |
Huabing.Xu
|
4e94eaabed
|
Merge branch 'v3' into v3Animation
|
2014-06-13 12:06:11 +08:00 |
boyu0
|
ee919b673f
|
issue #4437: config for android and linux.
|
2014-06-13 11:07:21 +08:00 |
lvlong
|
3af0bdfef6
|
texture
|
2014-06-13 09:18:25 +08:00 |
Dale Stammen
|
2d913470a0
|
updated fast resume code for app
|
2014-06-12 16:36:53 -07:00 |
2youyou2
|
b36741865c
|
add hd resource
|
2014-06-12 19:38:08 +08:00 |
2youyou2
|
f63939945d
|
change NodeCache to NodeReader
|
2014-06-12 19:34:22 +08:00 |
lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |
2youyou2
|
e4f1ac6126
|
add hd resource
|
2014-06-12 17:38:26 +08:00 |
2youyou2
|
7eda0ae999
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-12 16:43:04 +08:00 |
lvlong
|
1ca69d2689
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2014-06-12 16:28:36 +08:00 |
2youyou2
|
f536020d26
|
remove unused files
|
2014-06-12 16:21:41 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
boyu0
|
acb87f414e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
|
2014-06-12 14:44:28 +08:00 |
yangxiao
|
e37c6ab7ee
|
test action sequence
|
2014-06-12 14:20:38 +08:00 |
minggo
|
6845a69655
|
issue #4693: remove unneede codes
|
2014-06-12 14:00:41 +08:00 |
minggo
|
990c491746
|
issue #4693: add test case for getName, setName, getChildByName and enumerateChildren
|
2014-06-12 13:55:23 +08:00 |
boyu0
|
1df80a8ce4
|
closed #5537: add test case
|
2014-06-12 12:57:29 +08:00 |
vision
|
dc4cdc9c0f
|
remove the comments
|
2014-06-12 10:19:08 +08:00 |
vision
|
97b578185d
|
new parameter for setting blur shader effect
|
2014-06-12 09:49:48 +08:00 |
2youyou2
|
4d1bf0c1a2
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
|
2014-06-12 09:42:20 +08:00 |
youyou
|
28ae57c5fc
|
add AsyncReader
|
2014-06-12 00:38:23 +08:00 |
2youyou2
|
aa06fab776
|
support relative path for reading json
|
2014-06-11 21:11:22 +08:00 |
Huabing.Xu
|
65acec013b
|
Merge branch 'v3' into v3Animation
|
2014-06-11 17:45:31 +08:00 |
andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
Huabing.Xu
|
18663609b4
|
add interface for speed and playback in animate
|
2014-06-11 15:07:37 +08:00 |
vision
|
e2c75c1f11
|
New shader for the blur effect, the old one is ineffecient and difficult to maintain.
|
2014-06-11 14:54:14 +08:00 |
andyque
|
2f6f1b7151
|
improve binary format
|
2014-06-11 14:45:35 +08:00 |
andyque
|
7a8f27ee0b
|
remove unused parser code
|
2014-06-11 14:15:34 +08:00 |
samuele3hu
|
54379f48a9
|
Fix the crash of Texture2dTest when `—ndk-mode` is `release`
|
2014-06-11 11:24:17 +08:00 |
2youyou2
|
09a2ceb7df
|
add TimelineAction
|
2014-06-11 11:10:07 +08:00 |
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
yangxiao
|
6d09b50699
|
animation bug
|
2014-06-10 19:53:06 +08:00 |
andyque
|
48f7743daa
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-10 15:08:10 +08:00 |
yangxiao
|
a991940268
|
debug Sprite3D with .c3t
|
2014-06-09 18:37:58 +08:00 |
minggo
|
29ac8d746d
|
Merge pull request #7012 from Dhilan007/v3-testcast
update test cast of label.
|
2014-06-09 16:32:32 +08:00 |
andyque
|
c387ae3bc7
|
add text effect test
|
2014-06-09 14:34:46 +08:00 |
Dhilan007
|
791737befa
|
update test cast of label.
|
2014-06-09 13:41:32 +08:00 |
vision
|
361bfad5f8
|
initilization missed.
|
2014-06-09 11:39:19 +08:00 |
vision
|
ae16c88538
|
Save the bound texture unit so that the sampler can be updated dynamiclly.
|
2014-06-09 10:58:28 +08:00 |
yangxiao
|
0c95fe1fbd
|
animation test
|
2014-06-06 19:12:08 +08:00 |
boyu0
|
fc5e58b521
|
issue #4437: add dirty tag.
|
2014-06-06 18:03:44 +08:00 |
boyu0
|
560053d23c
|
issue #4437: add test and fix transform.
|
2014-06-06 17:33:27 +08:00 |
minggo
|
6cee3fe830
|
Merge pull request #6979 from visiblelight/TextureOptimize
Texture Optimize
|
2014-06-06 11:38:49 +08:00 |
vision
|
39f2669886
|
remove the new images and use the old ones.
|
2014-06-06 10:37:45 +08:00 |
vision
|
f7d5d837bf
|
add new tests for different pixel formats
|
2014-06-05 16:33:42 +08:00 |
andyque
|
c96a6086c3
|
improve parsing code
|
2014-06-05 11:43:43 +08:00 |
andyque
|
3dc6e86c25
|
add binary file parsing into ui tests
|
2014-06-05 10:25:45 +08:00 |
Ricardo Quesada
|
a11740ff29
|
ouch, more windows compile issues
|
2014-06-04 10:11:16 -07:00 |
Ricardo Quesada
|
59b966731e
|
Compiles on Windows and Android
|
2014-06-04 09:48:35 -07:00 |
Ricardo Quesada
|
79ebc546f8
|
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
|
2014-06-04 09:19:22 -07:00 |
minggo
|
7a4d46dc1b
|
Merge pull request #6965 from Dhilan007/v3-wp8fix
Support Fast App Resume and fixed black screen may arise when using third sdk.
|
2014-06-04 17:15:13 +08:00 |
minggo
|
a495747a7c
|
Merge pull request #6971 from andyque/refactorUIFramework
refactor ObjectFactory
|
2014-06-04 17:08:27 +08:00 |
minggo
|
a31710973c
|
Merge pull request #6962 from visiblelight/AlphaIssues
Fix a crash in ParticleTest->PremultipliedAlphaTest
|
2014-06-04 15:10:54 +08:00 |
andyque
|
38e274de73
|
refact ui header file include
|
2014-06-04 14:56:33 +08:00 |
minggo
|
7bf2be6033
|
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
Bugfix autorelease pool manager
|
2014-06-04 14:31:30 +08:00 |
minggo
|
5432698674
|
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
|
2014-06-04 13:52:43 +08:00 |
boyu0
|
368c5b0d3b
|
closed #5482: add a test case for bug 5482.
|
2014-06-04 11:59:15 +08:00 |
Dhilan007
|
52ad2063bd
|
Support Fast App Resume.
|
2014-06-04 11:19:53 +08:00 |
vision
|
ad230bb412
|
fix a crash in ParticleTest->PremultipliedAlphaTest
|
2014-06-04 10:39:18 +08:00 |
Kezhu Wang
|
dbca937835
|
add test case to break buggy code
|
2014-06-03 17:58:09 +08:00 |
minggo
|
691a77b148
|
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-06-03 14:38:07 +08:00 |
Ricardo Quesada
|
b24c674d25
|
Little fixes for setNormalized
|
2014-05-30 21:50:39 -07:00 |
Ricardo Quesada
|
1b8d0d88df
|
Adds setNormalizedPosition()
Changes in `visit()` were done in order to do it
in a robust and fast way.
|
2014-05-30 16:42:05 -07:00 |
John_He
|
5e82d9db4d
|
set libws2_32 as standard library for mingw.
|
2014-05-30 20:14:22 +08:00 |
Huabing.Xu
|
2e42c77b9a
|
fix typo
|
2014-05-30 11:13:53 +08:00 |
Huabing.Xu
|
95b6fb52de
|
only use _backToForeGroundListner when on Android
|
2014-05-30 10:56:03 +08:00 |
Huabing.Xu
|
41d19007eb
|
Merge branch 'v3.1hotfix' into v3
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
|
2014-05-30 10:19:56 +08:00 |
Dhilan007
|
0739f40726
|
fix faults of load project on Win 32.
|
2014-05-29 17:30:55 +08:00 |
minggo
|
b68525ac1f
|
Merge pull request #6916 from John-He-928/mingw-build
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
|
2014-05-29 15:17:07 +08:00 |
minggo
|
bfb3567131
|
Merge pull request #6924 from minggo/remove-test-case
Remove test case
|
2014-05-29 14:54:28 +08:00 |
minggo
|
e48b14b55d
|
Merge pull request #6932 from Dhilan007/v3-labelfix
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:54:16 +08:00 |
minggo
|
3182fd56b8
|
Merge pull request #6931 from VisualSJ/v3
Test case action name error
|
2014-05-29 14:07:23 +08:00 |
VisualSJ
|
dd2b7e036a
|
Test case action name error
|
2014-05-29 14:00:43 +08:00 |
Dhilan007
|
2a6158bae1
|
Create a test case for issue 4999(label is unsharp if it's created by smaller font).
|
2014-05-29 14:00:38 +08:00 |
boyu0
|
91db87a2f6
|
closed #5392: add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
|
2014-05-29 13:51:43 +08:00 |
Huabing.Xu
|
8633ab9c14
|
add background/foreground listener for EffectSprite/Effect framework test case
|
2014-05-29 12:43:04 +08:00 |
John_He
|
44950a57f1
|
fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones.
|
2014-05-29 01:30:14 +08:00 |
Huabing.Xu
|
ad3b1cf827
|
add background/foreground listener for Effectsprite3d/Effect3d test case
|
2014-05-28 21:07:12 +08:00 |
minggo
|
d7cca2a044
|
closed #4819: remove KeyboardTest
|
2014-05-28 18:31:00 +08:00 |
minggo
|
0acc4cd961
|
issue #4819: remove KeyPadTest
|
2014-05-28 18:17:22 +08:00 |
minggo
|
0ad0f9c405
|
issue #4819: remove AccelerometerTest
|
2014-05-28 18:10:37 +08:00 |
minggo
|
c44a5a2b3e
|
Merge pull request #6908 from dabingnn/v3_refactorEffect3DFrameWork
V3 refactor effect3 d frame work
|
2014-05-27 20:53:40 +08:00 |
minggo
|
99290b83c7
|
Merge pull request #6871 from asuuma/v3_Repeat_fix
Fix Repeat will run one more over in rare situations
|
2014-05-27 16:22:42 +08:00 |
Huabing.Xu
|
e59813476a
|
clclosed #5369: Fix wrong logic when setTarget to Effect3D
|
2014-05-27 15:08:38 +08:00 |
minggo
|
0b661d8192
|
Merge pull request #6907 from visiblelight/screenshot_refactor
adding comments for the new utility
|
2014-05-27 14:52:09 +08:00 |
Huabing.Xu
|
453ff81d2a
|
closed #5369: refactor Effect3d/EffectSprite3D framework to the pattern similar to Effect/EffectSprite
|
2014-05-27 14:50:46 +08:00 |
Ishiguro Yusuke
|
b8f9b1f20b
|
Add test case for reproducing Repeat bug
|
2014-05-27 15:40:38 +09:00 |
vision
|
e81db73b0a
|
adding comments for the new utility.
|
2014-05-27 14:29:52 +08:00 |
minggo
|
034e2c6f75
|
Merge pull request #6809 from heliclei/autotest-stop
Support autotest stop command
|
2014-05-27 14:01:38 +08:00 |
minggo
|
a01315e2f5
|
Merge pull request #6726 from visiblelight/screenshot
Add a new utility function to snap the screen
|
2014-05-27 11:18:25 +08:00 |
vision
|
363fd8dc2a
|
move the capturen screen interface from Director to ccUtils
|
2014-05-27 10:44:23 +08:00 |
minggo
|
f7450730fb
|
Merge pull request #6901 from andyque/fixDpadNavigation
issue #5176, refactor FocusNavigationController
|
2014-05-27 10:40:00 +08:00 |