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 |