samuele3hu
|
cf1cbe1bd6
|
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
|
2013-07-10 15:04:00 +08:00 |
James Chen
|
d830bb5f96
|
'tile' --> 'getTile', 'orignalTile' --> 'getOrignalTile'
|
2013-07-10 14:17:42 +08:00 |
James Chen
|
a6db6db334
|
issue #2300: A fix of missing invoking 'initXXX' in clone method.(FadeOut, DelayTime).
|
2013-07-10 14:16:42 +08:00 |
Lee, Jae-Hong
|
9322e5594b
|
Support Tizen 2.2 SDK.
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
|
2013-07-10 13:04:08 +09:00 |
minggo
|
91fc0b2a45
|
Merge pull request #3114 from dumganhar/iss2388-default-texture
closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.
|
2013-07-09 21:03:20 -07:00 |
James Chen
|
86b6f26cee
|
issue #2388: Fixing a bug in FadeIn::clone.
|
2013-07-10 11:58:07 +08:00 |
James Chen
|
7594136985
|
issue #2388: Updating comments for cc_2x2_white_image variable.
|
2013-07-10 11:57:35 +08:00 |
James Chen
|
3f57275848
|
issue #2389: Adding cookie support for HttpClient
|
2013-07-10 11:37:39 +08:00 |
zhangbin
|
8071226087
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-07-10 10:41:22 +08:00 |
zhangbin
|
571aeaed7e
|
closed #2390, Resolve the bug in modify game projects tools.
|
2013-07-10 10:40:42 +08:00 |
James Chen
|
ad8a3ac1b5
|
issue #2388: One more static_cast.
|
2013-07-10 10:08:07 +08:00 |
James Chen
|
f6e0b6ca0b
|
issue #2388: Checking whether the texture exists.
|
2013-07-10 10:07:45 +08:00 |
Tomoaki Shimizu
|
eca7db6a50
|
Add append function for String class.
The append function is useful when adding a string.
So, I added it to String class.
|
2013-07-10 10:50:13 +09:00 |
James Chen
|
c545f6d56c
|
Merge pull request #3116 from lgb/small_fix
no more VC2010
|
2013-07-09 18:35:08 -07:00 |
Jaroslaw Lewandowski
|
1fcd6883f1
|
fixing Linux build
|
2013-07-09 23:32:10 +01:00 |
Jaroslaw Lewandowski
|
f1023232db
|
Now opacity option for shadow in CCLabelTTF works.
|
2013-07-09 23:23:41 +01:00 |
Jaroslaw Lewandowski
|
626ba2686f
|
Solving 'black screen' on android
|
2013-07-09 21:21:43 +01:00 |
Oleg Baluk
|
b0401a78be
|
no more VC2010
|
2013-07-10 00:18:23 +04:00 |
James Chen
|
502896b3a6
|
Merge pull request #3115 from azmeuk/linux
Linux Eclipse Projects
|
2013-07-09 07:39:05 -07:00 |
Éloi Rivard
|
05ae6f8518
|
Fixed some warnings
|
2013-07-09 16:33:21 +02:00 |
Éloi Rivard
|
e6354bbf0a
|
Various linux eclipse projects compilation fixes
|
2013-07-09 15:23:19 +02:00 |
Éloi Rivard
|
e5db95d2b9
|
Added deprecated functions ignoring in libcocos2d eclipse project
|
2013-07-09 15:23:19 +02:00 |
Éloi Rivard
|
d0c34cd2ae
|
Removed warnings from external projects (libbox2D & liblua)
|
2013-07-09 15:23:19 +02:00 |
Éloi Rivard
|
b8242cfe97
|
Removed unused include in eclipse HelloLua project
|
2013-07-09 15:23:19 +02:00 |
Éloi Rivard
|
d853934f1b
|
Added -std=c++0x flag in C++ eclipse projects
|
2013-07-09 15:23:19 +02:00 |
James Chen
|
87cec1622c
|
closed #2388: Creating a default texture for CCSprite if setTexture(nullptr) is invoked.
|
2013-07-09 18:33:36 +08:00 |
James Chen
|
66e9f8a187
|
Merge pull request #3113 from dumganhar/iss2381-controlswitch
ControlSwitch was displayed ugly when adding more than one switch.
|
2013-07-09 02:24:49 -07:00 |
James Chen
|
5eb849a789
|
closed #2381: ControlSwitch was displayed ugly when adding more than one switch.
|
2013-07-09 17:23:13 +08:00 |
James Chen
|
65d63380c0
|
Merge pull request #3112 from dumganhar/iss2379-remove-zone
closed 2379: Removing CCZone.h/.cpp.
|
2013-07-09 01:03:19 -07:00 |
James Chen
|
f752196f8e
|
issue #2379: Removing CCZone.cpp/.h for win32 project.
|
2013-07-09 15:42:37 +08:00 |
James Chen
|
582baa0bac
|
issue #2379: Removing CCZone.cpp for Makefile.
|
2013-07-09 15:31:28 +08:00 |
James Chen
|
7f6811e61e
|
issue #2379: Removing unused file - cocos2d.vcxproj.filter.orig.
|
2013-07-09 15:30:50 +08:00 |
James Chen
|
a517e68c59
|
closed #2379: Removing CCZone.h/.cpp.
|
2013-07-09 14:50:31 +08:00 |
James Chen
|
9741d748b5
|
Merge pull request #3111 from dumganhar/iss2387-static_cast-love
issue 2387: Using static_cast instead of C style cast while iterating CCDictionary and CCArray.
|
2013-07-08 23:46:17 -07:00 |
James Chen
|
596c4c3cf2
|
issue #2387: Using static_cast instead of C style cast while iterating CCDictionary.
|
2013-07-09 14:40:43 +08:00 |
James Chen
|
9b9fe67d25
|
issue #2387: Using static_cast instead of C style cast in iteration of CCArray.
|
2013-07-09 14:29:51 +08:00 |
Sergey Shambir
|
3d3a628fb5
|
CocosDenshion: fixed wrong assertion in android OpenSL engine
Playback rate interface cannot be initialized for some players in
android 4.x, it's not cocos2d bug.
|
2013-07-09 08:49:02 +04:00 |
James Chen
|
52a987b84e
|
Merge pull request #3109 from CocosRobot/updategeneratedsubmodule_1373340561
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-08 20:34:23 -07:00 |
CocosRobot
|
920634d70c
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-09 03:29:23 +00:00 |
minggo
|
6d7b9ca236
|
Merge pull request #3108 from minggo/pitch_7platforms
Pitch 7platforms
|
2013-07-08 20:24:15 -07:00 |
minggo
|
38bb041064
|
[ci skip]
|
2013-07-09 10:45:32 +08:00 |
minggo
|
e5a80eed91
|
fixed conflict
|
2013-07-09 10:39:16 +08:00 |
James Chen
|
3a9cc1ec4b
|
Merge pull request #3106 from CocosRobot/updategeneratedsubmodule_1373336344
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-08 19:22:55 -07:00 |
James Chen
|
f17e6c3d14
|
Update AUTHORS [ci skip]
|
2013-07-09 10:21:11 +08:00 |
James Chen
|
9fa6351e83
|
Merge pull request #3105 from dumganhar/hannon235-iss3102-extensionstest-menuscroll
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3103
|
2013-07-08 19:19:21 -07:00 |
CocosRobot
|
945c967409
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-07-09 02:19:07 +00:00 |
James Chen
|
85ef6b3b98
|
closed #2384: Using static_cast instead of C cast in ExtensionsTest.cpp.
|
2013-07-09 10:18:15 +08:00 |
James Chen
|
3c394bba87
|
Merge branch 'iss3102-extensionstest-menuscroll' of https://github.com/hannon235/cocos2d-x into hannon235-iss3102-extensionstest-menuscroll
|
2013-07-09 10:16:31 +08:00 |
James Chen
|
dbc940b472
|
Merge pull request #3101 from dumganhar/remove-copywithzone
issue2300: Removing all 'copyWithZone' pattern.
|
2013-07-08 19:13:39 -07:00 |
James Chen
|
976d4ad11e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
|
2013-07-09 09:48:41 +08:00 |