boyu0
70df1a6061
closed #2517 : Use LocalVarToAuto.py to change Samples src file
2013-08-16 16:05:27 +08:00
samuele3hu
de3335a4a9
issue #2433:Update lua manual binding and modify some samples
2013-08-16 10:12:46 +08:00
samuele3hu
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
samuele3hu
f29525bbc6
issue #2433:Modify Testlua sample and add some manual binding functions
2013-08-15 15:51:22 +08:00
samuele3hu
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
folecr
cbd7796438
Update nojava.txt with readme.
2013-08-07 12:29:58 -07:00
minggo
910215fa89
Merge pull request #3377 from boyu0/iss2345_refactor_ccimage
...
issue #2345 refactor CCImage and CCTexture2D
2013-08-06 23:29:38 -07:00
James Chen
a5067f63dd
Merge pull request #3372 from pyrasis/tizen_2.2
...
[Tizen] Fix Debug Settings
2013-08-05 22:51:06 -07:00
boyu0
dc6503f7d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
2013-08-06 13:37:38 +08:00
boyu0
94f9921d5e
issue #2345 : edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D
2013-08-06 11:34:48 +08:00
folecr
1721e90e3d
Update TestLua
2013-08-05 16:41:34 -07:00
Lee, Jae-Hong
3db495ab0e
[Tizen] Fix Debug Settings.
...
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09:00
James Chen
5aab0cab7b
[Android] Fixing build errors for ndk-r9.
2013-07-29 14:54:00 +08:00
samuele3hu
a6d2ab40f0
Modify ActionTest sample of lua to add draw functions
2013-07-29 11:44:56 +08:00
samuele3hu
af9f6fbe3a
issue #2404:Add more deprecated function and modify some test sample
2013-07-27 17:20:22 +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
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
samuele3hu
bc83304e23
issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function
2013-07-26 22:50:45 +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
3bc45e665c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 19:56:04 +08:00
James Chen
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
samuele3hu
273bdc8fbd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:35:40 +08:00
James Chen
d345ac7f3f
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
2013-07-26 14:00:10 +08:00
samuele3hu
2288280b2d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 13:57:11 +08:00
samuele3hu
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
James Chen
a1c3631962
issue #2404 : DrawPrimitives deprecated.
2013-07-25 22:38:55 +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
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
a52bab7a66
issue #2426:Modify coding style
2013-07-24 11:51:24 +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
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +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
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
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
Ricardo Quesada
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
samuele3hu
847b87b297
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-17 14:45:02 +08:00
James Chen
d3bf9935cd
Merge pull request #3166 from dumganhar/iss2410-blackscreen-android
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
2013-07-16 23:25:01 -07:00
James Chen
56419b9e90
issue #2410 : [Android] Adding listener for CCDrawNode when application resume from background.
...
Reset the order of reloading shaders and textures in main.cpp.
2013-07-17 12:53:30 +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
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +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
33c37f5f9d
issue #2397 : CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
2013-07-12 14:44:24 +08:00
James Chen
4a7e884de8
issue #2397 : UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance();
2013-07-12 14:34:57 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
James Chen
41957f06c9
issue #2397 : sharedAnimationCache --> getInstance.
2013-07-12 13:54:56 +08:00
James Chen
1f8e852020
issue #2397 : Shader::sharedShaderCache() --> Shader::getInstance().
2013-07-12 13:40:01 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
James Chen
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50: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
samuele3hu
ea0a19e7a2
issue #2377:Adjust tab and space
2013-07-11 16:49:29 +08:00
samuele3hu
81ad976eed
issue #2377:Remove registerNotificationHandler function
2013-07-11 16:42:11 +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
samuele3hu
cf1cbe1bd6
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
2013-07-10 15:04:00 +08:00
Lee, Jae-Hong
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
Éloi Rivard
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
James Chen
7d3a63bb23
issue #2371 : Adding HelloLua and TestLua projects for MAC.
2013-07-04 17:10:47 +08:00
James Chen
83b23c67fd
issue #2371 : Set design resolution for TestLua.
2013-07-04 17:07:34 +08:00
James Chen
4196f2036e
Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix
...
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 08:41:28 -07:00
James Chen
3e052d5525
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 23:21:06 +08:00
minggo
6539fd52ba
Merge pull request #2989 from samuele3hu/glMoudle
...
issue #2276 : Add OpenGL lua module
2013-06-25 02:23:15 -07:00
samuele3hu
46bcf6ddba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle
2013-06-25 15:22:14 +08:00
samuele3hu
3b058fe019
issue #2276 : Add OpenGL lua module
2013-06-25 14:55:57 +08:00
folecr
6708983de2
Update target to android-10 for NDK code
2013-06-24 15:14:14 -07:00
folecr
7d4ce91b6b
Up the minSdkVersion to 9
2013-06-24 15:14:14 -07:00
James Chen
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
James Chen
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
James Chen
80cb06d3f7
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-24 10:01:57 +08:00
James Chen
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
James Chen
88a0dbec5e
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-21 21:29:25 +08:00
minggo
0a768da240
issue #2305 : use 4.7 toolchain to fix compiling errors
2013-06-21 17:17:23 +08:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
samuele3hu
35f0b07aa6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 11:16:46 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +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
samuele3hu
c527fecfe3
issue #2276 : Add scrollview sample test in cocosbuilder and modify some config
2013-06-21 10:43:02 +08:00
Sam Clegg
04d7d5a061
[NaCl] Add support for building using glibc toolchain.
...
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/14694016
2013-06-20 12:56:14 -07:00
Sam Clegg
5c4545de3c
[NaCl] Remove use of -lnosys
2013-06-20 12:56:13 -07:00
Sam Clegg
47878c1855
[NaCl] Remove legacy nacl_mounts usage.
...
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
2013-06-20 12:56:12 -07:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
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
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
1fb9f44d15
issue #2129 : Removing CC prefix for samples module.
2013-06-20 14:17:10 +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
James Chen
3cd82c8bf3
Merge pull request #2917 from pyrasis/tizen_2.1
...
[Tizen] Enable Hardware Acceleration.
2013-06-18 04:32:18 -07:00
Lee, Jae-Hong
4b828cfff2
Enable Hardware Acceleration.
2013-06-18 19:17:49 +09: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
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09:00
James Chen
b0669b4f7d
[Tizen] Updating project configurations.
2013-06-09 18:56:22 +08:00
James Chen
b388e7e45e
[win32] Updating TestLua.
2013-06-09 18:34:02 +08:00
James Chen
0a8ae1e79f
[BB] Updating project configuration after adding CocoStudio runtime.
2013-06-09 15:29:51 +08:00
samuele3hu
bc699c1c1e
issue #2103 modify AudioEngine framework and CocosDenshionTest sample
2013-06-09 10:32:23 +08:00
James Chen
4edd35e2b1
Merge pull request #2829 from dumganhar/nacl-fix
...
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
2013-06-08 03:00:04 -07:00
James Chen
aee8e829ca
[Android] Updating Application.mk for HelloLua and TestLua.
2013-06-08 17:28:03 +08:00
James Chen
bf781feba1
[NaCL] Updating project.
2013-06-08 16:08:55 +08:00
James Chen
51aa2433fc
Updating makefile for native client.
2013-06-08 15:35:45 +08:00
samuele3hu
836bfe1d3f
issue #2103 modify audioEngine table name to AudioEngine
2013-06-08 14:06:19 +08:00
samuele3hu
34b4cb48ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
2013-06-08 11:25:51 +08:00
samuele3hu
4be415cc04
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
2013-06-08 11:23:21 +08:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
7c650d7f28
[BB] Updating project configuration.
2013-06-07 18:45:58 +08:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
James Chen
e3e90db71c
[BB] Adding extra lua script resource folder for TestLua.
2013-06-07 18:16:10 +08:00
samuele3hu
dda3c34be8
issue #2103 add webSocket lua test sample
2013-06-07 17:48:07 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +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
cdbf8b7250
issue #2103 add webSocket lua test sample
2013-06-07 13:55:36 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
minggo
4fa069df58
issue #2103:copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 23:04:26 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
James Chen
ed4b9b2bb3
Marmalade projects fix.
2013-06-06 14:26:35 +08:00
minggo
cdf09c04ea
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 17:43:49 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
samuele3hu
37b508ad6d
issue #2103 modify some compile setup
2013-06-03 18:25:37 +08:00
samuele3hu
23eec2f1ce
issue #2103 modify some compile setup
2013-06-03 18:14:06 +08:00
samuele3hu
9352b60653
issue #2103 modify some compile setup and del some resource file
2013-06-03 17:40:31 +08:00
samuele3hu
bf1cd2e909
issue #2103 modify some compile setup
2013-06-03 16:56:45 +08:00
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00