minggo
|
3fc15e5e7d
|
Merge pull request #5896 from splhack/remove_nativeactivity
Remove NativeActivity
|
2014-03-25 15:37:12 +08:00 |
minggo
|
c526ef600f
|
Merge pull request #5949 from natural-law/develop
Update the reference of submodule "cocos2d-console".
|
2014-03-25 15:35:28 +08:00 |
minggo
|
cab21adf4a
|
Merge pull request #5919 from boyu0/bug4499_ParticleSystem_endRadiusVar_bug
closed #4499: Read ParticleSystem::modeB.endRadiusVar from "minRadiusVariance...
|
2014-03-25 15:34:36 +08:00 |
James Chen
|
b40127ea99
|
Never include '.cpp' files.
|
2014-03-25 15:32:14 +08:00 |
James Chen
|
91347aca0c
|
closed #4541: Removes wrong coments in CCProtectedNode.h.
|
2014-03-25 15:07:46 +08:00 |
James Chen
|
45b98e7dc0
|
issue #4541: s_globalOrderOfArrival is an static variable of Node class.
|
2014-03-25 15:07:11 +08:00 |
LinWenhai
|
19341ceaf4
|
add getter of ClipMarginEnabled.
|
2014-03-25 14:54:42 +08:00 |
CaiWenzhi
|
9a8cf6d813
|
Modify Windows Project
|
2014-03-25 14:28:58 +08:00 |
CaiWenzhi
|
c0b67e6d1b
|
Modify mk files
|
2014-03-25 14:28:58 +08:00 |
CaiWenzhi
|
2dffcb9808
|
Add ProtectedNode and remove "addNode"
|
2014-03-25 14:28:58 +08:00 |
zhangbin
|
beb6f7359c
|
Update the reference of submodule "cocos2d-console".
|
2014-03-25 14:19:46 +08:00 |
James Chen
|
d8793a87b9
|
Update CHANGELOG [ci skip]
|
2014-03-25 14:12:21 +08:00 |
James Chen
|
093b792221
|
Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected
closed #3804: Change private functions and variables in Image class to protected, since its subclasses may need them.
|
2014-03-25 14:07: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
|
2549368c62
|
Update AUTHORS [ci skip]
|
2014-03-25 14:03:48 +08:00 |
James Chen
|
190d0ab0b6
|
Merge pull request #5941 from LoungeKatt/patch-1
Corrected a mistake of building android project in README.md.
|
2014-03-25 14:00:21 +08:00 |
James Chen
|
e11e290d9f
|
Update AUTHORS [ci skip]
|
2014-03-25 13:56:40 +08:00 |
James Chen
|
004d5b421a
|
Merge pull request #5947 from CocosRobot/update_lua_bindings_1395726548
[AUTO]: updating luabinding automatically
|
2014-03-25 13:53:38 +08:00 |
James Chen
|
d2044eeede
|
Update CHANGELOG [ci skip]
|
2014-03-25 13:53:05 +08:00 |
CocosRobot
|
5d2906ad8b
|
[AUTO]: updating luabinding automatically
|
2014-03-25 05:50:20 +00:00 |
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 |