minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
samuele3hu
873a35a557
Merge branch 'DrawNode' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-28 00:27:26 +08:00
samuele3hu
3c953a934e
issue #2404:Add more deprecated function and Modify template vs11 solution
2013-07-28 00:16:16 +08:00
James Chen
6176076bce
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants
2013-07-27 22:36:14 +08:00
James Chen
44b612b56d
Reverting LuaCocos2d.cpp.
2013-07-27 22:34:21 +08:00
samuele3hu
5e37e53e14
issue #2404:Add more deprecated function
2013-07-27 21:57:22 +08:00
James Chen
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
samuele3hu
af9f6fbe3a
issue #2404:Add more deprecated function and modify some test sample
2013-07-27 17:20:22 +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
samuele3hu
ab4aec0dd3
issue #2426:Replace table with spaces
2013-07-27 11:12:12 +08:00
samuele3hu
faa0b46f57
issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample
2013-07-27 10:42:22 +08:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
samuele3hu
a6e514f3d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-27 00:36:20 +08:00
samuele3hu
016593bd0e
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-27 00:28:06 +08:00
James Chen
db61ebef0f
Merge pull request #3281 from CocosRobot/updategeneratedsubmodule_1374852122
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 08:24:55 -07:00
CocosRobot
7a0e765a39
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 15:22:06 +00:00
James Chen
b313ec43fc
Merge pull request #3239 from samuele3hu/TestSample
...
issue #2429:LuaWebSocket supports sending binary string passed by lua
2013-07-26 08:00:52 -07:00
samuele3hu
18819c00ec
issue #2429:Replace table with spaces
2013-07-26 22:56:42 +08:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
samuele3hu
bc83304e23
issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function
2013-07-26 22:50:45 +08:00
James Chen
19d9c08c79
issue #2430 : Fixing compilation errors for lua and js bindings.
2013-07-26 22:15:30 +08:00
samuele3hu
70fcf47a3e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-26 21:39:34 +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
James Chen
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
James Chen
49c727e122
Updating LuaCocos2d.cpp
2013-07-26 19:57:22 +08: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
samuele3hu
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
samuele3hu
b6256be1ad
issue #2404:del a deprecated func
2013-07-26 15:01:31 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +08:00
samuele3hu
0f8d10f9a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:36:50 +08:00
samuele3hu
273bdc8fbd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:35:40 +08:00
CocosRobot
97f17913a6
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-26 06:27:41 +00:00
samuele3hu
deada04d7f
issue #2404:replace some deprecated enums using in the lua
2013-07-26 14:10:45 +08:00
samuele3hu
2288280b2d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 13:57:11 +08:00
James Chen
241cf022a4
Fixing Luabinding errors.
2013-07-26 13:50:10 +08:00
samuele3hu
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
Ricardo Quesada
8bf24f0475
ccGLXXX -> GL::xxx
...
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`
Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
Ricardo Quesada
191aaebe2a
More const fixes
...
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
2013-07-25 17:47:42 -07:00
Ricardo Quesada
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07: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
minggo
d44333ce37
issue #2430:build lua correctly
2013-07-25 21:26:26 +08:00
CocosRobot
74cdb25f8f
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-25 13:07:58 +00:00
minggo
051caf5e54
issue #2430:move TransitionScene enum into class
2013-07-25 20:50:39 +08:00
minggo
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
minggo
beb192ecaa
issue #2430:move Menu enum into class
2013-07-25 20:04:24 +08:00
samuele3hu
11d7c9c653
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
2013-07-25 19:58:59 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08: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
minggo
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
James Chen
25beed0051
[Android] Fixing path error and reducing dependence for extension.
2013-07-25 16:53:35 +08:00
James Chen
653c1f7f8f
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
2013-07-25 16:00:45 +08:00
James Chen
aaf5bcef52
issue #2404 : Invocation of some deprecated methods fixes.
2013-07-25 15:25:11 +08:00
minggo
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
minggo
8dab462f6f
issue #2430:move Director enum into class
2013-07-25 14:39:32 +08:00
minggo
4519a09ce4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-25 13:54:55 +08:00
James Chen
f16a64cf4a
issue #2404 : Compilation error fixes.
2013-07-25 11:56:09 +08:00
Thomas Perl
62958c8321
Qt5 build support (initial work)
2013-07-24 20:18:42 +02:00
minggo
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
samuele3hu
8e0a3b16a1
issue #2429:LuaWebSocket supports sending binary string passed by lua
2013-07-24 15:42:32 +08:00
samuele3hu
5b888d44e4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 15:34:32 +08:00
samuele3hu
ff980477d7
issue #2429:LuaWebSocket supports passing binary string buffer to c++
2013-07-24 15:33:37 +08:00
minggo
ff0cbb9d0b
Merge pull request #3232 from samuele3hu/TestSample
...
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-23 23:33:28 -07:00
samuele3hu
bf692c8fde
issue #2426:Modify tab and spaces
2013-07-24 12:03:54 +08:00
samuele3hu
a52bab7a66
issue #2426:Modify coding style
2013-07-24 11:51:24 +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
samuele3hu
45cc09c6cc
issue #2426:Modify tab and spaces
2013-07-24 10:32:59 +08:00
samuele3hu
4f1a46136a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 10:15:39 +08:00
samuele3hu
e9df175e9a
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-24 10:15:16 +08: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
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
James Chen
9b0f2a6e33
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol
2013-07-22 17:25:29 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
minggo
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07:00
CocosRobot
2030d9f94b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-22 06:54:13 +00:00
samuele3hu
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
samuele3hu
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08: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
samuele3hu
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +08:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08: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
samuele3hu
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
samuele3hu
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08:00
CocosRobot
11daa0f769
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-18 09:53:56 +00:00
minggo
208c1312f4
Merge pull request #3171 from samuele3hu/ScriptHandler
...
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation
2013-07-18 02:48:37 -07: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
samuele3hu
8447341896
issue #2377 : Modify LuaWebScoket linux compile error
2013-07-17 16:40:31 +08:00
CocosRobot
8cc8d56ed2
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-17 06:53:49 +00:00
samuele3hu
c9f0f09dac
issue #2377:Del CallFunc and CallFuncN handler operation and Modify LuaWebScoket linux config
2013-07-17 14:44:28 +08:00
samuele3hu
3018f5b3d7
issue #2377:Adjust some function places.
2013-07-17 13:43:27 +08:00
samuele3hu
6ce5bbf09a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-17 10:16:11 +08:00
samuele3hu
0f1ac9983f
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.
2013-07-17 10:15:25 +08: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
80590dcfc1
Merge pull request #3132 from samuele3hu/ScriptHandler
...
issue 2377:Add scriptHandlerMgr to manager lua script handler
2013-07-16 02:40:50 -07: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
samuele3hu
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08: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
samuele3hu
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +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
samuele3hu
e593956c38
issue #2377:Modify solution config
2013-07-16 13:26:37 +08:00
CocosRobot
c956385841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-16 05:10:52 +00:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08: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
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +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
James Chen
a83cc0ff69
issue #2397 : Updating LUA bindings.
2013-07-15 16:25:46 +08:00
samuele3hu
80a6811f9f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-15 10:39:08 +08:00
samuele3hu
51c3ced4ba
issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples
2013-07-15 10:38:16 +08: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
James Chen
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +08: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
James Chen
853a503d2f
issue #2397 : Updating bindings configuration. [Lua and JS].
2013-07-12 13:48:31 +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
samuele3hu
81ad976eed
issue #2377:Remove registerNotificationHandler function
2013-07-11 16:42:11 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
samuele3hu
ff29d2b5d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-11 13:40:16 +08:00
samuele3hu
9007b9feee
issue #2377:Replace the CallFunc script Handler and repair Testlua Bug
2013-07-11 13:38:25 +08:00
samuele3hu
31d0e492c2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-10 15:05:02 +08:00