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
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
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
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
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
samuele3hu
45cc09c6cc
issue #2426:Modify tab and spaces
2013-07-24 10:32:59 +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
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
samuele3hu
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +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
samuele3hu
8447341896
issue #2377 : Modify LuaWebScoket linux compile error
2013-07-17 16:40:31 +08: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
0f1ac9983f
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.
2013-07-17 10:15:25 +08:00
samuele3hu
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08:00
samuele3hu
e593956c38
issue #2377:Modify solution config
2013-07-16 13:26:37 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +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
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
James Chen
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +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
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
samuele3hu
cf1cbe1bd6
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
2013-07-10 15:04:00 +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
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
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
minggo
b39e7e205f
issue #2129:modify pkg files
2013-07-08 11:34:31 +08:00
minggo
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
samuele3hu
bb244edae6
issue #2244:Modify a function name to createCCBReader
2013-07-05 10:25:37 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
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
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +08:00
James Chen
1755e7778f
close #2371 : Updating LuaCocos2d.cpp.
2013-07-04 17:15:48 +08:00
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +08:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
samuele3hu
fe8e30c3e0
issue #2243:Add a uniform fund in ScriptEngineProtocol
2013-07-01 15:04:14 +08:00
minggo
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
samuele3hu
3b058fe019
issue #2276 : Add OpenGL lua module
2013-06-25 14:55:57 +08:00
samuele3hu
b9d79293cd
issue #2276 : Modify InitLuaScrollView to initLuaScrollView
2013-06-21 15:46:59 +08:00
samuele3hu
a6d072e679
issue #2276 : Modify LuaScrollView create method
2013-06-21 15:42:39 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
Sam Clegg
203d2e4559
Fix compile warnings in LuaOpengl.cpp
2013-06-20 12:56:12 -07:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
James Chen
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
James Chen
36d82c9384
closed #2129 : Updating LuaCocos2d.cpp.
2013-06-20 15:10:44 +08:00
James Chen
ba1fe39d91
issue #2129 : Removing CC prefix for scripting module.
2013-06-20 14:33:59 +08:00
samuele3hu
fb075d7a7d
issue #2277 : Delete some conflict file and resolve some error
2013-06-20 11:28:16 +08:00
samuele3hu
0c4f99080b
issue #2277 : modify platform config except win32
2013-06-20 10:19:46 +08:00
samuele3hu
b818001007
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-19 16:43:15 +08:00
samuele3hu
b48cf5997d
issue #2277 : Add OpenGL lua test samples
2013-06-19 16:40:02 +08:00
James Chen
504a9e714e
issue #2300 : copy --> clone for luabinding.
2013-06-19 12:08:26 +08:00
samuele3hu
778708426c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop
2013-06-17 14:38:08 +08:00
samuele3hu
26f1bd5171
issue #2277 : Add OpenGL lua binding
2013-06-17 14:19:00 +08:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +08:00
James Chen
007a33f89a
Merge pull request #2809 from edwardzhou/master
...
issue #2103 : correct the type detecting order for Lua CCBProxy::getNodeTypeName.
2013-06-07 19:37:19 -07:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
Edward Zhou
9cc351f47b
correct the type detecting order forgetNodeTypeName
2013-06-07 19:49:22 +08:00
samuele3hu
50f44db9a8
issue #2103 add webSocket lua test sample
2013-06-07 17:02:00 +08:00
samuele3hu
16a34b0da3
issue #2103 add webSocket lua test sample
2013-06-07 16:51:50 +08:00
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00
samuele3hu
7101bc4377
issue #2103 remove simple cocosbuilder sample
2013-06-03 14:59:04 +08:00
samuele3hu
afa6b81ba7
issue #2103 add cocosbuilder lua bind and add a simple sample
2013-06-03 13:47:12 +08:00