minggo
1519f9dd2f
Merge pull request #3057 from DarraghCoy/ccset_bug_fixes
...
Bugfixes to the Set class.
2013-07-02 19:41:29 -07:00
Ricardo Quesada
2b73d0cb5f
ios and mac projects unified in one simple xcode project
...
Not finished yet:
- iOS only includes Test Cpp (Simple Game not working yet on iOS)
It is easier to maintain and add more targets, files, etc.
2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski
d26fa847d8
- Fixing shadows for text with stroke in iOS
...
- Improved text shadows in Android (they look the same as in iOS)
2013-07-02 22:45:07 +01:00
Darragh Coy
abbbc3191e
Add extra safety to selector casting macros
...
Use static_cast<> instead of C-Style casts in the callfunc0_selector() etc. series of macros as this will allow the compiler to perform more stringent error checking and catch out cases where incompatible function signatures are being casted. This helps prevent very subtle and difficult to track down bugs where the signature of the function being casted is not what Cocos2dx expect - which can cause strange things to happen and corrupt the current stack frame.
2013-07-02 14:36:09 -07:00
Darragh Coy
e6270e64de
Bugfixes to the Set class.
...
1: If adding an object to the container then only retain the object again provided it's not already been added. The underlying std::set does not support duplicate entries. (see: www.cocos2d-x.org/boards/6/topics/10876)
2: When removing an object only CC_SAFE_RELEASE it if it was actually contained in the set. (see: http://www.cocos2d-x.org/boards/6/topics/10876 )
3: Fix a bug in 'removeAllObjects' where the underlying std::set container was not being cleared. (see: https://github.com/cocos2d/cocos2d-x/issues/2283 )
2013-07-02 14:24:14 -07:00
Darragh Coy
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
Darragh Coy
da58f035c5
Add CCRect::unionWithRect
...
Add a new CCRect utility function called 'unionWithRect' which computes the minimum rectangle that contains the current rectangle and another given rectangle, similar to to the following .NET function: http://msdn.microsoft.com/en-us/library/ms521839.aspx
2013-07-02 11:39:49 -07:00
James Chen
28b3028646
Updating bindings-generator.
2013-07-02 18:24:31 +08:00
James Chen
54736814fa
issue #2285 : New JS-test MotionStreak.
2013-07-02 17:57:48 +08:00
James Chen
d446f90016
close #2285 : Updating tools/tojs/cocos2d-x.ini.
2013-07-02 17:48:06 +08:00
James Chen
53884d8238
issue #2285 : Adding MotionStreak test for TestJavascript.
2013-07-02 17:47:33 +08:00
James Chen
ed1fa76fd6
issue #2285 : ccColor3B --> const ccColor3B& for MotionStreak::create.
2013-07-02 17:46:45 +08:00
Rene Klacan
fc8b60a2cf
fixed issues on win32 and mac keyboard
2013-07-02 11:39:18 +02:00
minggo
55202b978a
Merge pull request #3048 from dabingnn/iss2328-refractor-etc
...
Iss2328 refractor etc
2013-07-02 01:37:55 -07:00
Shuja Shabandri
fee6a2fc87
pointQueryFirst in Space class returns invalid Shape when a shape is not found
2013-07-02 12:24:17 +04:00
Shuja Shabandri
96f8b59b9f
PivotJoint class constructor will now take 3 or 4 arguments like in html5
2013-07-02 12:20:33 +04:00
samuele3hu
f32e23ff81
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-02 15:46:38 +08:00
Huabing.Xu
dded008909
issue #2328 refractor etc support:remove comments
2013-07-02 15:46:17 +08:00
Huabing.Xu
5929c7662c
issue #2328 refractor etc support:
...
1. GL_ETC1_RGB8_OES not defined will return not support hardware etc
2. remove some space and comments
2013-07-02 15:36:47 +08:00
samuele3hu
ec801ae89d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-02 15:29:19 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
James Chen
fe42a722ae
Merge pull request #3049 from dumganhar/develop
...
LayerColor::initWithColor should return false when Layer::init() returns false.
2013-07-01 23:46:15 -07:00
James Chen
b843d3cd88
LayerColor::initWithColor should return false when Layer::init() returns false.
2013-07-02 14:45:06 +08:00
Huabing.Xu
5aa0299160
adjust cocos2d.vcxproj.filters
2013-07-02 14:09:01 +08:00
Huabing.Xu
041bef148a
Merge branch 'origin/develop'
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d.vcxproj.filters
2013-07-02 13:47:02 +08:00
zhangbin
849276d0f3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-07-02 10:58:44 +08:00
zhangbin
5b1d5e0d3e
closed #2349 , Add user login/logout plugin UC.
2013-07-02 10:51:01 +08:00
James Chen
92a7c2c406
Merge pull request #3046 from dumganhar/ricardoquesada-unified_mac_project
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3045
2013-07-01 19:46:04 -07:00
James Chen
eeff9b3d75
issue #2325 : [MAC] Adding missing resources for TestCpp.
2013-07-02 10:43:21 +08:00
James Chen
ec5edeb8f6
issue #2325 : Updating title for Mac projects.
2013-07-02 10:42:50 +08:00
James Chen
74149c7f11
Merge branch 'unified_mac_project' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-unified_mac_project
2013-07-02 10:14:54 +08:00
James Chen
9e6bdc8a2d
Merge pull request #3044 from ricardoquesada/physics_sprite_no_defines
...
Removes #if from header class for PhysicsSprite.
2013-07-01 19:10:09 -07:00
Ricardo Quesada
c38e932fe8
Adds SimpleGame and HelloCpp to the mac samples project
2013-07-01 17:31:03 -07:00
Ricardo Quesada
9e13cb91a5
Adds xcworspace data
2013-07-01 16:33:17 -07:00
Ricardo Quesada
92469a635c
CrystalCraze and CocosDragon added
2013-07-01 16:24:41 -07:00
Ricardo Quesada
1e6a7f6bbc
MoonWarriors works on Mac
2013-07-01 16:02:36 -07:00
Ricardo Quesada
631ea4ef1d
restore js shared
2013-07-01 15:26:03 -07:00
Ricardo Quesada
527d209ca8
Tries to compile WaterMelonWithMe
2013-07-01 15:20:31 -07:00
Ricardo Quesada
f83383b86c
removes unused projects
2013-07-01 14:43:47 -07:00
Ricardo Quesada
87fc7d4d62
cocos2d mac project redesigned
2013-07-01 14:41:39 -07:00
Ricardo Quesada
b434f7332a
Removes #if from header class
...
preventing ugly bugs
2013-07-01 11:52:04 -07:00
Ricardo Quesada
464d60e24b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into unified_mac_project
2013-07-01 10:39:03 -07:00
James Chen
302779b28a
Merge pull request #3039 from dumganhar/iss2347-keyboard-macro
...
Macros like CC_KEYBOARD_SUPPORT should not be in header file.
2013-07-01 08:09:31 -07:00
James Chen
34871d47af
close #2347 : Updating tools/tojs/cocos2dx.ini.
2013-07-01 22:34:57 +08:00
James Chen
8a4eab608e
Merge branch 'iss2347-keyboard-macro' of https://github.com/dumganhar/cocos2d-x into iss2347-keyboard-macro
2013-07-01 22:33:30 +08:00
James Chen
4e5ee103ec
Fixing errors on windows.
2013-07-01 18:22:09 +08:00
Huabing.Xu
9642930779
give Texture2D::_pixelFormat a default value in construction
2013-07-01 18:16:56 +08:00
Huabing.Xu
ae47e94db9
change test case, all platform not can read pkm file
2013-07-01 18:15:59 +08:00
Huabing.Xu
4e9e893c8e
1. Add C++ code to decode ETC file
...
2. Configuration and function supportsETC()
2013-07-01 17:40:57 +08:00
James Chen
c2ce65a32b
issue #2347 : Compiled ok for android, marmalade and nacl, windows needs to be tested too.
2013-07-01 17:35:51 +08:00