43260a2bf1
[Windows] Fixing complication errors for WINDOWS.
2013-07-06 10:49:13 +08:00
7e56bb57c8
Merge pull request #3076 from samuele3hu/execDev
...
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-05 01:32:06 -07:00
268245635d
issue #2373 : Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned.
2013-07-05 15:08:52 +08:00
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +08:00
d2746bbe90
issue #2373 : Removing inline for virtual function. Adding more const getter functions.
2013-07-05 15:08:52 +08:00
9eb31df9f3
issue #2244:Replace the tab with space
2013-07-05 11:29:21 +08:00
2aef49f251
issue #2244:Replace the tab with space
2013-07-05 11:24:28 +08:00
267823d473
Merge pull request #3077 from dumganhar/iss2371-template
...
Updating multi-platform-template for iOS and Mac, and deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-04 20:01:33 -07:00
a25dce5b2d
issue #2371 : Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-05 10:52:46 +08:00
bb244edae6
issue #2244:Modify a function name to createCCBReader
2013-07-05 10:25:37 +08:00
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
84ce80dcd2
issue #2371 : [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL .
2013-07-04 16:31:50 +08:00
50a8067b74
issue #2371 : std::vector<std::string>::iterator --> auto in CCFileUtils.cpp.
2013-07-04 16:30:35 +08:00
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
ddf54a4f49
Merge pull request #3054 from simpliplant/windows_keyboard_support
...
Hardware keyboard support (Windows support + Mac fix)
2013-07-03 23:37:13 -07:00
4880543305
Merge pull request #3073 from xxuejie/add-namespace-to-macro
...
Add namespace prefix to selector macros
2013-07-03 23:28:16 -07:00
f019700b91
Merge pull request #3072 from minggo/const_love
...
Fix compiling errors of #3070
2013-07-03 23:19:14 -07:00
a1fbee0bdf
Merge remote-tracking branch 'upstream/develop' into add-namespace-to-macro
...
Conflicts:
cocos2dx/cocoa/CCObject.h
2013-07-04 13:59:36 +08:00
3401c909d8
Add namespace prefix to selector macros
2013-07-04 13:35:11 +08:00
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
c5e5c49332
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-04 09:52:28 +08:00
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
216c6eada5
Adds more const in getters
...
In Sprite and Texture2D
2013-07-03 17:44:41 -07:00
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
77dbe995d4
Merge branch 'develop' into ios_mac_one_project
2013-07-03 11:39:00 -07:00
3fa5c776b8
issue #2359 : Using PositionColor shader when texture is NULL in Sprite.
...
TODO: PostionTextureColor shader should support empty texture.
2013-07-03 23:34:45 +08:00
294f9f34f7
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
2013-07-03 15:51:24 +02:00
7892f1ac9d
Merge pull request #3053 from dumganhar/iss2285-js-motionstreak
...
Adding MotionStreak test for TestJavascript.
2013-07-03 01:36:07 -07:00
92c382be04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support
2013-07-03 10:19:35 +02:00
501afdd2e3
closed #2359 : Sprite will become white block when using CCControlSwitch.
...
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
2013-07-03 16:16:30 +08:00
331c688f6f
Merge pull request #3063 from dumganhar/DarraghCoy-selector_cast_safety
...
Merge PR#3058: Adding extra safety to selector casting macros
2013-07-03 01:09:09 -07:00
bf47cf55c7
Merge pull request #3059 from jotel/shadow-fix
...
Text Shadows fix
2013-07-03 01:00:03 -07:00
2f88109a96
Merge pull request #3055 from DarraghCoy/add_rect_union_with_rect
...
Add Rect::unionWithRect
2013-07-03 00:42:55 -07:00
de15064317
Merge pull request #3062 from minggo/iss2346-opengl-error
...
Fixed a bug in CCTMXLayer when set uniform
2013-07-03 00:31:10 -07:00
f089e62e8f
closed #2361:fix a crsash caused by Set::removeAllObjects
2013-07-03 15:26:58 +08:00
1bd5398f91
Merge branch 'cc_draw_solid_circle' of https://github.com/DarraghCoy/cocos2d-x into cc_draw_solid_circle
2013-07-03 14:45:36 +08:00
5a64c9e1b3
issue #2244:Add some constructor
2013-07-03 14:19:00 +08:00
661a934e82
Merge branch 'selector_cast_safety' of https://github.com/DarraghCoy/cocos2d-x into DarraghCoy-selector_cast_safety
2013-07-03 14:06:53 +08:00
82ba8b0198
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-03 11:20:17 +08:00
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
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
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
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
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
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
ed1fa76fd6
issue #2285 : ccColor3B --> const ccColor3B& for MotionStreak::create.
2013-07-02 17:46:45 +08:00
fc8b60a2cf
fixed issues on win32 and mac keyboard
2013-07-02 11:39:18 +02:00
James Chen