James Chen
7b5e2351c3
Updating jsb_cocosbuilder.js.
2013-03-19 13:08:34 +08:00
James Chen
3380c7cdca
fixed #1838 : Updating iOS project setting for CocosDragonJS.
2013-03-19 13:05:06 +08:00
Rohan Kuruvilla
e4efa88d00
Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc
2013-03-18 20:54:48 -07:00
Rohan Kuruvilla
5ca6648e47
Updating CCBReader JS bootstrap file
2013-03-18 16:06:48 -07:00
James Chen
6a98553633
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
2013-03-18 18:24:37 +08:00
CocosRobot
d098eb06aa
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-18 15:41:39 +08:00
James Chen
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
James Chen
3aeb22292b
Reverting ccarray_to_jsval.
2013-03-16 21:23:33 +08:00
James Chen
09757428e7
fixed #1836 : JS target of "cc.Scheduler().scheduleCallbackForTarget" should not depend on CCNode or its subclass.
2013-03-16 21:14:39 +08:00
James Chen
529e65787a
Fix the crash CrystalCraze, we should check whether the arr parameter is valid for ccarray_to_jsval.
2013-03-15 22:22:44 +08:00
CocosRobot
da16e7d2ff
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:57:26 +08:00
James Chen
92d0e1c983
Uncommenting jsb_CCEditBox_prototype, updating the submodule of cxx-generator to the latest one.
2013-03-15 11:53:56 +08:00
CocosRobot
5ee810c535
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-15 11:35:51 +08:00
James Chen
ae2f2e2f0e
Temporarily comment `jsb_CCEditBox_prototype` to make jsb projects compiled ok, because the server of auto generating jsbinding has some issues now.
2013-03-14 23:23:52 +08:00
James Chen
911f607484
Tabs ~> 4 spaces
2013-03-14 20:38:52 +08:00
James Chen
293e17494d
fixed #1830 : Force casting `unsigned short*` to `jschar*` for `cc_utf8_to_utf16`.
2013-03-14 20:34:54 +08:00
James Chen
d783715c18
Merge pull request #2164 from dumganhar/iss1824-editbox-js
...
fixed #1824 : Exposed cc.EditBox to js and refactored ScriptingCore::executeFunctionWithOwner
2013-03-14 03:19:45 -07:00
minggo
ee846c3248
Merge https://github.com/cocos2d/cocos2d-x into iss1803-spritetest-lua
2013-03-14 18:14:57 +08:00
James Chen
3e33868a63
fixed #1824 : Exposed cc.EditBox to js.
2013-03-14 18:14:16 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
CocosRobot
0b828a67c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-14 11:20:23 +08:00
James Chen
a57cc21d7a
Merge pull request #2156 from dumganhar/iss1830-jsb-utf8
...
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 19:59:25 -07:00
James Chen
29aa62d923
fixed #1830 : Using JS::CompileOptions::setUTF8(true) to compile script.
2013-03-13 18:10:54 +08:00
CocosRobot
57b7a85dc8
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-13 12:05:05 +08:00
minggo
85f39cee24
Merge pull request #2114 from linshun/master
...
Added compatible function for multi secene resouces preloading.
2013-03-12 19:38:09 -07:00
CocosRobot
bf31b7af26
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-13 00:03:13 +08:00
James Chen
3aaf5cabdb
Updating cocos2dx.ini(adding CCScheduler to 'abstract_class' section) and adding ScriptingCore::getGlobalObject method.
2013-03-12 22:03:37 +08:00
CocosRobot
ee768ba814
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-11 17:34:03 +08:00
James Chen
c780f2ff78
Merge pull request #2137 from dumganhar/iss1748-jsb-chipmunk-sqlite
...
fixed #1748 : Separating js extension from cocos2dx.hpp/cpp.
1) Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original cocos2dx.hpp/cpp. Developer could remove redundant jsbinding native codes now.
2) cocos2dx.hpp/cpp ~> jsb_cocos2dx_auto.hpp/cpp
3) Adding jsb_cocos2dx_extension_manual.hpp/cpp
2013-03-11 02:31:40 -07:00
James Chen
2a032bc6c9
fixed #1748 : Updating win32 project setting.
2013-03-11 17:24:33 +08:00
James Chen
69b2b13325
fixed #1748 : Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
...
Developer could remove redundant jsbinding codes now.
2013-03-11 16:39:28 +08:00
James Chen
6829f82893
Merge pull request #2107 from SevInf/patch-1
...
fixed #1823 : Using shared NodeLoaderLibrary in CCBReader bindings.
2013-03-10 23:14:56 -07:00
CocosRobot
50f1ca7956
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-10 16:12:51 +08:00
CocosRobot
3b183c0517
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-10 14:03:20 +08:00
James Chen
1a42e85219
fixed #1808 : Updated the submodule of cxx-generator and fixed some compilation errors after that.
2013-03-10 13:55:29 +08:00
Sam Clegg
c0b150c859
Cleanup the tolua++ bindings build system.
...
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.
Update README file with current instructions.
Re-generate output file using new build system.
Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
James Chen
a91d308070
fixed #1811 : getStringWithContentsOfFile ~> getStringFromFile .
2013-03-08 16:50:16 +08:00
James Chen
91e3570ec4
fixed #1811 : Fixing complication error on win32 after this pull request ( https://github.com/cocos2d/cocos2d-x/pull/2119 ).
2013-03-08 15:15:08 +08:00
James Chen
f7e60e290f
fixed #1811 : Adding a method to get file data for JSB. Updating the way of encoding cpp string to jsval or jsval to cpp string.
2013-03-08 14:34:59 +08:00
CocosRobot
da5d1dcce8
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-07 16:04:48 +08:00
linshun
d60ba89b36
Added compatible functions for HTML5 multi resources preloading.
2013-03-07 15:49:05 +08:00
wangshuai
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
minggo
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
Sam Clegg
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
Sergej Tatarincev
56ab904e0a
Use shared NodeLoaderLibrary in CCBReader bindings
2013-03-06 14:09:01 +02:00
Sam Clegg
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
Sam Clegg
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
minggo
f7802a0794
Merge pull request #2072 from yuezang/iss1425-luatest
...
issue #1425 : exist lua test case is ok.
2013-03-01 01:17:15 -08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
CocosRobot
bc159f1ba7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 16:30:34 +08:00
CocosRobot
bee13bd7d5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 11:04:33 +08:00
CocosRobot
86891fb15f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-01 09:31:09 +08:00
wangshuai
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
CocosRobot
dfc1cb8139
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-28 09:51:31 +08:00
James Chen
537abaec42
fixed #1753 : Android works ok now.
2013-02-27 16:57:36 +08:00
James Chen
0d70e6f92f
issue #1753 : Win32 works ok.
2013-02-27 15:45:23 +08:00
James Chen
473e8e6139
issue #1753 : Upgrading SpiderMonkey to Firefox19.0, iOS works ok.
2013-02-27 15:16:49 +08:00
James Chen
19ef02ffa5
Merge pull request #2039 from dumganhar/iss1747-jsb-animation
...
fixed #1747 : Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
2013-02-24 22:27:40 -08:00
James Chen
9c9e64283e
fixed #1747 : Crash occurs when passing null to cc.AnimationFrame.initWithSpriteFrame.
2013-02-25 14:20:38 +08:00
giginet
70612a722b
Fix CCRepeat#create is recieved bad argument on Lua binding.
...
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
2013-02-22 20:24:22 +09:00
CocosRobot
e3745b0078
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 12:12:11 +08:00
CocosRobot
397457aa68
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-22 10:54:39 +08:00
James Chen
486f7941a7
Merge pull request #2023 from nicolasgramlich/patch-7
...
fixed #1740 : Added cleanup and reset methods to ScriptingCore.
2013-02-21 17:56:55 -08:00
Nicolas Gramlich
84aae750a9
Converted tabs to spaces since that seemed to be the predominant choice in this file.
2013-02-21 08:34:51 -08:00
Nicolas Gramlich
b993c6fa08
Added cleanup and reset methods to ScriptingCore.
2013-02-21 08:33:37 -08:00
CocosRobot
06ad046c2f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-21 10:24:44 +08:00
James Chen
cf33a4538d
fixed #1730 : Binds CCScrollView and CCTableView to js.
2013-02-21 10:06:22 +08:00
James Chen
ab00de629a
Removed the definition of the touch event type .
2013-02-20 12:06:12 +08:00
minggo
599f22f1e2
Merge pull request #1997 from minggo/iss1731-lua-declaration
...
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-18 18:19:00 -08:00
minggo
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
CocosRobot
ac0fa1251b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-19 10:05:12 +08:00
James Chen
1c798d111b
Merge pull request #1991 from SevInf/patch-1
...
fixed #1729 : Making ScriptingCore.cpp compiled fine with C++11 on iOS
2013-02-18 02:18:39 -08:00
James Chen
7c6a2e47ce
fixed #1726 : JSB application crashs on android device with armv6 architecture
2013-02-18 17:50:43 +08:00
Sergej Tatarincev
0b8713c80c
Make ScriptingCore.cpp compile with C++11 on iOS
...
When compiling with clang -stdlib=libc++ -std=c++11, write, read, and close functions are part of the unistd.h header file.
2013-02-18 09:12:39 +02:00
James Chen
7a902b494c
issue #1724 : fixed errors for HelloJavascript of win32 port.
2013-02-18 14:51:36 +08:00
CocosRobot
9f9d69b14f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-16 11:21:03 +08:00
minggo
3949f0c70f
Merge pull request #1972 from theGoodEvil/fix_texparams_js
...
Use correct arg type for ccTexParams
2013-02-15 18:01:20 -08:00
Guido Lorenz
5f3a63e794
Use correct arg type for ccTexParams
...
In the JavaScript bindings, ccTexParams was initialized with (signed) GLint
values, even though it consists of (unsigned) GLuint values.
2013-02-11 11:09:35 +01:00
minggo
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
James Chen
8c261c1789
issue #1770 : Updating linux makefile.
2013-02-06 15:59:29 +08:00
James Chen
c42ef7e44a
Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support
...
issue #1687 : Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
2013-02-04 18:59:49 -08:00
James Chen
4506214cef
issue #1689 : Adding some missing files.
2013-02-04 15:01:44 +08:00
minggo
07cd6d2bb2
issue #1689:modify lua samples to make them work correctly
2013-02-04 14:50:45 +08:00
dualface
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
minggo
a771bc8183
issue #1689:modify lua Android.mk
2013-02-04 12:02:21 +08:00
minggo
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
dualface
74e497bb2b
restore CCLuaEngine missed methods
2013-02-04 11:28:09 +08:00
CocosRobot
d3086850c7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-02-03 14:55:53 +08:00
dualface
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
James Chen
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
James Chen
2694cb150b
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
2013-01-29 09:56:38 +08:00
CocosRobot
3450e75789
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-01-28 19:43:29 +08:00
James Chen
c80d438110
issue #1683 : Exporting `fullPathForFilename` to Lua.
2013-01-27 20:26:04 +08:00
James Chen
119115502d
issue #1683 : Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
2013-01-26 22:31:57 +08:00
CocosRobot
fdda0fa285
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-01-25 22:40:36 +08:00
James Chen
ef131beed1
Merge pull request #1885 from dumganhar/refactor-ccfileutils
...
issue #1683 :Refactoring CCFileUtils.TO BE DONE:
Making the api of CCFileUtils more c++ friendly.
2013-01-25 05:55:10 -08:00
James Chen
6f3b22031f
Using new API of getting full path for file name.
2013-01-25 20:51:52 +08:00
minggo
71defcba99
update JSB codes to latest
2013-01-25 18:24:39 +08:00
Rohan Kuruvilla
578b1c741e
Fixing bug in resetting context that fails because of setting UTf8 string twice
2013-01-24 18:37:24 -08:00
James Chen
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
James Chen
5a41e1fc86
fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp.
2013-01-22 14:40:54 +08:00
James Chen
a3dbfaafd3
Merge pull request #1856 from funkaster/master
...
fixed #1660 : Some fixes to the js debugger.
2013-01-21 17:54:39 -08:00
James Chen
31e91e554e
issue #1661 : Added CrystalCraze for win32 and fix some compilation errors.
2013-01-17 17:07:18 +08:00
Rolando Abarca
a265120f4c
cc namespace
2013-01-16 14:07:51 -08:00
Rolando Abarca
bc19f40239
Merge branch 'gles20'
2013-01-16 14:02:40 -08:00
Rolando Abarca
7ab43b9dfc
adds missing runLoop for cc2dx (debug)
2013-01-16 14:02:05 -08:00
Rolando Abarca
49432ef742
removes old header file reference
2013-01-16 13:42:41 -08:00
James Chen
3a183d120b
issue #1660 : Disabled js debugger by default since lack of `js_bindings_dbg.h` file.
2013-01-16 14:35:19 +08:00
Rolando Abarca
e94d8d1693
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.h
scripting/javascript/bindings/js_bindings_config.h
2013-01-15 16:52:47 -08:00
James Chen
a1854bdb58
Updated the submodule reference of cocos2d-js-tests.
2013-01-15 11:37:04 +08:00
James Chen
121519b7cd
Merge pull request #1831 from dumganhar/iss1653-jsb-int
...
fixed #1653 : Handling correctly when parsing int value in JSB.
2013-01-14 17:49:57 -08:00
Rolando Abarca
320068930e
more debug stuff
2013-01-11 14:29:40 -08:00
Rolando Abarca
5df4b4d997
adding debug support for js
2013-01-11 14:01:36 -08:00
johnangel
a1155f52e6
Merge remote branch 'upstream/gles20' into gles20
2013-01-11 21:48:47 +01:00
James Chen
800e65b6fc
fixed #1653 : Using JSB_PRECONDITION2 to check return value in js_bindings_ccbreader.cpp and js_bindings_chipmunk_manual.cpp.
2013-01-11 22:00:42 +08:00
James Chen
d15561e826
issue #1653 : Checking the return value of jsapi. Return JSVAL_VOID if jsapi has no return value.
2013-01-11 18:57:33 +08:00
James Chen
7f4146f3e2
issue #1653 : JS_ValueToInt32, JS_ValueToECMAInt32 --> jsval_to_int32
...
Using JSB_PRECONDITION2 to check the return value of js api.
Reporting an error when binding api return JS_FALSE.
2013-01-11 17:44:39 +08:00
James Chen
a8361bf703
issue #1653 : Checking return value for 'native --> jsval'.
2013-01-11 13:54:57 +08:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
James Chen
c9c8ee66b9
issue #1646 : Using GNU libstdc++ to build spiderMonkey on Android.
2013-01-09 14:45:36 +08:00
James Chen
ad9138685e
issue #1646 : Updated spiderMonkey to FF18.0.
2013-01-09 13:42:21 +08:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
b662d5c569
fixed #1620 : Added license. Removed LocalStorage.h from cocos-ext.h.
2013-01-07 18:06:53 +08:00
James Chen
1d59a36ee9
fixed #1620 : Invoking localStorageFree in the destructor of ScriptingCore. Added header file to cocos-ext.h
2013-01-07 17:34:22 +08:00
James Chen
1882ca30f5
issue #1620 : Binding sqlite3 to sys.localStorage. And updated win32 project configuration.
2013-01-06 14:42:24 +08:00
James Chen
8a21f4fa3c
issue #1640 : Added some files to iOS Project.
2013-01-05 17:41:19 +08:00
James Chen
421cf31b34
issue #1640 : Updated jsbinding for CCPhysicsSprite .
2013-01-05 15:09:19 +08:00
James Chen
4bd15af2a2
issue #1640 : Updated js files for jsbindings
2013-01-05 13:58:56 +08:00
minggo
ffd0ca6c0e
Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility
...
[luabinding] fix CCAssert Lua compatibility
2013-01-03 23:51:47 -08:00
dualface
e74e597dba
[luabinding] fix CCAssert Lua compatibility
2012-12-30 02:27:25 +08:00
James Chen
0ee9cf027b
Merge pull request #1803 from dumganhar/iss1627-vs2012
...
fixed #1627 : VS version check in project file.
2012-12-28 22:54:04 -08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
dualface
d1e39a9c00
[luabinding] add CCDirector::setDisplayStats()
2012-12-29 11:16:07 +08:00
James Chen
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
minggo
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -08:00
CocosRobot
38e5b67cb5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-27 13:43:19 +08:00
James Chen
023b32a618
issue #1625 : Updated LuaCocos2d.cpp.
2012-12-27 11:48:14 +08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
dualface
09b1d9f520
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
2012-12-26 18:37:51 +08:00
dualface
57bccc7e4a
remove CC_LUA_ENGINE_ENABLED macro
2012-12-26 18:33:55 +08:00
James Chen
a6ded65f59
Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode.
2012-12-25 11:33:36 +08:00
James Chen
bdb4df293b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys
2012-12-25 10:01:48 +08:00
CocosRobot
3de95c9362
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-25 09:54:52 +08:00
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
James Chen
cc7d383737
fixed #1622 : Crash occurs when cc.Node.getChildren is invoked if there are no children.
2012-12-24 11:55:04 +08:00
James Chen
22a2b34637
issue #1620 : Made sys.localStorage support for jsb, works ok on android.
2012-12-24 11:46:27 +08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
dualface
cc69e39c8a
[luabinding] make CCAssert compatible Lua
2012-12-22 10:13:37 +08:00
James Chen
f26ce4fb84
Made sys.localStorage support for jsb, works ok on win32.
2012-12-21 18:07:45 +08:00
James Chen
6700a1c4ce
issue #1603 : fixed some warnings for liblua.vcxproj.
2012-12-20 17:28:49 +08:00
James Chen
9a0a5e6b31
issue #1603 : fixed some warnings.
2012-12-20 17:18:49 +08:00
James Chen
1562658bd8
issue #1603 : Added libJSBinding project for win32 platform.
2012-12-20 17:18:02 +08:00
James Chen
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +08:00
unknown
adb68ddbb6
Enable Windows XP support in Visual Studio 2012 Update 1.
...
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
2012-12-19 19:28:25 +01:00
unknown
fdd67d37c9
Missing subproject
2012-12-18 23:01:22 +01:00
James Chen
e8c0844dd5
fixed #1617 : Some improvements for JS Bindings.
...
1) Changed cc.REPEAT_FOREVER = - 1 to cc.REPEAT_FOREVER = 0xffffffff
[Reason]: If cc.REPEAT_FOREVER = -1, it will be a very big double value after converting it to double by JS_ValueToNumber on android.
Then cast it to unsigned int, the value will be 0. The schedule will not be able to work.
I don't know why this occurs only on android.
[Solution]: Instead of passing -1 to it, I assign it with max value of unsigned int in c++.
2) Added two helper function, cc.ArrayGetIndexOfObject and cc.ArrayContainsObject.
3) Added JSScheduleWrapper::removeTargetForNativeNode to avoid memory leaks.
4) Improvments for JSTouchDelegate. Added four functions as follows:
// Set the touch delegate to map by using the key (pJSObj).
static void setDelegateForJSObject(JSObject* pJSObj, JSTouchDelegate* pDelegate);
// Get the touch delegate by the key (pJSObj).
static JSTouchDelegate* getDelegateForJSObject(JSObject* pJSObj);
// Remove the delegate by the key (pJSObj).
static void removeDelegateForJSObject(JSObject* pJSObj);
void unregisterTouchDelegate();
And exported cc.unregisterTouchDelegate(); to js.
Fix a memory leak for JSTouchDelegate by making it as an autorelease object.
5) Don't add js callback function to the reserved slot of object.
[Reason]: The target object may execute more than one schedule.
Therefore, previous js callback function will be replaced
by the current one. For example:
this.scheduleOnce(function() { temporary function 1 }, 0.5);
this.scheduleOnce(function() { temporary function 2 }, 0.5);
In this case, the temporary function 1 will be removed from reserved slot 0.
And temporary function 2 will be set to reserved slot 0 of this object.
If gc is triggered before the JSScheduleWrapper::scheduleFunc is invoked,
crash will happen. You could simply reproduce it by adding jsc.garbageCollect(); after scheduleOnce.
[Solution] Because one schedule corresponds to one JSScheduleWrapper, we root
the js callback function in JSScheduleWrapper::setJSCallbackFunc and unroot it
at the destructor of JSScheduleWrapper.
2012-12-18 11:56:44 +08:00
CocosRobot
13b04e3ee4
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-17 15:26:28 +08:00
dualface
98ea80329e
fix android compile warning
2012-12-14 18:01:54 +08:00
James Chen
e7328cf3ba
fixed #1614 : DrawNodeTest crashes on JSB.
2012-12-14 10:31:31 +08:00
Nicolas Gramlich
9537389949
Added cc.DrawNode.extend.
2012-12-12 21:49:29 +08:00
James Chen
190e6c1de5
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-10 17:25:23 +08:00
dualface
f815cdc423
merge gles20
2012-12-10 17:00:16 +08:00
dualface
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
dualface
77d4da6e22
[lua] remove va_list
2012-12-10 14:28:26 +08:00
dualface
b6e605b9ae
[lua] fix CCSequence export
2012-12-10 14:19:18 +08:00
dualface
4ca6cf8c7a
[lua] update LuaCocos2d.cpp
2012-12-10 14:09:00 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
CocosRobot
f7e87f2269
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-07 09:51:17 +08:00
CocosRobot
fe9e6ba688
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-06 17:22:53 +08:00
James Chen
6a7a365365
Updated eclipse project configurations for linux
2012-12-06 14:57:03 +08:00
James Chen
b044a89d6f
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-12-06 14:55:18 +08:00
James Chen
34eb3a88c2
Commented JS_SetGCZeal.
2012-12-04 17:23:08 +08:00
James Chen
b5ae1f6d2a
Updated MoonWarriors/Classes/AppDelegate.cpp.
...
Updated the submodule reference of cocos2d-js-tests to the latest one.
Fixed duplicate define in js_bindings_ccbreader.cpp.
2012-12-04 11:36:45 +08:00
CocosRobot
545002b3a9
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-04 10:59:58 +08:00
minggo
75845b56c0
Merge pull request #1694 from dualface/update_luabinding
...
Update luabinding
2012-12-03 18:59:23 -08:00
minggo
bbcbfa71ef
Merge pull request #1704 from minggo/cclayer_script_support
...
Cclayer script support
2012-12-03 18:55:11 -08:00
minggo
4e7fca3185
merge dualface's pull request for fixing CCLayer script support and fix error for js-binding
2012-12-04 10:52:49 +08:00
James Chen
9f168faeb0
Merge pull request #1696 from fape/lua_marmalade
...
fixed #1591 : Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
2012-12-03 18:51:39 -08:00
minggo
c21ad515bd
Merge pull request #1693 from dualface/add_tolua_isnull
...
add tolua.isnull()
2012-12-03 18:08:21 -08:00
minggo
7ad2484a91
Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support
2012-12-04 09:50:01 +08:00
James Chen
7c074d4ced
issue #1550 : fixed a memory leak in jsbinding.
2012-12-03 22:17:53 +08:00
James Chen
478791a472
Added CCBReader::setCCBRootPath.
2012-12-03 18:27:50 +08:00
James Chen
f6185844a9
fixed #1588 : Get the right js callback function in js_CCScheduler_schedule.
2012-12-03 15:59:29 +08:00
James Chen
d97dfe162a
fixed #1588 : RescheduleCallback support for JSBinding.
2012-12-03 15:33:36 +08:00
fape
aac98975da
update lua marmalade project
2012-12-02 15:29:10 +01:00
dualface
0e65257bc2
[luabinding] remove duplicate ccLanguageType
2012-12-02 16:17:17 +08:00
dualface
5bc95780c0
update luabinding
2012-12-02 15:48:15 +08:00
dualface
308a01e629
[luabinding] add tolua.isnull()
2012-12-02 15:29:00 +08:00
dualface
e0ee27cb17
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
...
[luabinding] add CCLayer keypad, accelerometer support
2012-12-02 15:17:34 +08:00
James Chen
399fb53452
fixed #1586 : Native object need to be an autorelease object.
2012-12-01 11:41:51 +08:00
James Chen
e3615e2fb1
fixed #1586 : Invoking removeAllRoots in ScriptingCore destructor to avoid crash when app exits.
2012-12-01 11:41:50 +08:00
James Chen
36bc0ab0bb
Invoking JS_SetGCZeal only when the macros DEBUG and JS_GC_ZEAL is defined.
2012-12-01 11:41:50 +08:00
Rohan Kuruvilla
745392ad6c
Changing chipmunk manual bindings to fix GC issues
2012-11-30 16:08:19 -08:00
James Chen
94b1d39b2c
Using release version of spidermonkey for win32, otherwise jsbinding project can't be run on other machines.
2012-11-30 22:45:51 +08:00
CocosRobot
3533358049
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-30 22:20:22 +08:00
James Chen
07661a1e21
issue #1581 : Added jsb_set_reserved_slot and jsb_get_reserved_slot,
2012-11-30 22:00:30 +08:00
James Chen
15d02e4db8
Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
2012-11-30 21:43:44 +08:00
James Chen
95875112fa
Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
2012-11-30 21:19:19 +08:00
James Chen
26790eb17a
issue #1583 : Added some Macros as follows:
...
cc.MENU_STATE_WAITING = 0;
cc.MENU_STATE_TRACKING_TOUCH = 1;
cc.MENU_HANDLER_PRIORITY = -128;
cc.DEFAULT_PADDING = 5;
2012-11-30 21:15:54 +08:00
James Chen
0d93f2d651
issue #1583 : Bind cc.Menu.alignItemsInRows, cc.Menu.alignItemsInColums, cc.LayerMultiplex.create
2012-11-30 21:15:01 +08:00
James Chen
96e2707f39
issue #1583 : Added jsvals_variadic_to_ccarray function.
2012-11-30 21:12:14 +08:00
James Chen
e8c5f5f38c
Added CCTexture2D::setTexParameters binding.
...
Fixed pass one more argument in JSCallFuncWrapper::callbackFunc if extraData is void.
2012-11-30 18:15:29 +08:00
minggo
bb6e03bd3f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1583-update-js
2012-11-30 17:42:51 +08:00
James Chen
a37cc8a098
Updated jsb_constants_chipmunk.js and jsb_constants_cocosbuilder.js.
2012-11-29 15:29:58 +08:00
James Chen
494806167b
Temporary commit.
2012-11-29 15:26:24 +08:00
James Chen
208132895e
issue #1583 : Moved the common js codes to scripting/javascript/bindings/js folder. Deleted the old js sample resources.
2012-11-29 11:27:39 +08:00
James Chen
bb4b3fb4bc
issue #1581 : Deleted JS_AddObjectRoot when construct a JS array since JS_SetElement will not trigger a GC.
2012-11-29 11:01:32 +08:00
Rohan Kuruvilla
a4b55b5217
Fixing Accelerometer crash on Android
2012-11-28 15:56:57 -08:00
James Chen
a4762605b8
issue #1581 : Removed some unused codes.
2012-11-28 22:24:12 +08:00
James Chen
a814066601
issue #1581 : JSBinding bug fixes.
...
Some fixes of JSBinding codes:
[1] Check whether the proxy was already added in JS_NEW_PROXY
[2] In struct schedFunc_proxy_t, JSScheduleWrapper* --> CCArray*
Reason: One js function may correspond to many targets. To debug this, you could refer to JSScheduleWrapper::dump function. It will prove that i'm right. :)
[3] In ScriptingCore::cleanupSchedulesAndActions function, we must invoke unschedule for all targets and remove the proxy both in _schedFunc_target_ht and _schedTarget_native_ht, otherwise the hash tables will grow bigger and bigger, so I added a new function JSScheduleWrapper::removeAllTargetsForNatiaveNode to make this things easier.
[4] To easily find out the bugs of binding codes, I add JS_SetGCZeal in ScriptingCore::createGlobalContext, it only works in DEBUG mode.
[5] In js_cocos2dx_CCNode_getChildren, we should add the generated array to root to avoid gc happen when invoking JS_SetElement.
[6] The JSCallFuncWrapper isn't needed since an action will be run by a cc.Node and it will be released at the CCNode::cleanup.
[7] Some improvements of JSScheduleWrapper class.
[8] Added a new function JSScheduleWrapper::setTarget, it's for js_CCNode_unschedule to find out which target need to be unscheduled.
[9] Commented JS_SetReservedSlot in js_CCNode_scheduleOnce and js_CCNode_schedule.
Reason:
For js_CCNode_scheduleOnce: Don't add the callback function to the reserved slot of this js object.Since the class of js object may be inherited from cocos class(e.g. cc.Sprite). The subclass will not contain reserved slots. It will crash if invoking this.
For js_CCNode_schedule: Don't add js callback function to the reserved slot of scheduler js object. Since the scheduler is an object always rooted.
So the callback function might not be released when gc comes.I looked inside the implementation of cc.Node.schedule, and it doesn't use JS_SetReservedSlot there.
2012-11-28 22:04:55 +08:00
CocosRobot
9e929019c3
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-28 11:53:56 +08:00
James Chen
0ce47db8f1
Merge pull request #1648 from CocosRobot/updategeneratedsubmodule_1353897594
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-26 19:13:05 -08:00
James Chen
e0948a4817
fixed #1576 : Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
2012-11-26 21:51:05 +08:00
CocosRobot
0ec7f873fe
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-26 10:40:03 +08:00
James Chen
7c1e860d78
issue #1573 : Added CocosDragonJS. Made it compiled ok on iOS,android and win32.
2012-11-23 15:09:03 +08:00
Rohan Kuruvilla
36bbd80b68
Adding changes to CCBreader
2012-11-23 15:08:55 +08:00
minggo
91b370e0f0
Merge pull request #1639 from minggo/gles20
...
make lua work
2012-11-22 18:38:44 -08:00
minggo
542c407346
make lua work
2012-11-23 10:36:26 +08:00
James Chen
c32ea4486b
issue #1572 : WatermelonWithMe works on Android now.
2012-11-22 18:46:30 +08:00
James Chen
ee97633a4f
Merge pull request #1637 from dumganhar/gles20
...
Minor fix in ScriptingCore::log;Avoiding pointer point to a destroyed variable.
2012-11-22 01:53:57 -08:00
James Chen
c0097db48c
Avoiding pointer point to a destroyed variable.
2012-11-22 17:36:49 +08:00
James Chen
692d16f296
Minor fix in ScriptingCore::log.
2012-11-22 17:34:58 +08:00
CocosRobot
10ceef62dc
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-22 17:22:19 +08:00
CocosRobot
ce19b26771
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-22 15:38:09 +08:00
James Chen
b66bc98a46
issue #1564 : Made ChipmunkTest of TestJavascript works
2012-11-22 15:19:16 +08:00
James Chen
51d61ba214
issue #1564 : fix the wrong order of parameters in CCScheduler::scheduleSelector.
...
Made MoonWarriors works.
2012-11-22 12:05:38 +08:00
James Chen
1ce1b4b471
issue #1564 : Closed verbose log of TestJavascript for android. And Made it compiled ok.
2012-11-22 10:47:57 +08:00
James Chen
89a51433b8
issue #1564 : Make TestJavascript works on windows.
2012-11-22 10:24:26 +08:00
CocosRobot
c991b0b6b0
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-21 21:46:28 +08:00
James Chen
9abb63b670
Merge pull request #1589 from funkaster/gles20
...
fixed #1570 : Improves the debugger for JSBindings.
2012-11-21 05:32:24 -08:00
James Chen
8f6c8e202e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
...
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
2012-11-20 16:35:42 +08:00
James Chen
b73b30d1b0
issue #1564 : Deleted duplicated declare in ScriptingCore.h
2012-11-20 16:26:06 +08:00
James Chen
28b692279e
issue #1564 : Deleted CCPhysicsSprite in jsbindings since it's supported at Extension.
2012-11-20 16:20:16 +08:00
minggo
33529afc07
Merge pull request #1592 from fape/luaCocos2d
...
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-19 17:36:25 -08:00
Rolando Abarca
d9baa8a24d
fixes merge conflict
2012-11-19 11:23:08 -08:00
ivzave
28ca22bfde
added lua support for linux platform
2012-11-19 14:56:02 +04:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
fape
355d8df79e
fix compile: rename kOrientation to kCCTransitionOrientation
2012-11-17 19:02:04 +01:00
Rolando Abarca
ac539667f4
Merge remote-tracking branch 'origin/gles20' into gles20
...
Conflicts:
scripting/javascript/bindings/ScriptingCore.cpp
scripting/javascript/bindings/js_bindings_chipmunk_manual.cpp
2012-11-16 09:44:34 -08:00
James Chen
0223c0d70a
issue #1555 : Minor fixes.
2012-11-16 19:38:25 +08:00
James Chen
34f359384c
issue #1530 : Minor fixes in ScriptingCore.cpp, js_bindings_chipmunk_auto_classes.cpp and js_bindings_chipmunk_funcitons.cpp.
2012-11-16 15:58:20 +08:00
Rohan Kuruvilla
f7848eb171
Adding Object Oriented Chipmunk JS bindings
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
6d59009953
Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
39a4e6a19e
Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
66f85468e5
Adding JS conversion of CCDictionary objects, also modified CCArray conversion
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
672bed3ed0
Updating bindings for ONE_BY_ONE touch handling
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
f9aea7befe
Changing parameter ordering for callbacks (making thisObj optional). Also adding custom bindigns for CCScheduler
2012-11-16 15:56:26 +08:00
Rolando Abarca
6e9d2e808c
improved debugger
2012-11-15 11:14:57 -08:00
Rolando Abarca
c9df076378
new JSStringWrapper
2012-11-15 11:14:37 -08:00
Rolando Abarca
2ea2cb616c
adds compartment code to chipmunk
2012-11-15 11:13:32 -08:00
Rolando Abarca
b894524ed0
removing some warnings
2012-11-15 11:13:21 -08:00
James Chen
ceced09c2d
CCLuaEngine::executeAccelerometerEvent return 0 by default.
2012-11-12 10:37:42 +08:00
James Chen
833b5b1be8
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
...
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
CocosRobot
cfd84b3fe6
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-08 22:53:19 +08:00
CocosRobot
b72c48f4c5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-06 17:01:34 +08:00
James Chen
449c719d96
issue #1549 : Added "ccdictionary_to_jsval" function, now TMXOrthoObjectsTest and TMXIsoObjectsTest don't crash.
2012-11-06 16:11:45 +08:00
James Chen
21e4f80fbd
Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
2012-11-06 14:18:13 +08:00
CocosRobot
5efdb93ef7
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-06 10:12:52 +08:00
James Chen
ceb4371f12
issue #1549 : Using new JS API for MoonWarriors.
...
Updated the logics of js_cocos2dx_CCMenuItemSprite_create and js_cocos2dx_CCMenuItemImage_create.
2012-11-05 23:22:59 +08:00
CocosRobot
7de31acd38
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-05 18:50:00 +08:00
James Chen
10ba589ed5
issue #1549 : * Arguments in callbacks:
...
instead of: callback(this, func), it is now:callback( func, [this] )
2012-11-05 18:44:28 +08:00
CocosRobot
da457732b9
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-02 18:56:53 +08:00
James Chen
f88aa5058d
Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-ccb
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
scripting/javascript/bindings/cocos2d_specifics.hpp
tools/tojs/cocos2dx.ini
2012-11-02 18:15:25 +08:00
CocosRobot
2bba105453
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-11-02 15:38:46 +08:00
James Chen
f031a09e77
Added cc.TMXLayer.getTileFlagsAt to jsbindings.
2012-11-02 15:21:44 +08:00
James Chen
c8e21be7ec
issue #1526 : Using spiderMonkey library in cocos2d-iphone.
2012-11-02 11:24:34 +08:00
James Chen
d2a9acd227
issue #1530 : Two memory leaks fixes.
2012-11-01 16:06:05 +08:00
James Chen
026662ee5f
issue #1530 : Assigned JSVAL_VOID to member variables for JSCallbackWrapper class.
2012-11-01 15:45:22 +08:00
Rohan Kuruvilla
b3c6f1a2e1
Adding bindings for CCBReader and other improvements.
...
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
2012-11-01 15:34:23 +08:00
Rohan Kuruvilla
ea92936c1f
Adding bindings for CCBReader and other improvements.
...
1. Added additional CCBReader bindings, including callback support for animationCompleted
2. Improved design for JS CallbackWrappers
3. Added bindings for pDistance
4. Updating cocos2dx.ini
2012-11-01 00:08:01 -07:00
Rohan Kuruvilla
dc51a78981
Updating bindings for CCBReader. It is now very similar to cocos2d-iphone CCBReader bindings
2012-11-01 00:06:24 -07:00
Rohan Kuruvilla
2fbb748b7c
Adding sections for CCBReader bindings generation as well as renaming other bindings
2012-11-01 00:06:24 -07:00
James Chen
b1ec3c8ab5
fixed #1537 : Upgraded spidermonkey to FF17.0beta3 for win32 and iOS ports.
2012-10-31 11:03:42 +08:00
James Chen
5141c83fd1
issue #1537 : Upgraded spiderMonkey library to FF17.0b3 for android port.
2012-10-31 10:33:43 +08:00
James Chen
bdbb70bea5
Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into js-surith-gnu
2012-10-31 10:04:35 +08:00
James Chen
8ed7d63309
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize.
2012-10-30 10:35:19 +08:00
CocosRobot
e3304e44ba
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-10-29 18:22:46 +08:00
Rohan Kuruvilla
8f026d0b21
Fixing Javascript bindings Android makefile to include extensions
2012-10-29 15:15:00 +08:00
Rohan Kuruvilla
6773dc4154
Adding object roots for extra parameter of CallFunc and schedule
2012-10-29 15:14:25 +08:00
Rohan Kuruvilla
5760ea305c
Fixing CallFuncN bindings to properly pass optional third parameter
2012-10-29 15:14:11 +08:00
Rohan Kuruvilla
094d52664d
Fixing bug in CCNode::copy bindings. Fixes MoonWarriors crash
2012-10-29 15:10:29 +08:00
James Chen
1ede7b6434
Modifying action/schedules cleanup, ignoring libjs_static.a of debugging version.
2012-10-29 15:10:13 +08:00
Rohan Kuruvilla
a409fc0164
Fixing CallFunc bindings to support easier cleanup
2012-10-29 15:07:27 +08:00
Rohan Kuruvilla
f8fc7328d7
Fixing bug in bindings for MenuItemImage
2012-10-29 15:06:56 +08:00
Rohan Kuruvilla
c24acd4733
Changing ScriptingCore flow of execution of targetted Touch events
2012-10-29 15:06:34 +08:00
Rohan Kuruvilla
7ede1373f7
Adding function to cleanup actions and schedule to ScriptingCore
2012-10-29 15:06:10 +08:00
James Chen
0ce4f61bb6
Updating submodule reference to latest autogenerated bindings.
2012-10-26 10:04:29 +08:00
Mat Hopwood
2b265929e2
Marmalade Sample data removed and merged changes
...
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
2012-10-25 21:40:37 +01:00
James Chen
26f7b36797
update submodule for JS-Bindings auto-gen codes.
2012-10-25 11:40:24 +08:00
Rolando Abarca
463ae31180
upgrades to new spidermonkey API
...
FF beta - this fixes the auto-compartment issue
2012-10-24 11:14:15 -07:00
Rolando Abarca
003f6e4cf3
fixes ScriptingCore for FF 16 API
2012-10-19 09:54:21 -07:00
Mat Hopwood
24115675b0
Marmalade Cocos2d-x Main Repo Changes
...
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
2012-10-19 16:38:58 +01:00
Mat Hopwood
988835560d
Marmalade Support
...
Full Marmalade support added for Cocos2d-x
2012-10-19 16:26:34 +01:00
James Chen
871541ac6b
Updated one comment.
2012-10-19 15:03:10 +08:00
James Chen
e5096ce091
Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit.
2012-10-19 15:01:05 +08:00
James Chen
1a373f70ff
issue #1517 : Upgrading js engine to FF 16.0.1 for IOS.
2012-10-19 13:41:03 +08:00
James Chen
476a184a09
issue #1517 : Updated js library for android.
2012-10-19 11:48:42 +08:00
James Chen
de3376b43f
issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1
2012-10-19 11:15:23 +08:00
Rolando Abarca
b0f02a0773
updates on the js front
2012-10-18 17:44:41 -07:00
James Chen
2779b4f1ab
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel
2012-10-17 15:08:25 +08:00
James Chen
b51ff47ed7
Updated mozjs.lib and mozjs.dll for win32 port. Built with Release mode.
2012-10-16 18:24:00 +08:00
johnangel
a2e1400402
Merge remote branch 'upstream/gles20' into gles20
2012-10-16 08:42:30 +02:00
johnangel
cc8b2556a9
Revert accidentally deleted submodule
2012-10-16 08:33:25 +02:00
James Chen
c202671636
Update to latest generated bindings.
2012-10-15 17:31:25 +08:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
folecr
2ac7a5cbe4
microlattice : updating submodule reference to latest autogenerated bindings
2012-10-12 09:48:37 -07:00
James Chen
99a7dcefa4
issue #1486 : Updated lua bindings.
2012-10-12 16:04:26 +08:00
James Chen
21491317c0
Fix compilation errors.
2012-10-12 15:41:45 +08:00
Rohan Kuruvilla
eafd6ebf08
Fixing restart of context to not leak memory
2012-10-11 18:48:37 -07:00
Rohan Kuruvilla
e7ac758b9f
Updating bindings to match cocos2d-html5
2012-10-11 18:45:22 -07:00
Rohan Kuruvilla
0c1c5a432d
Adding support to pass array of CCPoints from JS
2012-10-11 18:44:46 -07:00
folecr
4af5abbc56
Update submodule reference to point to latest auto-generated changes
2012-10-10 20:07:46 -07:00
James Chen
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
James Chen
700b83f3b9
issue #1469 : Added 'setBlendFunc' support for CCSprite, CCParticleSystem...etc.
2012-10-10 15:25:27 +08:00
James Chen
9f93b609e8
issue #1469 : Added cc.config for js-bindings.
2012-10-10 15:24:20 +08:00
folecr
12d711a13e
Update to latest generated JS bindings
2012-10-09 21:18:58 -07:00
Rohan Kuruvilla
12292afee6
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini
2012-10-09 15:03:14 -07:00
johnangel
ad7dacc281
Merge remote branch 'upstream/gles20' into gles20
2012-10-08 16:35:43 +02:00
walzer
d6ba2b44c4
update javascript/bindings/generated/ submodule revision pointer
2012-09-28 10:29:21 +08:00
folecr
5859260b25
Update to latest generated bindings
2012-09-27 13:39:49 -07:00
folecr
f1aff597a2
Update makefile to include CocosDenshion
2012-09-27 13:39:49 -07:00
James Chen
b48b329517
Removed js185-1.0.1.tar.gz.
2012-09-26 15:28:32 +08:00
dualface
8d104b8244
[Lua] add CCApplication:getTargetPaltform()
2012-09-25 16:43:36 +08:00
dualface
a2b468f2b3
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
2012-09-25 16:27:54 +08:00
minggo
e20b933f1a
make TestJavaScript work and fix some warnings
2012-09-24 13:57:45 +08:00
James Chen
37825acfd0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-24 11:47:58 +08:00
James Chen
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
minggo
2ed7b9febe
Merge pull request #1365 from dualface/luafix
...
luabinding bugfix
2012-09-23 20:17:23 -07:00
James Chen
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
folecr
78bfc2df62
Fix spurious file introduced into makefile
2012-09-21 12:09:26 -07:00
folecr
12e88ac514
Update bindings
2012-09-21 12:07:30 -07:00
folecr
2a78f8d176
Separate out cocos specific manual type conversions.
2012-09-21 11:38:19 -07:00
folecr
6730294dbe
Generated bindings are a submodule pointing to a separate repository
...
* This allows bindings to be generated by a build server
* ... when the Cocos2D-X API changes
2012-09-21 11:38:19 -07:00
minggo
29fad4d570
Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas
2012-09-21 11:05:31 +08:00
Rohan Kuruvilla
100a7a1883
Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
d097406f18
Modifying MenuItemToggle bindings to make it work
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
9e1e64509b
Copying changes previously made into cxx-generator/targets/spidermonkey/common
...
1. Fixed memory leak while removing proxy objects
2. Fixed JS Context restart
3. Added JS conversion for CCArray
4. Updated generated bindings with some more classes
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
dde8d50d15
Adding member function executeFunctionWithOwner to ScriptingCore
2012-09-20 14:45:35 -07:00
Rohan Kuruvilla
57680ec2d6
Adding CCBuilderReader JS bindings
2012-09-20 14:45:34 -07:00
dualface
46a8eb5491
[Lua] add ccTexParams, add new luabinding build script, update luabinding
2012-09-20 23:37:23 +08:00
dualface
1313398335
[Lua] fix lua function reference error
2012-09-20 23:22:45 +08:00
dualface
93b669b936
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-20 09:27:45 +08:00
folecr
c6f06ddced
Refer to cocos2dx.cpp from the generated subdirectory
2012-09-18 17:02:21 -07:00
folecr
60fd3c5b9c
Remove generated files...
...
* ... in favour of automatically generated bindings
* ... in the generated/ subfolder.
2012-09-18 17:02:21 -07:00
Nicolas Gramlich
48062e222d
Reverted change in scripting/javascript/bindings/Android.mk.
2012-09-18 11:01:31 -07:00
dualface
eba97a9b1e
[Lua] fix luabinding overloaded functions
2012-09-17 14:40:42 +08:00
johnangel
fdec1ba4b9
Fixing include paths to be able to compile cocos2d-x using
...
external Visual Studio solution, without copying all files
2012-09-15 16:34:31 +02:00
dualface
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
Nicolas Gramlich
c2a62875cf
Added ANDROID_SCRIPTINGCORE_LOAD_SCRIPTS_FROM_EXTERNAL_ASSET_DIRECTORY flag, that allows to load from external assets directory instead of from internal apk assets directory.
2012-09-13 11:13:02 -07:00
Nicolas Gramlich
696cdbaa8c
Minor build fix due to merge fail.
2012-09-12 16:55:56 -07:00
Nicolas Gramlich
675d0adce5
Merge with gles20-official.
2012-09-12 16:51:01 -07:00
YuLei
9de34c4f07
[Lua] remove unused codes
2012-09-11 17:13:45 +08:00
YuLei
214d4e7623
[Lua] remove CCLuaEngine::purgeDefaultEngine()
2012-09-11 16:11:42 +08:00
YuLei
fc3a55a065
[Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h
2012-09-11 15:44:33 +08:00
YuLei
a2259ab0dd
[Lua] update CCLuaEngine for new script binding protocol
2012-09-11 15:24:25 +08:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
James Chen
2572823b1a
Merge pull request #1301 from folecr/fix_android_module_location
...
fixed #1476 : Update location of spidermonkey-android makefile.
2012-09-10 18:53:02 -07:00
folecr
991d63eaad
Update location of spidermonkey-android makefile
2012-09-10 16:12:48 -07:00
Nicolas Gramlich
4c7705171a
Android JAVA refactoring. Android JNI Cleanup.
2012-09-07 17:23:04 -07:00
YuLei
a22122d0ed
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
2012-09-07 19:19:50 +08:00
YuLei
9d2b0b04f2
[Lua] update luabinding for CCPoint, CCSize, CCRect
2012-09-05 14:49:26 +08:00
YuLei
39b019b2cb
[Mac] fix CC_ASSERT error
...
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
2012-09-04 11:16:59 +08:00
YuLei
c86595ddde
[Lua] remove glLineWidth()
2012-09-02 01:18:28 +08:00
YuLei
6f3833af73
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:56:27 +08:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
35f6f937c9
Merge pull request #1271 from mustime/testlua
...
issue #1425 : add NodeTest to TestLua.
2012-09-01 01:52:42 -07:00
James Chen
0d2c2b3bf8
issue #1454 : Updated win32 project configuration and some .plist files.
...
Removed old binding files.
2012-08-31 22:01:57 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
mustime
f5506d58e1
issue #1425 : update pkg files and recreate binding
2012-08-31 18:29:44 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
mustime
55a9444186
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-30 16:45:40 +08:00
mustime
5ed3ec14e9
issue #1425 : update pkg and recreate LuaCococs2d.cpp
2012-08-30 15:33:54 +08:00
Rohan Kuruvilla
743478570c
Chipmunk support
...
* Changing CGPoint to cpVect
* Fix build and test code
2012-08-29 16:35:30 -07:00
James Chen
68e9210434
Modified the implementation of ScriptingCore::getInstance by using new operator.
...
Some implemented method should return default value.
2012-08-29 14:49:03 -07:00
James Chen
2dd0b9e0d3
Using '#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)' instead of '#ifdef ANDROID' to make it compiled successfully on win32.
2012-08-29 14:49:03 -07:00
James Chen
708be4e474
Remove 'readFileInMemory' to make it compile ok on win32, initialized the member variables for ScriptingCore class.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
bbf3c4843a
Updated spidermonkey-win32 to FF14.0.1.
2012-08-29 14:48:41 -07:00
James Chen
5ba6a4c0b7
Merge pull request #1256 from dumganhar/gles20
...
Updated cocos2d_generated.cpp.
2012-08-29 03:08:16 -07:00
James Chen
0fe9d12eaa
Updated cocos2d_generated.cpp.
2012-08-29 18:03:34 +08:00
YuLei
64c8ed3398
[Lua] update CCNode:isVisible() and CCNode:setVisible()
2012-08-29 17:51:42 +08:00
YuLei
66b221dc79
[Lua] update luabinding
2012-08-29 17:32:47 +08:00
mustime
c15c96ac28
Merge https://github.com/cocos2d/cocos2d-x into testlua
2012-08-29 17:29:33 +08:00
mustime
7172e71e1a
issue #1425 : recreate LuaCocos2d.cpp for tolua++ binding
2012-08-29 17:14:16 +08:00
folecr
122dab03d2
Remove iOS specific code
2012-08-28 17:56:01 -07:00
folecr
3c11684bf7
Remove commented code
2012-08-28 17:56:01 -07:00
folecr
6c604f02d3
Fix typo and add logs
2012-08-28 17:44:01 -07:00
folecr
148b67d374
Disable use of chipmunk
2012-08-28 17:44:00 -07:00
folecr
1902cdda05
Chipmunk bindings : clean up code
...
* Remove dead code
* Use generic float instead of platform-specific CGFloat
2012-08-28 17:44:00 -07:00
folecr
7636758f94
Add chipmunk library reference to build
2012-08-28 17:43:59 -07:00
folecr
c2f908cf8f
Hardcoded modification to generated file to work platform-specific code
...
* addPVRTCImage() is not supported on Android
2012-08-28 17:43:59 -07:00
James Chen
71b147ce2f
Use CCFileUtils and CCString to load file contents
2012-08-28 17:43:59 -07:00
James Chen
60dae250f2
Use CCLOG to implement js_log
2012-08-28 17:43:59 -07:00
folecr
4256dc6830
Update makefiles
2012-08-28 17:43:58 -07:00
folecr
304923eee0
Copy prebuilt spidermonkey from Firefox14.0.1
2012-08-28 17:43:58 -07:00
folecr
f0426c87f9
Remove spidermonkey-android
2012-08-28 17:43:57 -07:00
Rohan Kuruvilla
6c8d2ea75b
Fixing GC crash issue. Forcing the GC from Javascript at any time, doesn't crash the app
...
Fixing GC crash issue. Bug in bind_menu_item. There is no more problem with GC, including force_GC
Updating generated bindings to remove std::string scoping bug
2012-08-28 17:29:25 -07:00
YuLei
8a680c4c06
[Lua] add CCFileUtils:setResourceDirectory()
2012-08-28 18:14:00 +08:00
YuLei
d7881b7c3a
[Lua] update luabinding
2012-08-28 15:54:19 +08:00
YuLei
f6a17f69f7
update tolua++ pkg files
...
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:53:52 +08:00
minggo
f7993b9954
Merge pull request #1250 from mustime/testlua
...
issue #1425 : remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
2012-08-27 23:35:55 -07:00
mustime
69679ff545
issue #1425 : remove endToLua interface in CCDirector.h, use renaming
...
feature in tolua++ instead.
2012-08-28 14:28:33 +08:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00
minggo
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00
YuLei
2c518e43b2
[Lua] fix CCLayer:registerScriptTouchHandler()
...
[Lua] make CCNotificationCenter script support
2012-08-28 12:08:15 +08:00
mustime
9b384dace2
issue #1425 : update for pkg files' change
2012-08-28 11:53:07 +08:00
Rohan Kuruvilla
a572a5c87a
Adding spidermonkey
2012-08-27 10:12:15 -07:00
folecr
dfec428288
Remove spidermonkey-ios
2012-08-27 10:12:11 -07:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
Rohan Kuruvilla
ccd5e0a066
Adding cxx-generator/target/common/* files and generated bindings for cocos2d-x.
2012-08-27 10:02:19 -07:00
folecr
51708123a1
remove scripting/javascript/bindings
2012-08-27 10:01:21 -07:00
minggo
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
mustime
1b70d8193f
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
samples/TestLua/proj.win32/TestLua.win32.vcxproj
2012-08-27 10:00:00 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
YuLei
bf3ce7cf76
[Lua] update Lua to 5.1.5
2012-08-25 14:32:06 +08:00
Donald Alan Morrison
e4f6e48bf5
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 12:01:26 -07:00
Donald Alan Morrison
2b4bab18af
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 09:00:57 -07:00
Donald Alan Morrison
9ef8b3b699
Fixed Warning C4114: same type qualifier used more than once. (Definition
...
signature does not match Implementation signature.)
2012-08-24 08:52:29 -07:00
Donald Alan Morrison
eaf0e71e57
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 08:35:48 -07:00
Donald Alan Morrison
5ba3ff4d9a
Fixed VS2010 Warning C4065: switch statement contains 'default' but no 'case' labels.
2012-08-24 01:33:28 -07:00
Donald Alan Morrison
3c7846e32f
Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch
2012-08-23 23:35:25 -07:00
James Chen
85304b9441
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua
2012-08-24 10:27:20 +08:00
mustime
4c7ad0d0d1
issue #1425 : testlua project
2012-08-24 10:23:23 +08:00
mustime
96e621bae8
issue #1425 : recreate LuaCocos2d.cpp for .pkg files' changes
2012-08-23 16:13:08 +08:00
mustime
be3a02c7f3
issue #1425 : fixed the problem when using ccBezierConfig to create
...
CCBezierAction
2012-08-23 13:54:23 +08:00
James Chen
dbd02b2726
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua
2012-08-22 18:28:11 +08:00
mustime
354f7a51b2
issue #1425 : recreate luacocos2d.cpp to meet pkg files
2012-08-22 12:02:56 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
Dale Ducharme
d76d9a6451
Adding lua scripting to BlackBerry port.
2012-08-21 13:32:28 -04:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
mustime
d5b99cc79e
issue #1425 : corresponding changes for .pkg files
2012-08-11 16:05:38 +08:00
James Chen
848381ef0f
Fixed a compile in cocos2d_generated.cpp.
2012-08-03 10:44:48 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
James Chen
1efe20e4c3
Fix a compile error in TestJavascript project.
2012-07-27 14:16:23 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
minggo
59db9f0c6f
issue #1399:lua building works ok after adjusting directory structure
2012-07-23 17:14:18 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
James Chen
557f654cf3
Built successfully on android.
2012-07-20 17:06:00 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00