samuele3hu
|
b68f6bf65e
|
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:02:14 +08:00 |
andyque
|
c35c006fbd
|
Merge branch 'develop' into feature3636
|
2014-04-03 16:02:00 +08:00 |
andyque
|
0875b4e51f
|
closed #4636. Done
|
2014-04-03 15:56:45 +08:00 |
andyque
|
8996ab1956
|
issue #4636, finish refactorying UITextFieldTest
|
2014-04-03 15:52:42 +08:00 |
andyque
|
ed2c38eb98
|
issue #4636, finish UITextBMFont
|
2014-04-03 15:45:06 +08:00 |
andyque
|
08bf6c27f4
|
issue #4636. finish UITextAtlasTest
|
2014-04-03 15:38:52 +08:00 |
andyque
|
b59beab61a
|
issue #4636, finish UISlider
|
2014-04-03 15:33:57 +08:00 |
James Chen
|
f6859a3ca9
|
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
|
2014-04-03 15:32:16 +08:00 |
andyque
|
a7a1a6b05b
|
issue #4636, finish UIRichTextTest and UIScrollViewTest
|
2014-04-03 15:22:23 +08:00 |
andyque
|
8b9af0e94c
|
issue #4636. finish UIPageViewTest
|
2014-04-03 11:52:35 +08:00 |
andyque
|
48429f5738
|
issue #4636. finish UILoadingBar
|
2014-04-03 11:34:06 +08:00 |
andyque
|
278e2c3e3b
|
issue #4636. finish UIListViewTest
|
2014-04-03 11:23:12 +08:00 |
samuele3hu
|
bff1d6c2a6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-03 11:15:59 +08:00 |
andyque
|
fe33588038
|
issue #4636. finish UILayout
|
2014-04-03 11:14:35 +08:00 |
samuele3hu
|
b9ff51782f
|
Synchronize LabelTest of cpp to lua to fix some bug and add more tests
|
2014-04-03 11:08:59 +08:00 |
andyque
|
1a97ebdcb0
|
issue #4636. finish UIImageView
|
2014-04-03 10:42:30 +08:00 |
andyque
|
52bdb840ee
|
issue #4636. finish UICheckBox
|
2014-04-03 10:34:20 +08:00 |
andyque
|
10134ccc65
|
issue #4636. finish button
|
2014-04-03 10:31:10 +08:00 |
andyque
|
0a6b0a4389
|
issue #4636. refactor Scale9Sprite
|
2014-04-03 10:07:47 +08:00 |
andyque
|
b27fe6ecc2
|
issue #4636. add parameter create method to UITextBMFont
|
2014-04-03 10:07:46 +08:00 |
andyque
|
0b5c10a0fb
|
issue #4636. add parameter create method to UITextAtlas
|
2014-04-03 10:07:46 +08:00 |
andyque
|
a03dc76f7d
|
issue #4636, add parameter create method for UILoadingBar
|
2014-04-03 10:07:46 +08:00 |
andyque
|
92945715eb
|
issue #4636. add parameter create function for UIText
|
2014-04-03 10:07:46 +08:00 |
andyque
|
558abf1a6b
|
issue #4636, add parameter create method to UIImageView
|
2014-04-03 10:07:46 +08:00 |
andyque
|
ba9a605568
|
issue #4636, add parameter create method to UICheckBox
|
2014-04-03 10:07:46 +08:00 |
andyque
|
1b0583214b
|
issue #4636, add parameter create method to UIButton
|
2014-04-03 10:07:46 +08:00 |
zhangbin
|
f744ddc860
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-04-02 17:15:39 +08:00 |
zhangbin
|
0e0000e6d5
|
The projection reset to DEFAULT when a test case onExit().
|
2014-04-02 17:12:09 +08:00 |
samuele3hu
|
0c93c6ae60
|
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
|
2014-04-02 15:34:26 +08:00 |
James Chen
|
944e752509
|
fonts/xxx.ttf -> Xxx for old LabelTTF test.
|
2014-04-01 14:49:02 +08:00 |
Dhilan007
|
eadbca8ee7
|
1.fixed logical error in Label::enableShadow.
2.Add test case for shadow and outline take effect at the same time.
|
2014-04-01 14:15:35 +08:00 |
minggo
|
7804fdf0a1
|
Merge pull request #6078 from boyu0/3.0rc1_test
1. Hide CameraTest2. 2. Correct the projection setting, fix camera cente...
|
2014-04-01 11:23:16 +08:00 |
boyu0
|
18b0c041b4
|
1. Hide CameraTest2. 2. Correct the projection setting, fix camera center test projection.
|
2014-03-31 18:17:00 +08:00 |
James Chen
|
bc5a2ff5db
|
Merge pull request #6075 from Dhilan007/develop_label
fixed warnings in LabelTest.
|
2014-03-31 17:40:30 +08:00 |
Dhilan007
|
687b2e9f87
|
update test case.
|
2014-03-31 17:38:54 +08:00 |
Dhilan007
|
51f3833a7e
|
fixed warn.
|
2014-03-31 17:31:04 +08:00 |
Dhilan007
|
72811d8869
|
fixed warn in test case.
|
2014-03-31 17:21:56 +08:00 |
James Chen
|
f4a7da8457
|
Merge pull request #6069 from Dhilan007/develop_label
fixed can't type chinese.
|
2014-03-31 16:46:43 +08:00 |
Dhilan007
|
6c99f992dc
|
fixed can't type chinese.
|
2014-03-31 16:18:45 +08:00 |
minggo
|
98ed579b34
|
Merge pull request #6052 from pipu/develop_pipu_fixedbugsforeditor_1301
Fixed bugs for Editor
|
2014-03-31 15:37:45 +08:00 |
minggo
|
7840a246b7
|
Merge pull request #6063 from koowolf/add_bg_wav
add background.wav to wp8 to play
|
2014-03-31 15:20:26 +08:00 |
James Chen
|
313108af82
|
Merge pull request #6065 from boyu0/3.0rc1_test
fix box2dbed dynamic tree test draw.
|
2014-03-31 14:38:00 +08:00 |
boyu0
|
48854f4649
|
delete Time of Impact test which can not shown
|
2014-03-31 13:41:48 +08:00 |
boyu0
|
9b75fc5595
|
add box2dbed test keyboard event.
|
2014-03-31 12:07:21 +08:00 |
koowolf
|
ce78b6369a
|
add background.wav to wp8 to play
|
2014-03-31 11:46:39 +08:00 |
boyu0
|
4fa8d24561
|
fix some box2d test position
|
2014-03-31 11:26:11 +08:00 |
zhangbin
|
8aa187d8dc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-31 10:47:04 +08:00 |
zhangbin
|
95ab15195c
|
Optimize the performance of BlurSpriteTest in Shader Sprite.
|
2014-03-31 10:44:48 +08:00 |
boyu0
|
530354ca67
|
fix box2d dynamic tree draws
|
2014-03-31 10:21:54 +08:00 |
minggo
|
6cc51a2cfc
|
Merge pull request #6057 from samuele3hu/develop_socket
Add the omitted socket script for lua-tests
|
2014-03-31 10:15:38 +08:00 |
minggo
|
f80bdfff76
|
Merge pull request #6055 from MSOpenTech/wp8-3.0
Cocos2d-x 3.0 Windows Phone 8 support
|
2014-03-29 23:21:34 +08:00 |
minggo
|
a874ecf8b0
|
Merge pull request #6053 from natural-law/develop
Solve the error effect of BlurSpriteTest in Shader Sprite.
|
2014-03-29 21:42:54 +08:00 |
samuele3hu
|
056303ea35
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
|
2014-03-29 14:58:45 +08:00 |
samuele3hu
|
219a91a641
|
Add the omitted socket script for lua-tests
|
2014-03-29 14:58:23 +08:00 |
samuele3hu
|
7127cb560e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
|
2014-03-29 10:36:15 +08:00 |
samuele3hu
|
403e96b943
|
Use the New Label in the Extension test case
|
2014-03-29 10:34:52 +08:00 |
Dale Stammen
|
c739956582
|
added wp8 support files and projects
|
2014-03-28 15:54:36 -07:00 |
Dale Stammen
|
8d1f4188eb
|
added wp8 support files and projects
|
2014-03-28 15:53:55 -07:00 |
Dale Stammen
|
8bd5497ac6
|
use ResolutionPolicy::SHOW_ALL on WP8
|
2014-03-28 11:28:48 -07:00 |
Dale Stammen
|
210f95c2d3
|
can't close app on WP8
|
2014-03-28 11:27:43 -07:00 |
samuele3hu
|
a387f60f80
|
Update the font size for new label test display
|
2014-03-28 23:32:11 +08:00 |
zhangbin
|
77e0694883
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-03-28 20:55:12 +08:00 |
zhangbin
|
6a1974a78a
|
Solve the error effect of BlurSpriteTest in Shader Sprite.
|
2014-03-28 20:53:14 +08:00 |
pipu
|
733b364b51
|
Fixed bugs for Editor
|
2014-03-28 18:54:06 +08:00 |
James Chen
|
581ef454eb
|
Merge pull request #6047 from samuele3hu/develop_test
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 18:04:12 +08:00 |
zhangbin
|
338fd43beb
|
Solve the error effect of clipping in cpp-tests & lua-tests.
|
2014-03-28 17:45:28 +08:00 |
samuele3hu
|
7ca207f993
|
Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.
|
2014-03-28 17:18:41 +08:00 |
James Chen
|
fd9ab5c4d1
|
Merge pull request #6039 from Dhilan007/develop_label
LabelTTF and LabelBMFont tagged as deprecated
|
2014-03-28 14:31:11 +08:00 |
Dhilan007
|
898e2136b1
|
LabelTTF and LabelBMFont tagged as deprecated
|
2014-03-28 14:18:01 +08:00 |
James Chen
|
5c77b4d4b1
|
Merge pull request #6011 from DarraghCoy/event_listener_crash_fixes
closed #4586: Fix crashes in event dispatch other related safety checks/fixes
|
2014-03-28 11:28:41 +08:00 |
minggo
|
b607172e57
|
Merge pull request #6035 from Dhilan007/develop_label
Remove the old implementation of LabelBMFont.
|
2014-03-28 10:32:04 +08:00 |
Dhilan007
|
fd5a4acddb
|
Remove the old implementation of LabelBMFont.
|
2014-03-28 10:28:44 +08:00 |
Darragh Coy
|
8ca3cf8a93
|
Update the test for dangling node pointers in the events system.
Should be run when the debug event listener verification for nodes is switched on.
|
2014-03-27 16:38:06 -07:00 |
Darragh Coy
|
ba450f786c
|
Fix the new test added to the event dispatcher tests
|
2014-03-27 16:16:27 -07:00 |
Darragh Coy
|
2b7116060d
|
Add a test for events being sent to destroyed nodes.
|
2014-03-27 16:00:21 -07:00 |
boyu0
|
9fbb45136a
|
closed #4573: add ParticleVisibleTest.
|
2014-03-27 17:06:26 +08:00 |
samuele3hu
|
6fbf1b4cdf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test
|
2014-03-27 11:21:20 +08:00 |
samuele3hu
|
06f4cb31b2
|
Replace NativeActivity with Cocos2dActivity and modify lua android project setting.
|
2014-03-27 11:18:13 +08:00 |
James Chen
|
6f425c96cb
|
Merge pull request #6007 from Dhilan007/develop_testcase
Remove the old implementation of LabelTTF in test case.
|
2014-03-27 11:13:37 +08:00 |
pandamicro
|
87384d8ffa
|
Fixed #4566: Move LayerGradient's init functions into CC_CONSTRUCTOR_ACCESS section
|
2014-03-27 10:55:41 +08:00 |
pandamicro
|
87f9eb3217
|
Fixed #4566: Remove autorelease for create construct in LayerTest
|
2014-03-27 10:25:39 +08:00 |
pandamicro
|
413e0010f5
|
Fixed #4566: Fix LayerTest bug
|
2014-03-27 10:22:04 +08:00 |
Dhilan007
|
93511a878b
|
Remove the old implementation of LabelTTF in test case.
|
2014-03-26 23:33:58 +08:00 |
James Chen
|
2c616fc9da
|
Merge pull request #6005 from flashjay/develop
remove deprecated code in lua tests & template
|
2014-03-26 20:12:10 +08:00 |
faryang-rmbp
|
491dc202df
|
remove deprecated code in lua tests & template
|
2014-03-26 19:42:07 +08:00 |
James Chen
|
849d7b9109
|
Merge pull request #5996 from chengstory/AddNewCreateNodeWay
Adding support of using CCComRender as parent for attached component
|
2014-03-26 18:20:34 +08:00 |
zhangcheng
|
58a61d94fb
|
add use CCComRender as parent for attaching component
|
2014-03-26 16:39:32 +08:00 |
James Chen
|
22fdbbb198
|
Merge pull request #5980 from Dhilan007/develop_label2
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
|
2014-03-26 16:32:04 +08:00 |
andyque
|
876f643bc4
|
issue #4401, fix a typo
|
2014-03-26 16:00:55 +08:00 |
James Chen
|
21ba509a35
|
Merge pull request #5989 from dumganhar/iss4559-ios-64bit
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
|
2014-03-26 15:27:57 +08:00 |
James Chen
|
c1faad7e2c
|
Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp.
|
2014-03-26 15:04:45 +08:00 |
andyque
|
57d8f155df
|
issue #4401. resolve conflicts
|
2014-03-26 14:54:50 +08:00 |
minggo
|
a374241f65
|
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
Windows Phone 8,0 cocos2d-x 3.0 changes
|
2014-03-26 13:58:46 +08:00 |
James Chen
|
7a8db8271f
|
Merge pull request #5930 from andyque/Branch_issue4429
closed #4429: Boolean value could not be written to specified plist file
|
2014-03-26 11:46:56 +08:00 |
Dhilan007
|
1247760d95
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs
Conflicts:
cocos/2d/CCLabel.cpp
|
2014-03-26 11:15:48 +08:00 |
Ricardo Quesada
|
473a6b19ee
|
Upgrades to Chipmunk 6.2.1
|
2014-03-25 10:37:35 -07:00 |
James Chen
|
f6c6d428ad
|
Merge pull request #5926 from andyque/fix_tests_warnings
issue #4401, remove warnings under win32
|
2014-03-25 18:17:42 +08:00 |
zhangbin
|
36892c3a98
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880
|
2014-03-25 16:21:41 +08:00 |
zhangbin
|
d6ad9274c4
|
closed #2880, Generate mipmap for the texture has mipmaps when reload textures.
|
2014-03-25 16:19:34 +08:00 |
Dhilan007
|
674dffce21
|
Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs
|
2014-03-25 16:10:47 +08:00 |