samuele3
61d8f9673c
issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd'
2013-11-05 17:34:25 +08:00
samuele3
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
samuele3
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
James Chen
a3a2b0274e
Updating submodule of bindings-generator.
2013-11-05 14:23:48 +08:00
James Chen
f968169da4
Update run-script.sh
2013-11-04 21:59:03 +08:00
James Chen
6a351711ae
[cmake] update run-script.sh
2013-11-04 21:05:29 +08:00
James Chen
b1a9843091
[cmake] update run-script.sh
2013-11-04 21:03:09 +08:00
minggo
cde79a9724
use -j10 to build android samples
2013-11-04 18:01:42 +08:00
James Chen
a823e66f8e
Update run-script.sh
...
Adding soft-link for `samples/Cpp/SimpleGame/proj.android/obj`.
2013-11-03 14:36:22 +08:00
minggo
d4210c77bb
Merge pull request #4058 from samuele3hu/developAssetsManager
...
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-11-01 02:50:47 -07:00
samuele3
80f3a7d57a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
minggo
915d75ea7c
build release version of android samples
2013-11-01 16:44:35 +08:00
James Chen
8e7ed129c5
Update before-install.sh
2013-11-01 15:39:46 +08:00
James Chen
daf4e22819
[Bindings] Skip Label::getLettersInfo
2013-11-01 15:34:08 +08:00
samuelhu
e93bcca13e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-11-01 14:44:21 +08:00
samuelhu
b0fdb66d2d
Modify the all luajit build scripts and let libluajit.a of mac only support 64bit
2013-11-01 14:38:14 +08:00
James Chen
72d6f8650b
Regular expression fix for generate-jsbindings.sh.
2013-11-01 11:50:43 +08:00
James Chen
1d932ae95f
Updating travic-ci scripts.
2013-11-01 11:46:02 +08:00
James Chen
0298c338a6
issue #2826 : Updating cocos2d-console submodule.
2013-11-01 10:46:06 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
James Chen
d1b88b0a78
[sp v25] Updating auto-generated and bindings-generated submodules.
2013-10-31 11:15:17 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
lite3
21d7dcaf3a
add some options
...
Usage: android_mk_generator.py [options]
Options:
-h, --help show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
2013-10-30 16:44:21 +08:00
lite3
51f30a01d5
replace os.path.samefile
...
os.path.samefile not work at windows.
2013-10-30 16:43:19 +08:00
lite3
2e3b3be125
config android_mk_generator
2013-10-29 22:53:01 +08:00
Dhilan007
3305dd1de3
issues #2905:add miss file
2013-10-23 17:05:27 +08:00
samuelhu
5f769b2313
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-10-22 16:52:44 +08:00
samuelhu
be1f17ca0f
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-22 16:14:49 +08:00
Dhilan007
f11dba586a
issue #2905:modification vs-project for folder structure change
2013-10-21 22:09:21 +08:00
James Chen
d6be31f74a
Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix
2013-10-18 10:40:12 +08:00
James Chen
5c5f2d84e2
issue #2905 : Updating tolua settings.
2013-10-16 16:27:45 +08:00
James Chen
6fba0dd5db
issue #2905 : [iOS Mac] TestJavascript works now.
2013-10-16 15:43:59 +08:00
Toru Matsuoka
de9e831e35
Fix definition of platform for ios and mac.
...
Remove unnecessary files
2013-10-14 20:42:45 +09:00
Toru Matsuoka
613bb89120
Make "rename" setting usable.
2013-10-14 20:19:21 +09:00
minggo
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
minggo
4313c46e93
issue #2905:adjust folder structure
2013-10-12 11:22:05 +08:00
minggo
9cf7d48d62
include correct path in cocos2dx.ini to generate audio lua binding
2013-10-10 17:04:36 +08:00
minggo
7b7aabf2de
include correct path in cocos2dx.ini to generate audio binding
2013-10-10 16:54:05 +08:00
samuele3hu
531e454eae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
samples/samples.xcodeproj/project.pbxproj
2013-10-10 11:47:36 +08:00
Dhilan007
20971b0ad2
issues #2895:Synchronize JSB from master to developer
2013-10-08 15:57:34 +08:00
samuele3hu
508654738a
issue #2768:Modify armature test sample and skip some functions to lua
2013-10-08 15:45:13 +08:00
samuele3hu
4c1bd825af
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
2013-10-08 10:17:58 +08:00
James Chen
5673af2b3e
Updating Bindings-generator.
2013-09-22 10:23:48 +08:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
Ricardo Quesada
4f07dbaece
Restores .py file to its original layout
2013-09-19 18:32:47 -07:00
Ricardo Quesada
51834e5291
Xcode template projects fixes
...
Updats the xcode project with recommended fixes from Xcode 5.0
2013-09-19 18:27:11 -07:00
Ricardo Quesada
7ecb9778a3
Product Name is the project name
2013-09-19 18:12:02 -07:00
minggo
b91b350f2b
Merge pull request #3666 from Dhilan007/develop
...
android platform:fix EditBox not show input box and crash.
2013-09-17 18:33:43 -07:00
minggo
fce3aa756d
Merge pull request #3667 from dabingnn/release30_bug_hot_fix
...
check glfw has been installed when installing glfw
2013-09-17 08:41:00 -07:00
Huabing.Xu
e521d881b2
check glfw has been installed when installing glfw
2013-09-17 23:26:54 +08:00
minggo
d488796896
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics
2013-09-17 18:14:12 +08:00
Dhilan007
a39e0d8521
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
2013-09-17 18:06:48 +08:00
samuele3hu
068d0140d9
Manual bind the getDescendants function of the SpriteBatchNode class
2013-09-17 17:41:53 +08:00
boyu0
a454e373c7
issue #2771 : move include chipmunk and box2d to cpp
2013-09-17 17:39:08 +08:00
Dhilan007
18cea20634
Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop
2013-09-17 17:14:20 +08:00
boyu0
b5b6406976
issue #2771 : edit compile setting.
2013-09-17 17:09:07 +08:00
Dhilan007
5d8ea9f1e5
JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp".
2013-09-17 17:03:45 +08:00
boyu0
89ec5edf78
issue #2771 : edit compile setting.
2013-09-17 16:42:24 +08:00
samuele3hu
3809a6feed
Repair some lua test samples bug and del tool/tolua++ folders
2013-09-17 13:59:48 +08:00
minggo
e4f8929898
Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement
...
Issue 2808 glfw bug enhancement
2013-09-15 20:18:02 -07:00
Huabing.Xu
20fde2bcde
issue #2808:glfw linux scripts
2013-09-16 10:11:46 +08:00
samuele3hu
aa4c90e97a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
...
Conflicts:
extensions/cocos-ext.h
2013-09-14 19:29:36 +08:00
James Chen
dd7bfd7b60
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase
...
Conflicts:
cocos2dx/CCDirector.h
cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
cocos2dx/menu_nodes/CCMenu.h
cocos2dx/platform/CCAccelerometerDelegate.h
cocos2dx/platform/android/CCAccelerometer.h
cocos2dx/platform/ios/CCAccelerometer.h
cocos2dx/platform/mac/CCAccelerometer.h
cocos2dx/platform/win32/CCAccelerometer.h
cocos2dx/script_support/CCScriptSupport.h
cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
cocos2dx/touch_dispatcher/CCTouchDispatcher.h
cocos2dx/touch_dispatcher/CCTouchHandler.h
extensions/CocoStudio/Components/CCInputDelegate.h
2013-09-13 19:06:09 +08:00
James Chen
ff24eac21a
[dispatcher] Adding new EventDispatcher Test to Makefile and project.
2013-09-13 18:08:00 +08:00
samuele3hu
3a334b7478
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen
2013-09-13 11:42:04 +08:00
samuele3hu
a34ec99014
issue #2784:Add js-binding and lua-binding document
2013-09-13 11:41:20 +08:00
James Chen
24c8438fa6
[Dispatcher] Updating Android.mk, and some refractor.
2013-09-12 17:31:37 +08:00
James Chen
ce52997fc2
[Dispatcher] Updating tools/tojs/.ini
2013-09-12 15:34:14 +08:00
James Chen
2603e4acf4
Merge pull request #3540 from samuele3hu/TableView
...
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-11 02:52:38 -07:00
성낙호
bf4eaa7e7c
merged
2013-09-09 18:20:16 +09:00
samuele3hu
357466bab2
issue #2768:Add Armature lua binding and releated test samples
2013-09-09 10:20:32 +08:00
minggo
249b4d79a3
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
...
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
samuele3hu
4f9a9bfe85
issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
2013-09-04 22:17:26 +08:00
samuele3hu
5ee2a7e58e
issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator
2013-08-30 17:15:16 +08:00
samuele3hu
8f338cc209
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new
...
Conflicts:
tools/tolua/cocos2dx.ini
2013-08-30 15:21:59 +08:00
Huabing.Xu
ef7f51d875
issue #2460 : script compile error
2013-08-30 10:29:59 +08:00
Huabing.Xu
0136a2cb0f
issue #2460 : script compile error
2013-08-30 09:37:48 +08:00
Huabing.Xu
850b5514cf
issue #2460 : travis scripts
2013-08-29 18:10:12 +08:00
James Chen
f9872e396c
closed #2747 : Don't skip cc.Sprite.getDisplayFrame.
2013-08-28 18:17:52 +08:00
samuele3hu
1dabab2ca5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.cpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto.hpp
scripting/lua/cocos2dx_support/generated/lua_cocos2dx_auto_api.js
2013-08-28 15:35:33 +08:00
samuele3hu
9e071afe09
issue #2433:Add more deprecated function and modify some test
2013-08-28 15:11:19 +08:00
minggo
e41eaf7355
Merge pull request #3495 from shinriyo/shinriyo
...
Python2.x 3.x runnable
2013-08-27 21:06:33 -07:00
shinriyo
498d8d9e6d
Python2.x 3.x runnable
...
For Python2.x 3.x runnable, I used print()
2013-08-28 11:53:18 +09:00
James Chen
f3e0775cef
issue #2732 : [travis ci] install llvm for linux.
2013-08-27 22:04:08 +08:00
James Chen
384bf00070
issue #2732 : Updating travis script. Linux port needs to generate luabinding codes.
2013-08-27 21:52:06 +08:00
James Chen
08cd81ff43
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated
...
Conflicts:
scripting/auto-generated
2013-08-27 16:59:59 +08:00
James Chen
7552a72577
issue #2732 : [iOS] Updating the reference of auto-generated binding glue codes.
2013-08-27 16:05:48 +08:00
James Chen
c2099f5d3e
issue #2732 : Moving 'scripting/javascript/bindings/generated' to 'scripting/auto-generated'.
2013-08-27 14:50:53 +08:00
James Chen
43a0225267
issue #2732 : Deleting tolua/userconf.ini
2013-08-27 14:45:19 +08:00
minggo
faa94fd074
Merge pull request #3482 from minggo/release_unneeded_codes
...
Remove unneeded codes
2013-08-26 23:23:41 -07:00
James Chen
213b7aea21
Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator
...
issue #2433 : Add lua bindings generator and modify releated test samples
2013-08-26 23:09:56 -07:00
samuele3hu
c7b0b6791f
issue #2433:Update typed function and add some manual binding
2013-08-26 18:09:15 +08:00
minggo
61d82924be
update Android.mk to remove deleted cpp files
2013-08-26 18:01:42 +08:00
James Chen
11ea111aff
closed #2446 : Add a tool to auto export releasing zip file
2013-08-26 16:57:10 +08:00
samuele3hu
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
samuele3hu
e557b6b7c2
issue #2433:Add lua deprecated fiel and modify some test samples
2013-08-23 16:12:59 +08:00
James Chen
699c7d1077
Updating bindings-generator, it supports CCString. Some APIs, for example ControlButton::setTitleForState are using String as argument.
2013-08-23 15:56:38 +08:00
boyu0
02649a1329
closed #2434 : Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file
2013-08-22 17:47:49 +08:00
boyu0
9e34aae075
closed #2434 : Use the origin android.mk files instead use templates
2013-08-22 16:45:40 +08:00
samuele3hu
5f6d9815ca
issue #2433:Modify platform config and some test samples
2013-08-22 15:06:34 +08:00
boyu0
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
boyu0
de68d35f4b
closed #2434 : change name "android_generator" to "android_mk_generator
2013-08-22 13:49:22 +08:00
boyu0
ad23ec4a0f
#closed #2434 : refactor LocalVarToAuto.py to use the PathUtils and fix some errors
2013-08-22 13:40:57 +08:00
boyu0
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
samuele3hu
bea62800b4
issue #2433:Modify TestLua samples and add some manual binding code
2013-08-22 10:16:57 +08:00
samuele3hu
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
samuele3hu
7a9f1d6804
issue #2433:Modify TestLua samples and some .ini files
2013-08-20 13:44:37 +08:00
shinriyo
a188d87142
language option is invalid print mesage
...
If we input invalid mistook language option
2013-08-18 10:13:50 +09:00
boyu0
0823bb144f
issue #2517 : add the LocalVarToAuto.py script
2013-08-16 15:35:27 +08:00
samuele3hu
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
samuele3hu
871ed24620
issue #2433:Update submodule and project
2013-08-15 16:51:09 +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
2d5482a0ab
issue #2433:Modify cocos2d.ini
2013-08-15 16:14:14 +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
James Chen
7d3edde8f1
issue #2521 : Updating tojs/cocos2dx_extension.ini, bind more CCControls.
2013-08-12 11:23:16 +08:00
samuele3hu
980bea8a97
issue #2433:lua binding generator add hello.lua
2013-08-09 10:07:10 +08:00
성낙호
eda9846e6f
DelegateProtocol is weak-referenced again
2013-08-08 18:36:56 +09: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
James Chen
59f5353f89
issue #2483 : Updating cocos2d-console.
2013-08-07 18:06:31 +08: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
c2c1bb45d8
Updating Bindings-generator.
2013-08-07 14:19:36 +08:00
성낙호
1c91e73a8c
added jsb support for AssetsMAnager
2013-08-07 14:07:01 +09:00
samuele3hu
1175f2034a
Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator
2013-08-07 10:39:07 +08:00
samuele3hu
200c5de83f
issue #2433:lua binding generator
2013-08-07 10:37:20 +08:00
James Chen
0c4910ee95
Adding tools/tolua .
2013-08-07 10:12:45 +08:00
minggo
f447398211
Merge pull request #3376 from folecr/android_redesign_update_template
...
Update templates to match newer, mostly-NDK Android port
2013-08-06 19:11:00 -07:00
James Chen
4f740809dd
The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet.
2013-08-07 10:08:00 +08:00
James Chen
710b895aaa
Updating bindings-generator to the latest version.
2013-08-07 10:02:20 +08: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
3176dddc83
Update Android JSON config files and project creation script
2013-08-05 19:29:08 -07:00
James Chen
81fc0069cc
Updating travis-script/run-script.sh, don't build template projects for android.
2013-08-06 09:54:23 +08:00
James Chen
77a9c91b3d
We has to pass the target to bindings-generator since we have add lua target.
2013-08-05 18:33:13 +08:00
James Chen
ec49e7568f
Updating bindings-generator, adding lua target. It's not finished.
2013-08-05 18:31:20 +08:00
James Chen
904f85e0a8
Adding tools/tolua .
2013-08-05 18:30:36 +08:00
Éloi Rivard
9dcb6fb80e
Multi-resolution emscripten html template.
...
Default emscripten html template update.
Minor emscripten warnings.
2013-08-05 09:24:47 +02:00
James Chen
e08b319726
issue #2170 : [JSB] Label is abstract class now.
2013-08-05 12:49:57 +08:00
James Chen
85661c976c
Merge pull request #3346 from nakosung/develop
...
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
2013-08-01 19:41:11 -07:00
성낙호
0883723c71
added cc.RemoveSelf
2013-08-02 10:59:16 +09:00
James Chen
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Sergey Shambir
7385db5a34
Linux: added SDL2 to travis scripts and install-deps-linux.sh
2013-07-30 23:20:18 +04:00
samuele3hu
3499aafd27
issue #2435:Lua template supports mac port
2013-07-30 09:51:15 +08:00
boyu0
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
James Chen
bb3ee262b8
Updating README.mdown for the reason of bindings-generator doesn't support windows.
2013-07-29 08:33:10 +08:00
James Chen
d4dcf44380
[Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary.
2013-07-29 08:27:59 +08:00
Timothy Qiu
d9020ae80c
Use absolute path for json config files.
2013-07-28 22:59:37 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
2a65fdf2f4
Merge pull request #3294 from dumganhar/develop
...
Updating bindings-generator reference.Supports the default argument whos...
2013-07-26 21:33:07 -07:00
James Chen
732c2ee49d
Updating bindings-generator reference.Supports the default argument whose value is a reference, for example:
...
class AAA
{
public:
static const BBBB = 100;
void foo(int arg1 = BBBB); // Support this default argument which is not integer argument like 'int arg1 = 100; '
}
2013-07-27 12:32:08 +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
James Chen
19d9c08c79
issue #2430 : Fixing compilation errors for lua and js bindings.
2013-07-26 22:15:30 +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
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
samuele3hu
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
James Chen
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
James Chen
241cf022a4
Fixing Luabinding errors.
2013-07-26 13:50:10 +08:00
James Chen
cda727843a
Updating bindings-generator. It supports 'enum class' type now.
2013-07-26 11:14:48 +08:00
minggo
5479dbe0b9
remove xcode template
2013-07-26 10:54:20 +08:00
minggo
c79f4b8595
add creating project script in root
2013-07-26 10:50:37 +08:00
minggo
10a8c3f23b
tools/project-creator -> tools/project_creator
2013-07-26 10:46:18 +08:00
samuele3hu
456a26d7ab
issue #2404:Modify tab to spaces
2013-07-25 20:03:58 +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
James Chen
653c1f7f8f
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
2013-07-25 16:00:45 +08:00
Éloi Rivard
682a1238fa
Use of a single emscripten HTML template file.
2013-07-24 17:59:21 +02:00
minggo
a76863dd7f
add execution permission
2013-07-24 17:50:39 +08:00
minggo
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
minggo
019246fd51
travis build template too
2013-07-24 17:26:45 +08:00
Jerry Zhang
749e8f96eb
typo; more Pythonic
2013-07-23 13:37:17 +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
James Chen
c154d66bf0
Updating Bindings-generator.
2013-07-22 13:44:30 +08: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
samuele3hu
4eb6d7aea4
issue #2404:Modify a comment
2013-07-19 15:38:17 +08:00
samuele3hu
18fa6f2fbd
issue #2404:Modify a comment
2013-07-19 15:29:36 +08:00
James Chen
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08: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
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
boyu0
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
James Chen
d58a7fcce2
closed #2414 : Bindings-generator could bind std::function argument now.
2013-07-17 18:09:49 +08:00
James Chen
a9eea0a887
issue #2407 : Updating jsb_deprecated.js and cocos2dx.ini.
2013-07-17 17:38:03 +08:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
James Chen
7e4e34d992
[ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground.
2013-07-17 14:36:10 +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
James Chen
72d1a074df
Updating travis-script/before-install.sh, install gcc4.7 when build linux port.
2013-07-16 11:58:08 +08:00
James Chen
de4b231264
closed #2405 : Updating bindings-generator, Bindings-generator should not bind deprecated methods.
2013-07-16 10:04:03 +08:00
James Chen
ebf382b02f
issue #2405 : Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now.
2013-07-16 10:03:25 +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
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
98fffdf7fc
closed #2393:revert some wrong modification when fix conflicts
2013-07-12 23:58:31 +08:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
James Chen
dda40ce9ab
Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB.
2013-07-12 16:49:13 +08:00
James Chen
c6b0882766
issue #2397 : Updating Lua bindings.
2013-07-12 15:42:14 +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
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
f30ae2ef31
issue #2397 : Updating CCAnimationCache.pkg
2013-07-12 13:57:05 +08:00
James Chen
41957f06c9
issue #2397 : sharedAnimationCache --> getInstance.
2013-07-12 13:54:56 +08:00
James Chen
853a503d2f
issue #2397 : Updating bindings configuration. [Lua and JS].
2013-07-12 13:48:31 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
74339b6d0e
issue #2397 : Updating cocos2d.ini and CCFIleUtils.pkg.
2013-07-12 12:53:20 +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
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
cf96ec079e
Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix
...
Bug fixes. Please see the commits for details.
2013-07-08 00:40:23 -07:00
James Chen
962207a48a
Adding some logs in travis script.
2013-07-08 15:27:49 +08:00
James Chen
466a64ba05
issue #2129 : Updating bindings-generator.
2013-07-08 15:25:04 +08:00
James Chen
c07eda8894
issue #2129 : Updating cocos2dx.ini.
2013-07-08 15:19:46 +08:00
minggo
b39e7e205f
issue #2129:modify pkg files
2013-07-08 11:34:31 +08:00
James Chen
e03091f934
Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture.
2013-07-05 15:18:04 +08:00
James Chen
9d2152b513
sudo apt-get update before install new packages
2013-07-05 13:45:37 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
62879c3789
issue #2371 : Updating CCTexture2D.pkg.
2013-07-04 17:09:23 +08:00
minggo
22e5d12503
Merge pull request #3071 from keirantai/develop
...
Regenerated xcode4 templates plist files
2013-07-03 23:27:50 -07:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
Keiran Tai
dde6250159
Regenerated xcode4 templates plist files due to missing few important files and causes compile error
2013-07-04 11:13:15 +08:00
James Chen
28b3028646
Updating bindings-generator.
2013-07-02 18:24:31 +08:00
James Chen
d446f90016
close #2285 : Updating tools/tojs/cocos2d-x.ini.
2013-07-02 17:48:06 +08:00
James Chen
34871d47af
close #2347 : Updating tools/tojs/cocos2dx.ini.
2013-07-01 22:34:57 +08:00
James Chen
e20356a32d
Merge pull request #3037 from boyu0/refactor_2339
...
change the useage text
2013-06-30 23:37:12 -07:00
James Chen
c872666650
Merge pull request #3025 from boyu0/refactor_2339
...
closed #2339 : Refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-30 23:19:08 -07:00
boyu0
1156ae4f60
change the useage text
2013-07-01 14:10:14 +08:00
boyu0
2625847a74
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-07-01 01:04:01 +08:00
boyu0
2cccadeaab
closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params
2013-06-28 10:12:55 +08:00
James Chen
5ce150a10c
issue #2340 : Updating submodule of cocos2d-console.
2013-06-27 17:19:22 +08:00
minggo
d2940bf4c7
Merge pull request #3008 from minggo/ccx_filesystem
...
remove unneeded codes when using assets manager
2013-06-26 18:53:34 -07:00
minggo
7e26a86e2e
issue #2329:not bind CCFileUtils private function
2013-06-26 17:36:31 +08:00
James Chen
cde809951a
Fixing travis errors for generating JSB glue codes.
2013-06-26 16:57:08 +08:00
James Chen
14208cfda9
Only skip ^visit$
2013-06-26 16:35:41 +08:00
James Chen
e1b1eee46d
issue #2313 : Ignores `visit` and exposes ClippingNode to JS. [Not finished]
2013-06-26 16:29:45 +08:00
Sam Clegg
f9ae701a4b
Fix emscripten build on linux
...
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
Sam Clegg
cb2f42d0c6
Share top level Makefile between emscripten, linux and nacl.
...
Remove the custom top level Makefile.emscripten and instead
add build-emscripten.sh which can be used like build-linux.sh
and build-nacl.sh.
Also, use the top level lib folder to store emscripten libs.
This brings it in line with the other make-based builds.
2013-06-25 11:45:01 -07:00
Sam Clegg
58c3faf209
Cleanup travis build scripts.
...
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.
Environment variables are now set as part of run-script.sh. This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.
javascript binding generation will not exit early if GH_USER
etc are not set. This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.
When generating javascript bindgings, don't username and email
with '--global'. It should be sufficient to set this only for
the binding repo.
2013-06-24 22:55:15 -07:00
James Chen
e96c807087
clang+llvm-3.1 --> clang+llvm-3.3
2013-06-21 21:49:23 +08:00
James Chen
e69838ff27
[Travis CI] Removing space for before-install.sh.
2013-06-21 21:40:21 +08:00
James Chen
3cf482bebd
Updating bindings-generator.
2013-06-21 21:27:59 +08:00