James Chen
f527387b1e
closed #1690 : Exposing 'cc.Control. addTargetWithActionForControlEvents' and 'cc.Control.removeTargetWithActionForControlEvents' to JS.
2013-08-09 10:58:25 +08:00
James Chen
9ce4388214
Merge branch 'iss1690-cccontorl-js' into iss1690-bind-cccontrol
2013-08-08 14:27:24 +08:00
CocosRobot
6f84509261
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-08 03:02:27 +00:00
CocosRobot
89b3e7e193
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-08 01:44:58 +00:00
James Chen
7910581654
Merge pull request #3388 from dumganhar/iss2483-sp-v23
...
closed 2483: Upgrading spidermonkey library to v23.
2013-08-07 18:39:40 -07:00
CocosRobot
98aae97de3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-07 06:33:44 +00:00
boyu0
ffd821ee13
issue #2345 : update generated index
2013-08-07 13:48:12 +08:00
boyu0
ec6343a9b8
fix js and linux compile error
2013-08-07 10:34:30 +08:00
James Chen
6fdd95e3aa
issue #2483 : The callback type of 'delete' property has been changed from 'JS_PropertyStub' to 'JS_DeletePropertyStub' in v23.
2013-08-07 10:29:12 +08:00
James Chen
aa97e223d8
issue #2483 : Upgrading spidermonkey library to v23 for all supported platforms.
2013-08-07 10:29:12 +08:00
CocosRobot
a53a388005
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-05 05:44:27 +00:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
James Chen
78ad7bcb48
ControlEvent --> Control::EventType.
2013-08-05 10:03:02 +08:00
James Chen
8626455d69
Adding CCControl js binding.
2013-08-05 09:51:46 +08:00
CocosRobot
a6279367d5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-08-02 02:46:30 +00:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
CocosRobot
e1d572fce5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-31 08:26:40 +00:00
Huabing.Xu
b68339ef4e
replace indent by using space instead of tab
2013-07-31 10:58:15 +08:00
Huabing.Xu
c1023b5cb5
closed #2448 : Fix some indent syntax!
2013-07-31 10:46:10 +08:00
Huabing.Xu
832fcf2adb
closed #2448 : Fix crash when call glGetAttachedShaders with a NULL parameter on Windows
2013-07-31 10:37:42 +08:00
James Chen
b9e29cd07e
[JSB] Mark cc.TMXTiledMap.propertiesForGID to deprecated method.
2013-07-29 10:06:39 +08:00
James Chen
324607c32c
More warning fixes.
2013-07-27 15:15:54 +08:00
CocosRobot
0e50b7663e
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-27 04:37:54 +00:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
CocosRobot
7a0e765a39
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 15:22:06 +00:00
James Chen
19d9c08c79
issue #2430 : Fixing compilation errors for lua and js bindings.
2013-07-26 22:15:30 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
CocosRobot
e9b32f1f0c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 12:47:22 +00:00
CocosRobot
9fb6d032ca
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 10:34:03 +00:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +08:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
CocosRobot
97f17913a6
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 06:27:41 +00:00
Ricardo Quesada
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
CocosRobot
53d2e8ac30
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-25 14:36:24 +00:00
James Chen
8958f28257
Reset submodule of scripting/javascript/bindings/generated
2013-07-25 22:01:11 +08:00
minggo
4d7ac6c800
issue #2430:fix conflict
2013-07-25 21:37:12 +08:00
CocosRobot
74cdb25f8f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-25 13:07:58 +00:00
minggo
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
James Chen
0e1bbcfa90
closed #2431 : Potential crash when loading js files.
2013-07-25 17:58:15 +08:00
James Chen
25beed0051
[Android] Fixing path error and reducing dependence for extension.
2013-07-25 16:53:35 +08:00
James Chen
aaf5bcef52
issue #2404 : Invocation of some deprecated methods fixes.
2013-07-25 15:25:11 +08:00
James Chen
f16a64cf4a
issue #2404 : Compilation error fixes.
2013-07-25 11:56:09 +08:00
James Chen
4cc3f63507
closed #2427 : Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS.
2013-07-24 11:51:12 +08:00
CocosRobot
88211a401a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-24 03:06:37 +00:00
Ricardo Quesada
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
CocosRobot
18248b0e85
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-23 14:32:59 +00:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
CocosRobot
2030d9f94b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-22 06:54:13 +00:00
James Chen
50c280fb9d
Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.
2013-07-21 19:10:22 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
CocosRobot
476e53b490
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 15:24:06 +00:00
CocosRobot
f3615b40d5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 03:50:49 +00:00
James Chen
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
CocosRobot
11daa0f769
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 09:53:56 +00:00
CocosRobot
ca06ed4f2c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 07:38:53 +00:00
CocosRobot
2523e7746b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 10:21:56 +00:00
James Chen
86ef8f45e7
Merge branch 'functions' of https://github.com/colesbury/cocos2d-x into colesbury-functions
2013-07-17 17:51:05 +08:00
CocosRobot
e8777b8722
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 09:46:49 +00:00
James Chen
a9eea0a887
issue #2407 : Updating jsb_deprecated.js and cocos2dx.ini.
2013-07-17 17:38:03 +08:00
CocosRobot
8cc8d56ed2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 06:53:49 +00:00
Sam Gross
96c15efb66
Add JSFunctionWrapper in preparation for bindings-generator changes.
2013-07-16 19:30:47 -04:00
CocosRobot
1ea10c75c3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 09:50:03 +00:00
James Chen
b71e9d83e1
Merge pull request #3165 from sunzhuoshi/master
...
Fixed bad js constant names and added config macro for "spine" extension
2013-07-16 02:36:49 -07:00
James Chen
63bd5cf10b
closed #2307 : Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension.
...
The issue was fixed at https://github.com/cocos2d/cocos2d-x/pull/2869 .
Reported at http://www.cocos2d-x.org/boards/20/topics/25430?r=31702
2013-07-16 15:06:36 +08:00
sunzhuoshi
8cad37a8d8
Fixed javascript constant names auto-generated
2013-07-16 14:47:47 +08:00
James Chen
c813ff4b02
issue #2404 : Mark cc.Action.copy and cc.Animation.copy as deprecated methods.
2013-07-16 14:43:20 +08:00
James Chen
570240a75f
Merge pull request #3145 from jdmunro/jsb-distancesq
...
Added JSB support for ccpDistanceSQ
2013-07-15 22:42:37 -07:00
James Chen
92d6fbddd3
Merge pull request #3156 from colesbury/js_log
...
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 22:36:13 -07:00
CocosRobot
c956385841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 05:10:52 +00:00
CocosRobot
5ce0e0df50
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:46:07 +00:00
CocosRobot
c2fc2219f5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 02:33:31 +00:00
James Chen
62b12cbe82
Updating jsb_deprecated.js.
2013-07-16 10:14:52 +08:00
James Chen
a36a4bf19b
issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.
2013-07-16 10:02:02 +08:00
Sam Gross
903b63abaf
Ignore formatting specifiers in JavaScript log messages.
2013-07-15 15:10:02 -04:00
CocosRobot
00052e8f4f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-15 09:03:47 +00:00
jdmunro
43f5b09964
Added JSB support for ccpDistanceSQ.
2013-07-14 09:53:09 +01:00
minggo
34b60e99f1
Merge pull request #3140 from minggo/iss2393-mark_deprecated
...
Use Point, Rect and Size member functions instead of global functions
2013-07-12 08:59:27 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
CocosRobot
e0ed817177
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-12 09:01:48 +00:00
CocosRobot
746a077623
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-12 08:35:39 +00:00
minggo
2d205c235f
closed #2393:fix some warnings
2013-07-12 15:29:32 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +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
CocosRobot
920634d70c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-09 03:29:23 +00:00
CocosRobot
945c967409
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-09 02:19:07 +00: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
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
CocosRobot
bff888507a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-08 08:10:07 +00:00
James Chen
7a7d451acf
issue #2129 : Reverting changes in cocos2d_specifics.cpp
2013-07-08 15:19:26 +08:00
James Chen
17e1b65646
issue #2129 : Adding 'FontDefinition_to_jsval' and reverting some changes.
2013-07-08 15:18:57 +08:00
James Chen
db0a15b02f
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
2013-07-06 15:19:09 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
James Chen
47c28c43c9
Updating auto jsbindings glue codes.
2013-07-05 15:34:45 +08:00
minggo
40effbf3bf
issue #2373:fix a compiling error
2013-07-04 13:58:50 +08:00