James Chen
|
400408f204
|
Merge pull request #5944 from aeonmine/develop
Fix a memory leak in ActionManagerEx::initWithDictionary.
|
2014-03-25 13:48:33 +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 |
aeonmine
|
4edaa62ec7
|
Update CCActionManagerEx.cpp
modify intent
|
2014-03-25 12:41:16 +09: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 |
boyu0
|
db0fe60974
|
closed #3804: Change Image private function and variable to protected, for the subclasses can use them.
|
2014-03-25 11:13:44 +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 |
mine_masahiro
|
3a0ee65a7e
|
Fix ActionObject memory leak bug
|
2014-03-25 11:44:26 +09:00 |
Dhilan007
|
8278a510aa
|
Label:fixed shadow offset didn't consider 'contentScaleFactor'
|
2014-03-25 10:41:53 +08:00 |
pandamicro
|
54e43a9da5
|
Merge pull request #4 from pandamicro/develop
Issue #3897: Make Constructors public in Cocos2d-JS
|
2014-03-25 10:10:16 +08:00 |
Dhilan007
|
859fe98502
|
label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor'
|
2014-03-25 09:58:16 +08:00 |
Dale Stammen
|
b02f5dc21c
|
Merge remote-tracking branch 'upstream/develop' into wp8-3.0-cocos2d-changes
|
2014-03-24 15:09:27 -07:00 |
Dale Stammen
|
04b529d328
|
fixed use of nullptr in variable args for wp8
|
2014-03-24 15:09:24 -07:00 |
TwistedUmbrella
|
9034549932
|
Update README.md
|
2014-03-24 11:28:03 -04:00 |
pandamicro
|
45d4397d20
|
Issue #3897: Make Constructors public in Cocos2d-JS
|
2014-03-24 22:05:19 +08:00 |
boyu0
|
1520f85b32
|
closed #4513: fix titles.
|
2014-03-24 18:20:11 +08:00 |
James Chen
|
bfa7d3e38c
|
Update CHANGELOG [ci skip]
|
2014-03-24 18:12:16 +08:00 |
James Chen
|
e583748347
|
Update AUTHORS [ci skip]
|
2014-03-24 18:10:25 +08:00 |
boyu0
|
759ec61639
|
closed #4513: Particle doesn't animate when readd it.
|
2014-03-24 18:08:55 +08:00 |
James Chen
|
ec4b1ee485
|
Merge pull request #5939 from dumganhar/merge5923
Merge PR #5923: implement fireEventToScript method to integrate JSB event handling with the original native code
|
2014-03-24 18:08:02 +08:00 |
James Chen
|
ae2027ea53
|
Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp
|
2014-03-24 17:59:44 +08:00 |
James Chen
|
e075b82dfe
|
tab -> 4 spaces, whitespace cleanup.
|
2014-03-24 17:58:35 +08:00 |
James Chen
|
b6a175457c
|
Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923
|
2014-03-24 17:55:43 +08:00 |
James Chen
|
666f2f34e9
|
Merge pull request #5938 from pandamicro/develop
Issue #3897: Add missed constructors
|
2014-03-24 17:47:53 +08:00 |
pandamicro
|
bdfcc6c8cc
|
Issue #3897: Add missed constructors
|
2014-03-24 17:44:01 +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 |
James Chen
|
6defa062a8
|
closed #4530: Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7.
|
2014-03-24 16:58:31 +08:00 |
James Chen
|
db7057e6f2
|
closed #4529: Stroke size and shadow offset don't consider ContentScaleFactor
|
2014-03-24 16:58:31 +08:00 |
pandamicro
|
cdb15dfe7c
|
Merge pull request #3 from pandamicro/develop
Sync Cocos2d-x
|
2014-03-24 15:38:44 +08:00 |
James Chen
|
892662c5ef
|
Merge pull request #5932 from pandamicro/ComponentScriptSupport
Component script support
|
2014-03-24 14:41:16 +08:00 |
pandamicro
|
6a8dfc4664
|
Fixed #4512: JSB script support added to Component
|
2014-03-24 14:24:27 +08:00 |
Dhilan007
|
538c01e76e
|
label:support clip blank of upper and lower margin.
|
2014-03-24 14:16:27 +08:00 |
andyque
|
b41879916c
|
issue #4429, fixed Value to string precesion error
|
2014-03-24 12:03:25 +08:00 |
andyque
|
4a974e24df
|
revert vcxproj files
|
2014-03-24 10:50:48 +08:00 |
James Chen
|
3af864a808
|
Merge pull request #5927 from dumganhar/develop
Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
|
2014-03-24 10:27:57 +08:00 |
James Chen
|
f6b94d8c3e
|
Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
|
2014-03-24 10:23:21 +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 |
Dale Stammen
|
0d4ae12f1e
|
disables webp tests for wp8 and winrt
|
2014-03-22 06:15:45 -07:00 |
Dale Stammen
|
2a13bbccc9
|
disabled network tests for wp8/winrt until networking code is added
|
2014-03-22 06:15:18 -07:00 |
Dale Stammen
|
4c03c526c1
|
added missing virtual. disabled console for wp8/winrt until networking code is added
|
2014-03-22 06:14:44 -07:00 |
Dale Stammen
|
4df55dc6ee
|
no mp3 support for wp8. Added define for .wav
|
2014-03-22 06:14:03 -07:00 |
Dale Stammen
|
60d967b5f6
|
added CC_PLATFORM_WINRT and WP8
|
2014-03-22 06:13:27 -07:00 |
Dale Stammen
|
ea9fb140fa
|
no mp3 support for wp8
|
2014-03-22 06:13:02 -07:00 |
Dale Stammen
|
3834d4e80b
|
fix for ABSOLUTE reserved word in wp8 compiler
|
2014-03-22 06:12:32 -07:00 |
Dale Stammen
|
762433e8aa
|
enable CC_ENABLE_CACHE_TEXTURE_DATA for wp8
|
2014-03-22 06:12:04 -07:00 |