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 |
James Chen
|
34245d4bd0
|
Merge pull request #5953 from dumganhar/merge5934
closed #4541: [ui] Removed Widget::addNode, added ProtectedNode.
|
2014-03-25 15:46:56 +08:00 |
minggo
|
3fc15e5e7d
|
Merge pull request #5896 from splhack/remove_nativeactivity
Remove NativeActivity
|
2014-03-25 15:37:12 +08:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
James Chen
|
32f647d38b
|
Merge pull request #5940 from boyu0/iss4513_particle_readd_bug
closed #4513: Particle doesn't animate when it was removed and re-added to another node.
|
2014-03-25 14:05:12 +08:00 |
James Chen
|
8d28884c9f
|
Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel
issue #3821: Uses new label instead of LabelTTF in engine.
|
2014-03-25 13:46:17 +08:00 |
James Chen
|
5625c98443
|
Merge pull request #5942 from Dhilan007/develop_label2
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
|
2014-03-25 11:39:53 +08:00 |
boyu0
|
289e632a40
|
closed #4513: change 1.0 to 1.0f to avoid the warning.
|
2014-03-25 11:36:35 +08:00 |
Dhilan007
|
a3b83d68b2
|
update test case.
|
2014-03-25 11:10:48 +08:00 |
Dhilan007
|
b074890b57
|
update test case
|
2014-03-25 10:57:44 +08:00 |
Kazuki Sakamoto
|
3fba61f384
|
Remove NativeActivity
|
2014-03-24 19:57:29 -07:00 |
Dale Stammen
|
04b529d328
|
fixed use of nullptr in variable args for wp8
|
2014-03-24 15:09:24 -07:00 |
boyu0
|
1520f85b32
|
closed #4513: fix titles.
|
2014-03-24 18:20:11 +08:00 |
boyu0
|
759ec61639
|
closed #4513: Particle doesn't animate when readd it.
|
2014-03-24 18:08:55 +08:00 |
James Chen
|
a2d00c8f95
|
Adds another test for stroke.
|
2014-03-24 17:39:23 +08:00 |
James Chen
|
99b65f0a7c
|
LabelTest , changed stroke color to blue.
|
2014-03-24 17:05:24 +08:00 |
andyque
|
4a974e24df
|
revert vcxproj files
|
2014-03-24 10:50:48 +08:00 |
andyque
|
f5795c25b6
|
remove warnings under win32
|
2014-03-24 10:12:40 +08:00 |
Dale Stammen
|
62e45b37f9
|
disabled console for wp8/winrt. Don't quit app for winrt/wp8
|
2014-03-22 06:17:34 -07:00 |
Dale Stammen
|
912d316ae5
|
use ResolutionPolicy::SHOW_ALL for winrt/wp8. disabled console for wp8/winrt
|
2014-03-22 06:16:43 -07:00 |