minggo
|
061c20d2b9
|
Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize
|
2013-03-01 11:14:28 +08:00 |
minggo
|
27b62952a4
|
issue #1686:draw polygon in CCFollowAction test case
|
2013-03-01 11:12:23 +08:00 |
James Chen
|
b151f0d0cf
|
Merge pull request #2067 from CocosRobot/updategeneratedsubmodule_1362107063
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-28 19:10:40 -08:00 |
CocosRobot
|
bee13bd7d5
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-03-01 11:04:33 +08:00 |
James Chen
|
b05a4e6acc
|
Merge pull request #2066 from dumganhar/master
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini. Removing some deprecated functions.
|
2013-02-28 19:03:23 -08:00 |
James Chen
|
e4b5ee97b0
|
Updated cocos2dx.ini.
|
2013-03-01 10:58:16 +08:00 |
James Chen
|
65f19f5c53
|
Removing some deprecated functions.
|
2013-03-01 10:57:52 +08:00 |
James Chen
|
501a2612cb
|
tab ~> 4 spaces .
|
2013-03-01 10:45:07 +08:00 |
James Chen
|
7093807f3f
|
CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini.
|
2013-03-01 10:41:06 +08:00 |
minggo
|
7d0eafa42c
|
Merge pull request #2065 from minggo/iss1686-synchronize
issue #1686:fix some compiling error
|
2013-02-28 17:52:45 -08:00 |
minggo
|
7c8bb82c67
|
issue #1686:fix some compiling error
|
2013-03-01 09:51:42 +08:00 |
James Chen
|
c4d0ae211f
|
Merge pull request #2064 from CocosRobot/updategeneratedsubmodule_1362101459
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-28 17:36:54 -08:00 |
CocosRobot
|
86891fb15f
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-03-01 09:31:09 +08:00 |
minggo
|
514799db73
|
Merge pull request #2063 from minggo/iss1686-synchronize
Synchronize to cocos2d-iphone v2.1rc0a
|
2013-02-28 17:28:28 -08:00 |
minggo
|
6a1c28f85c
|
Merge pull request #2062 from jpridavok/master
Flush
|
2013-02-28 17:18:48 -08:00 |
minggo
|
e233909b52
|
Merge pull request #2061 from LemonDo/master
Added ccUTF8.* files in cocos2d-x/template/xcode4/lib_cocos2dx.xctemplate/TemplateInfo.plist
|
2013-02-28 17:17:52 -08:00 |
Jozef Prídavok
|
b7ca4656b6
|
Flush log messages.
|
2013-02-28 16:17:49 +01:00 |
Nika Mamulashvili
|
1cabb1c9cd
|
Corrected Missing ccUTF8.h & ccUTF8.cpp File Links
|
2013-02-28 17:00:22 +04:00 |
minggo
|
70a70d38fc
|
Merge pull request #9 from dumganhar/iss1686-synchronize
issue #1686: Synchronizing LayerTest, LabelTest.
|
2013-02-28 00:48:32 -08:00 |
James Chen
|
3b3adc3eea
|
issue #1686: Synchronizing LayerTest.
|
2013-02-28 16:45:59 +08:00 |
minggo
|
b952634d8e
|
issue #1686:synchronized NodeTest
|
2013-02-28 16:41:39 +08:00 |
minggo
|
dbd5a4069e
|
issue #1686:synchronized ParticleTest
|
2013-02-28 16:40:32 +08:00 |
minggo
|
738b96e478
|
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
|
2013-02-28 16:37:00 +08:00 |
minggo
|
29d6420d52
|
Merge pull request #8 from dumganhar/iss1686-synchronize
issue #1686: Sync ActionsTest.
|
2013-02-28 00:36:28 -08:00 |
minggo
|
c75e440e22
|
issue #1686:synchronized RenderTexture
|
2013-02-28 16:35:42 +08:00 |
James Chen
|
9d4c128391
|
tab ~> 4 spaces
|
2013-02-28 16:06:07 +08:00 |
James Chen
|
16422d7194
|
issue #1686: Updated LayerTest.
|
2013-02-28 16:03:55 +08:00 |
James Chen
|
69a746fc8b
|
issue #1686: Synchronizing LabelTest
|
2013-02-28 15:57:15 +08:00 |
James Chen
|
dbe1e2e427
|
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
|
2013-02-28 15:37:15 +08:00 |
James Chen
|
88fe33e927
|
Sync ActionsTest.
|
2013-02-28 15:32:27 +08:00 |
minggo
|
545882cb81
|
issue #1686:synchronized ShaderTest
|
2013-02-28 15:01:41 +08:00 |
minggo
|
f5e334d9e3
|
issue #1686:synchronized Texture2DTest
|
2013-02-28 14:54:09 +08:00 |
James Chen
|
5abec07fb5
|
Updated ActionsTest.
|
2013-02-28 14:42:45 +08:00 |
James Chen
|
e4b6495aac
|
Updated ActionEaseTest.
|
2013-02-28 14:42:32 +08:00 |
minggo
|
47830a5ef4
|
Merge pull request #7 from dumganhar/iss1686-synchronize
fix for conflict of project.pbxproj and updated with upstream.
|
2013-02-27 21:43:17 -08:00 |
James Chen
|
8ba46c574a
|
fix for conflict of project.pbxproj.
|
2013-02-28 13:37:45 +08:00 |
James Chen
|
56340f9555
|
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
|
2013-02-28 13:01:45 +08:00 |
minggo
|
63e4091bfa
|
fixed #1686:finish updating
|
2013-02-28 11:55:36 +08:00 |
James Chen
|
489e33932c
|
Merge pull request #2036 from jxhgzs/Dependences_project
fixed #1755: Adding CocosDenshion project for iOS.
|
2013-02-27 19:17:44 -08:00 |
James Chen
|
75f05f2c1e
|
Merge pull request #2059 from yuezang/iss1425-luatest
issue #1425: fixed bugs in lua testcase.
|
2013-02-27 19:05:30 -08:00 |
minggo
|
0070371045
|
issue #1686:synchronize CCLabelBMFont.cpp
|
2013-02-28 10:37:47 +08:00 |
jiang xiaohua
|
efc5a4bf2f
|
del include path
|
2013-02-28 10:35:56 +08:00 |
wangshuai
|
b4e13af460
|
issue #1425:
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
|
2013-02-28 10:23:30 +08:00 |
minggo
|
14a35cff11
|
issue #1686:synchronize CCMenu.cpp
|
2013-02-28 10:15:09 +08:00 |
James Chen
|
4aaf6195c4
|
Merge pull request #2057 from CocosRobot/updategeneratedsubmodule_1362016278
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-27 18:00:07 -08:00 |
CocosRobot
|
dfc1cb8139
|
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
|
2013-02-28 09:51:31 +08:00 |
James Chen
|
b17b1109a0
|
Merge pull request #2055 from dumganhar/iss1753-spidermonkey-19
fixed #1753: Upgrading SpiderMonkey to Firefox19.0.
|
2013-02-27 17:47:50 -08:00 |
James Chen
|
3f74cd8190
|
fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port.
|
2013-02-28 09:44:37 +08:00 |
minggo
|
cd4f18c48f
|
issue #1686:synchronize CCLayer.cpp
|
2013-02-27 18:21:35 +08:00 |
James Chen
|
0132d8abbf
|
Merge pull request #2056 from dumganhar/iss1754-tableview-reload
fixed #1754: Wrong offset of the container in CCTableView.
|
2013-02-27 01:54:08 -08:00 |