Commit Graph

10639 Commits

Author SHA1 Message Date
É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
minggo d01a388a1c Merge pull request #3104 from ricardoquesada/static_cast_love
From C++ best practices
2013-07-08 18:26:53 -07:00
Ricardo Quesada c7bf2ead10 More static_cast<> 2013-07-08 14:42:08 -07:00
Ricardo Quesada 9fe9341646 From C++ best practices
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
Chris Hannon bba9722faa iss3102: make extension test submenu in TestCpp scrollable to access all entries 2013-07-08 16:20:24 -04:00
dumganhar b41dd9277d issue #2300: Warning fixes. 2013-07-08 23:12:11 +08:00
dumganhar 9b126e79d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo cc545f1441 Merge pull request #3098 from minggo/iss2129-remove_prefix
use capital words for static const member variables
2013-07-08 03:41:32 -07:00
minggo da41046e4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2129-remove_prefix 2013-07-08 18:12:38 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
pktangyue 3e5c62f905 fix CCScale9Sprite CapInsets bug for rotated sprite frame 2013-07-08 17:00:27 +08:00
James Chen d0b7b403b9 Merge pull request #3096 from CocosRobot/updategeneratedsubmodule_1373270989
[ci skip] [AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-08 01:16:01 -07:00
CocosRobot bff888507a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-08 08:10:07 +00:00
minggo cd1801d324 Merge pull request #3085 from minggo/iss2129-remove_prefix
issue #2129:remove prefix of types in ccTypes.h
2013-07-08 01:03:29 -07:00
minggo cf96ec079e Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
Bug fixes. Please see the commits for details.
2013-07-08 00:40:23 -07:00
James Chen 962207a48a Adding some logs in travis script. 2013-07-08 15:27:49 +08:00
James Chen 466a64ba05 issue #2129: Updating bindings-generator. 2013-07-08 15:25:04 +08:00
James Chen c07eda8894 issue #2129: Updating cocos2dx.ini. 2013-07-08 15:19:46 +08:00
James Chen 7a7d451acf issue #2129: Reverting changes in cocos2d_specifics.cpp 2013-07-08 15:19:26 +08:00