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 |
samuele3hu
|
2bc1cd0486
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
|
2014-07-09 22:31:05 +08:00 |
geron-cn
|
2a64bd8945
|
udpate ccs-res
|
2014-07-09 18:35:10 +08:00 |
samuele3hu
|
243fa49c09
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-09 18:08:09 +08:00 |
samuele3hu
|
3546c131dd
|
Add Lua bindings for controller and related test case project
|
2014-07-09 18:05:02 +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 |
samuele3hu
|
bf3e0cb132
|
Update ini configure and bindings-generator submodule
|
2014-07-08 15:17:46 +08:00 |
samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +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 |
XiaoYang
|
b0f5ce36ff
|
Merge pull request #48 from lvlonggame/v3
delete the cube model file and modify 3DBundle
|
2014-07-07 21:51:10 +08:00 |
minggo
|
e1b29a8ef6
|
Merge pull request #7329 from Dhilan007/v3-gc-refactor
issue #4689:Fixed lose disconnected event and incorrect device name/id.
|
2014-07-07 18:45:23 +08:00 |
Dhilan007
|
9cf01c0e47
|
update test case
|
2014-07-07 17:57:08 +08:00 |
Dhilan007
|
d1034fdaae
|
1.fixed lose disconnected event.
2.fixed incorrect device name and device id;
|
2014-07-07 17:47:07 +08:00 |
lvlong
|
70b9d9b9ac
|
delete cube_anim
|
2014-07-07 17:11:37 +08:00 |
minggo
|
cd77690032
|
Merge pull request #7326 from Dhilan007/v3-gc-refactor
issue #4689: support external key.
|
2014-07-07 17:04:27 +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 |
Dhilan007
|
68bd717ea7
|
issue #4689: support external key.
|
2014-07-07 12:06:24 +08:00 |
minggo
|
982d7441a0
|
Merge pull request #7310 from boyu0/lua_SceneEditorTest
Add SceneEditorTest for lua
|
2014-07-06 16:01:49 +08:00 |
minggo
|
9db0f36c33
|
Merge pull request #7313 from Dhilan007/v3-gc-refactor
issue #4689: Refactoring game controller API.
|
2014-07-05 01:05:48 +08:00 |
LinWenhai
|
2ca5c01902
|
issue #4689: Refactoring game controller API[ios]
|
2014-07-04 21:24:32 +08:00 |
LinWenhai
|
27bc3dc640
|
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
|
2014-07-04 17:56:22 +08:00 |
Dhilan007
|
c73a88c4a5
|
Add resources
|
2014-07-04 17:55:20 +08:00 |
samuele3hu
|
b68ee428b0
|
Remove useless codes
|
2014-07-04 17:15:34 +08:00 |
samuele3hu
|
d9ffa33601
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-04 16:25:53 +08:00 |
samuele3hu
|
85dd2e55bf
|
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 16:24:00 +08:00 |
LinWenhai
|
992245e744
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
|
2014-07-04 15:29:40 +08:00 |
Dhilan007
|
552a9251c4
|
issue #4689: Refactor controller API.
|
2014-07-04 15:22:53 +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 |
boyu0
|
dc81b07998
|
add new line at the end of the file
|
2014-07-04 10:27:24 +08:00 |
boyu0
|
fc994d5ec0
|
add SceneEditorTest for lua
|
2014-07-04 10:08:17 +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 |
minggo
|
fffdfb3711
|
Merge pull request #7290 from chengstory/v3_OpBinaryParse
V3 op binary parse
|
2014-07-03 14:00:01 +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 |
samuele3hu
|
ff79be2d3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-02 17:01:14 +08:00 |
samuele3hu
|
320dc4737b
|
Update Sprite3D test cases for Lua
|
2014-07-02 17:00:31 +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 |
Dhilan007
|
e1bb1158bc
|
update test case.
|
2014-07-02 15:25:18 +08:00 |
samuele3hu
|
1271c1b62e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-02 14:29:33 +08:00 |
samuele3hu
|
2aee9ed35d
|
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
|
2014-07-02 14:26:56 +08:00 |
Dhilan007
|
c5dc7b9cd0
|
fixed can't get valid value from trigger button.
|
2014-07-02 14:19:10 +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 |
Dhilan007
|
318962c40a
|
update test case.
|
2014-07-01 16:46:11 +08:00 |
Dhilan007
|
0fbcbec9de
|
Add missing file for game controller support.
Fix using incorrect library project.
|
2014-07-01 16:44:10 +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 |
minggo
|
39650e12c4
|
Merge pull request #7266 from dabingnn/v3_fix
V3 fix
|
2014-07-01 15:52:50 +08:00 |
minggo
|
daa5e257df
|
Merge pull request #7259 from Dhilan007/v3-gc0627
issue #4895:split controller adapter[android]
|
2014-07-01 15:51:21 +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 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
Dhilan007
|
83f4e536c5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
Conflicts:
tests/game-controller-test/proj.android/project.properties
|
2014-06-30 19:27:01 +08:00 |
Dhilan007
|
9bf36a1045
|
update test case.
|
2014-06-30 18:43:09 +08:00 |
minggo
|
a24526fd53
|
Merge pull request #7258 from andyque/fixSchedulerTest
call parent onExit method
|
2014-06-30 18:20:05 +08:00 |
andyque
|
9ef0544953
|
call parent onExit method
|
2014-06-30 18:22:58 +08:00 |
minggo
|
d7cbc2872e
|
Merge pull request #7250 from minggo/fix-compiling
fix compiling error
|
2014-06-30 18:06:54 +08:00 |
minggo
|
100968e4e5
|
Merge pull request #7254 from dabingnn/v3_fix
fix outline bug
|
2014-06-30 17:26:11 +08:00 |
minggo
|
f85d84f2ef
|
Merge pull request #7252 from visiblelight/beta_test
Fixing compile errors on WP8
|
2014-06-30 17:24:08 +08:00 |
Huabing.Xu
|
395e61f977
|
fix outline bug
|
2014-06-30 17:21:04 +08:00 |
minggo
|
3b13855374
|
fix compiling error on iOS
|
2014-06-30 17:20:13 +08:00 |
Dhilan007
|
26f3445311
|
add missing files for the projects
|
2014-06-30 17:07:55 +08:00 |
minggo
|
c1e56e62c1
|
fix compiling error
|
2014-06-30 15:51:35 +08:00 |
Dhilan007
|
2a9e10be2c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
|
2014-06-30 13:41:55 +08:00 |
Huabing.Xu
|
98d3e22777
|
re add commented test case back
|
2014-06-30 11:23:41 +08:00 |
Dhilan007
|
a63216d97b
|
issue #4895:Add test case
|
2014-06-30 03:25:49 +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 |
minggo
|
7f28e81d09
|
Merge pull request #7226 from super626/v3
Animation3D
|
2014-06-29 16:41:13 +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 |
samuele3hu
|
318e39a6d2
|
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
|
2014-06-27 17:58:59 +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 |
samuele3hu
|
acc1004e28
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-06-27 14:53:25 +08:00 |
samuele3hu
|
b1d07f2711
|
Add VideoPlayer Test for Lua
|
2014-06-27 13:56:39 +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
|
b033f7f664
|
Merge pull request #7218 from minggo/add-findChildren
Add utils::findChildren
|
2014-06-26 15:19:54 +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 |
samuele3hu
|
c892939968
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
|
2014-06-26 09:52:41 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
minggo
|
46d380b5ac
|
Merge pull request #7204 from andyque/fixListViewTestHorizentalCarsh
fix ListView addChild problem
|
2014-06-25 17:20:17 +08:00 |
andyque
|
a4bd3879ac
|
fix ListView addChild problem
|
2014-06-25 16:17:16 +08:00 |
samuele3hu
|
5f63514d6b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
|
2014-06-25 15:15:05 +08:00 |
samuele3hu
|
3a0e750926
|
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
|
2014-06-25 15:13:08 +08:00 |
samuele3hu
|
5c765f6883
|
Add coco studio ui focus test cases for Lua
|
2014-06-25 15:08:59 +08:00 |
minggo
|
986f77a827
|
Merge pull request #7156 from samuele3hu/v3_keypad_fix
Update controller.lua for CocosIDE’s need
|
2014-06-25 14:40:08 +08:00 |
zhangcheng
|
bdf7be6fa0
|
1. add classname = "" log.
|
2014-06-25 14:32:38 +08:00 |
minggo
|
5f569cb423
|
Merge pull request #7193 from samuele3hu/v3_ui_binary
Add UI Editor test cases for Lua
|
2014-06-25 14:30:34 +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 |
samuele3hu
|
617e2bc592
|
Add a newline
|
2014-06-25 09:36:34 +08:00 |
samuele3hu
|
ea99c08d0e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
|
2014-06-25 09:31:57 +08:00 |
samuele3hu
|
300821e61f
|
Add UI Editor test case for Lua
|
2014-06-25 09:29:06 +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 |
samuele3hu
|
03a4e014e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-24 11:04:38 +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 |
minggo
|
66763bd400
|
Merge pull request #7180 from MSOpenTech/wp8-v3
WP8 v3 broken build fix
|
2014-06-24 10:31:56 +08:00 |
andyque
|
199ad9c623
|
issue #5161, replace deprecated methods
|
2014-06-24 10:18:01 +08:00 |
samuele3hu
|
e34fcf05f6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-24 10:14:53 +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 |
Dale Stammen
|
87a6b83001
|
added missing files for wp8
|
2014-06-23 08:35:39 -07: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 |
samuele3hu
|
a339afb2c0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-23 17:53:41 +08:00 |
samuele3hu
|
9126608138
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix
|
2014-06-23 17:30:24 +08:00 |
samuele3hu
|
dce4c8a0a8
|
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
|
2014-06-23 17:29:56 +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 |
samuele3hu
|
02e0bad3f1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-23 10:28:05 +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 |
samuele3hu
|
d9848a62d2
|
Update controller.lua for CocosIDE’s need
|
2014-06-20 11:09:26 +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
|
af88cf053b
|
Merge pull request #7022 from samuele3hu/v3_fix
Add bytecode and encrypted files test cases for Lua
|
2014-06-19 21:20:05 +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 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +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 |