Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,214 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

10214 Commits

Author SHA1 Message Date
Ricardo Quesada 216c6eada5 Adds more const in getters 
In Sprite and Texture2D
 2013-07-03 17:44:41 -07:00
Ricardo Quesada 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
James Chen 065146c533 Merge pull request #3067 from dumganhar/develop 
Using PositionColor shader when texture is NULL in Sprite.
 2013-07-03 08:37:23 -07:00
James Chen 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
James Chen 7892f1ac9d Merge pull request #3053 from dumganhar/iss2285-js-motionstreak 
Adding MotionStreak test for TestJavascript.
 2013-07-03 01:36:07 -07:00
James Chen 1a1040bdd5 [manually] Updating auto-generated JS glue codes. 2013-07-03 16:33:34 +08:00
James Chen 75d8e10994 [manual] Updating auto-generated jsbinding glue codes. 2013-07-03 16:27:26 +08:00
James Chen b441871cd1 Merge pull request #3065 from dumganhar/iss2359-ccontrolswitch 
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 01:22:14 -07:00
James Chen 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
James Chen 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
James Chen ed7e208895 Revert some codes in cocos2d_specifics.cpp. 2013-07-03 16:07:06 +08:00
minggo 63c14b7e19 [ci skip] 2013-07-03 16:01:19 +08:00
minggo bf47cf55c7 Merge pull request #3059 from jotel/shadow-fix 
Text Shadows fix
 2013-07-03 01:00:03 -07:00
minggo ab5e7b4b61 [ci skip] 2013-07-03 15:44:28 +08:00
minggo 2f88109a96 Merge pull request #3055 from DarraghCoy/add_rect_union_with_rect 
Add Rect::unionWithRect
 2013-07-03 00:42:55 -07:00
minggo 3e91ab0133 [ci skip] 2013-07-03 15:31:55 +08:00
minggo 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
minggo 735ebf0e7f Merge pull request #3064 from minggo/iss2361-set-bugfix 
fix a crash caused by Set::removeAllObjects()
 2013-07-03 00:29:29 -07:00
minggo f089e62e8f closed #2361:fix a crsash caused by Set::removeAllObjects 2013-07-03 15:26:58 +08:00
minggo 34d4594df3 Merge pull request #3056 from DarraghCoy/cc_draw_solid_circle 
Add ccDrawSolidCircle
 2013-07-03 00:24:20 -07:00
James Chen 72344a318e closed #2363: Fixing compilation errors for JS projects. 2013-07-03 14:57:29 +08:00
minggo 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
James Chen 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
minggo eddd2dd839 [ci skip] 2013-07-03 10:43:04 +08:00
minggo 1519f9dd2f Merge pull request #3057 from DarraghCoy/ccset_bug_fixes 
Bugfixes to the Set class.
 2013-07-02 19:41:29 -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
minggo 55202b978a Merge pull request #3048 from dabingnn/iss2328-refractor-etc 
Iss2328 refractor etc
 2013-07-02 01:37:55 -07: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
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
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