Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,221 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

637 Commits

Author SHA1 Message Date
minggo b118cf6d72 issue #1859:fix compiling error of ScriptingCore.cpp 2013-05-17 09:57:55 +08:00
Carsten Sandtner 2b2d7cb665 Merge branch 'master' into XMLHttpRequest_Demo 
# By carlo morgantini (28) and others
# Via minggo (6) and zhangbin (3)
* master: (40 commits)
  Update AUTHORS
  Update AUTHORS
  fixed #2155 : Resolve the bug of callback methods in plugin.
  Update AUTHORS
  fix a warning caused by member variables initialization order in constructor
  it now shares code between createTextBitmap and createTextBitmapShadowStroke (no more duplication)
  initWithStringShadowStroke() renamed to initWithString()
  comment fixed
  fix alignent problem when rendering text with shadow
  fix a problem with float stroke size
  Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase
  CCLabelTTF C++ test fixed
  new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition
  initWithStringAndTextDefinition() changed method's signature
  no more bingins for ccTextDefinition
  class renamed and moved to ccTypes.h
  CCTextDefinition is passed now by pointers
  bindings for CCTextDefinition
  ccTextDefinition becomes CCTextDefinition
  changed the label test (shadows + stroke) for using ccTextDefinition when creating CCLabelTTF
  ...
 2013-05-16 10:12:19 +02:00
Carsten Sandtner 6e43618004 MinXMLHttpRequest extends from CCObject 
Added MinXMLHttpRequest to Android.mk for Bindings
Added newline at header as compiler threw a warning.
 2013-05-16 10:11:00 +02:00
carlo morgantini 3b50ffe5ba Fix problem with CCLabelTTF + shadow and text alignment; also fontDefinition property names now are lowercase 2013-05-15 16:37:08 -07:00
carlo morgantini 315999edad new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition 2013-05-15 16:37:08 -07:00
Carsten Sandtner 370a540352 fixed possible memory holes. 2013-05-15 15:15:23 +02:00
Carsten Sandtner 4cb3001fc6 Fixed check for arguments at xhr.send() 2013-05-15 13:57:25 +02:00
Carsten Sandtner 919c347c6d changed method to strip newlines as Android complained. 2013-05-14 17:21:27 +02:00
Carsten Sandtner a7e0a83a2e remove initialization of withCredentialsValue = flase as iso c++ complains it. 2013-05-14 15:50:56 +02:00
Carsten Sandtner 6449d79d60 Fixed some typo 2013-05-14 14:16:22 +02:00
Carsten Sandtner 32d2ee8104 Deactivated Debugging flag. 2013-05-14 13:19:32 +02:00
Carsten Sandtner 1b80208329 Tidied up comments 2013-05-14 12:03:58 +02:00
Carsten Sandtner 2e68188321 Some code cleaning 2013-05-14 11:36:48 +02:00
Carsten Sandtner 915265dd34 Merge branch 'master' into XMLHttpRequest_cchttpclient 
# By Sam Clegg (2) and James Chen (1)
# Via James Chen
* master:
  Update AUTHORS [ci skip]
  Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert
  Log assert messages
 2013-05-14 11:19:46 +02:00
James Chen 99664b5998 Merge pull request #2391 from sbc100/log_asserts 
fixed #2152: Logging assert messages to the console and renaming CCScriptSupport::executeAssert to CCScriptSupport::handleAssert.
 2013-05-13 19:56:28 -07:00
Carsten Sandtner d61ee643a9 changed xmlhttprequest to use cchttpclient instead of raw curl. XHR is now async. 2013-05-13 16:57:55 +02:00
Carsten Sandtner e86f11e36a Using CChttpClient instead of curl. 2013-05-10 15:00:03 +02:00
Carsten Sandtner 65eb73f81c activate XMLHttpRequest in bindings.config 2013-05-08 13:13:21 +02:00
Carsten Sandtner 1dccfc70b4 Added Spidermonkey bindings for a synchronous XMLHttpRequest object in JAvascript. 2013-05-08 12:59:07 +02:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
James Chen 9a7c849ce4 fixed #2106: Fixing a bug on android when only jsc files exist. 2013-05-07 10:50:09 +08:00
James Chen bf6bbba6ee Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-07 09:43:24 +08:00
Sam Clegg 4f6de1bcad Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert 
Also remove the first "cond" argument, since it is always false.
 2013-05-06 12:25:13 -07:00
sunzhuoshi fa39c41136 Fixed bad commit 2013-05-06 19:06:16 +08:00
James Chen 9a63b39974 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 18:13:26 +08:00
sunzhuoshi 3da5a7d5cd Removed redundant code 2013-05-06 18:06:18 +08:00
sunzhuoshi 6e70884853 Removed redundant code 2013-05-06 15:43:33 +08:00
James Chen f86a843c8b Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 12:55:44 +08:00
sunzhuoshi d4c4170368 Removed bad comment 2013-05-06 12:02:17 +08:00
James Chen 4657ef716c Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:43:40 +08:00
sunzhuoshi de27f1137a Changed byte code file ext to ".jsc" 
Modified loading logic to load js file first
 2013-05-06 11:32:23 +08:00
James Chen 0718e6cf70 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-06 11:15:19 +08:00
minggo 0c721096ec fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval 2013-05-02 09:03:24 +08:00
sunzhuoshi 077214c419 Modified to ensure no popup notify when no byte code file 2013-04-30 20:39:06 +08:00
sunzhuoshi d4832e3f46 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
 2013-04-30 03:51:07 +08:00
sunzhuoshi 163c19fac2 Added support for javascript byte code 2013-04-30 03:29:56 +08:00
James Chen 2d27353dd3 Using the same native stack size for DEBUG and RELEASE target. 
#define JSB_MAX_STACK_QUOTA 500000
 2013-04-27 23:49:04 +08:00
James Chen c70d9f203a Don't export classes in scripting/lua/cocos2dx_support. 2013-04-27 18:24:08 +08:00
James Chen 8f6a271b54 Merge branch 'cocosplayer' of https://github.com/rohankuruvilla/cocos2d-x into rohankuruvilla-cocosplayer 2013-04-27 16:55:29 +08:00
James Chen 91036225c3 [Lua] Fixing "memset" and "memcpy" can't be found on BB port. 2013-04-27 14:45:00 +08:00
James Chen eb0358fda6 [Lua] Passing full path to luaL_dofile in CCLuaEngine::executeScriptFile. 2013-04-27 14:44:20 +08:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
James Chen 8c779ff98f Fixing compilation errors for linux port. 2013-04-27 09:32:46 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
Rohan Kuruvilla 2636bafd0c Fixing network logging for Android and iOS 2013-04-25 18:41:29 -07:00
James Chen 1ff07223de Merge pull request #2456 from dumganhar/lua-bytecode-test 
fixed #2083: Bytecode of LuaJIT can't work on android.
 2013-04-25 06:48:01 -07:00
CocosRobot c501a73a54 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 21:30:20 +08:00
James Chen 862ce85c7a fixed #2083: Bytecode of LuaJIT can't work on android. 2013-04-25 21:29:31 +08:00
James Chen 5572990e5d Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop. 2013-04-25 20:56:27 +08:00
CocosRobot 1e4370f43b cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-25 14:35:16 +08:00
CocosRobot ca30ce7462 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-23 12:11:31 +08:00
James Chen e84cf9ef83 Correct log output in js_cocos2dx_CCTMXLayer_getTiles 2013-04-23 10:57:55 +08:00
James Chen 30c6915449 fix a typo. 2013-04-23 10:52:51 +08:00
CocosRobot 8d8a2293a1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-19 17:27:38 +08:00
James Chen 20b0e41b78 fixed #2017: Binding cc.TMXLayer.getTiles manually. 2013-04-19 17:25:24 +08:00
James Chen 556d95d922 Removing an unused comment in ccaffinetransform_to_jsval. 2013-04-18 14:13:26 +08:00
CocosRobot 5ead6d7322 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-18 13:58:01 +08:00
James Chen 4db3c9c692 Refactoring js_cocos2dx_CCFileUtils_getByteArrayFromFile. 2013-04-18 13:53:16 +08:00
James Chen 642d1746f9 issue #2064: Adding conversation for "jsval ~> CCAffineTransform" and "CCAffineTransform ~> jsval". 2013-04-18 13:50:58 +08:00
James Chen 4bd012dfbf fixed #2060: Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename) 2013-04-17 18:43:57 +08:00
James Chen 63ce8adfad fixed #2059: Fix complication errors on Android. 2013-04-17 17:05:39 +08:00
James Chen ddd6d9d155 fixed #2059: cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string. 2013-04-17 16:08:48 +08:00
James Chen 694c47f5d6 Merge pull request #2382 from wedteam/keypad-support 
fixed #2057: [JSB] Adding response for back and menu keypad event for Android.
 2013-04-16 21:56:37 -07:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
akira_cn e1f9e1a300 update keypad support 2013-04-17 10:40:46 +08:00
James Chen 2384d97ce8 issue #1847: Adding luajit library for win32. 2013-04-17 10:09:17 +08:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
James Chen bbbf139c8d Adding luajit iOS prebuilt library. 2013-04-16 18:19:25 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
akira_cn 54f18be09a add back key support 2013-04-16 10:19:36 +08:00
CocosRobot 5928d2836c cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-16 10:02:11 +08:00
CocosRobot d6e9d4420e cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-15 14:01:47 +08:00
James Chen 0ecf9da3a6 Adding Box2D and chipmunk dependence for TestLua. Removing the definition of GL_RGB565 in CCTexture2D.pkg. 2013-04-12 14:27:29 +08:00
James Chen b5bad26a88 fixed #2043: Updating spidermonkey to Firefox v20 for Windows. 2013-04-12 13:38:21 +08:00
James Chen e1ed841b8e fixed #2043: Updating to spidermonkey20 for android. 2013-04-12 12:52:50 +08:00
James Chen fea712fcf8 fixed #2043: Disabled YARR_JIT on ios. 2013-04-12 11:58:53 +08:00
James Chen 42997f7390 Merge branch 'master' into iss2043-upgrade-spidermonkey20 2013-04-12 10:57:33 +08:00
James Chen 3f695d1934 Merge branch 'master' of https://github.com/SevInf/cocos2d-x into SevInf-master 2013-04-10 16:07:54 +08:00
James Chen d45765ccc4 fixed #2043: Upgrading SpiderMonkey to Firefox20.0. 2013-04-10 11:19:43 +08:00
CocosRobot 40c5280527 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-09 14:49:20 +08:00
James Chen a2c71f8e89 Exposing CCApplication to js. 2013-04-09 14:42:12 +08:00
James Chen 0bab4609ab fixed #1592: Removing some marco definitions in CCTexture2D.pkg. 2013-04-08 14:14:35 +08:00
James Chen 831dfb6ade Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash 2013-04-08 11:56:10 +08:00
James Chen 2c3427dcee issue #1592: Fixing complication errors for windows port. 2013-04-08 11:56:04 +08:00
James Chen ea4603a057 issue #1592: Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h. 2013-04-08 11:55:35 +08:00
James Chen 1a44f776f8 fixed #2005: Adding CurrentLanguageTest for Testlua. 2013-04-07 16:34:07 +08:00
James Chen ef731879f1 Merge pull request #2291 from dumganhar/iss1944-remove-associate-nativeobj 
fixed #1944: The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
 2013-04-06 20:20:33 -07:00
CocosRobot 3871129c1f cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-07 11:13:28 +08:00
James Chen 684c659ba7 Merge pull request #2311 from dumganhar/iss2002-more-luatest 
fixed #2002: Adding Texture2dTest, RenderTexture, ZwoptexTest, FontTest, CocosDenshionTest and EffectsAdvancedTest for TestLua
 2013-04-06 19:45:28 -07:00
James Chen 85b0fd306a Adding CocosDenshionTest. 2013-04-06 14:32:46 +08:00
James Chen e754909c5f Adding RenderTexture test for TestLua. 2013-04-05 17:13:46 +08:00
James Chen 2bff6d6480 Adding Texture2dTest. And format some lua codes. 2013-04-05 16:13:04 +08:00
Sergej Tatarincev 1510354568 Support variable cell sizes in CCTableView 2013-04-04 17:57:43 +03:00
CocosRobot 0338a3e504 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-04 00:08:15 +08:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen f1d48b41e2 issue #1944: Fixing a typo. 2013-04-03 10:39:40 +08:00
James Chen ad555e70fb issue #1944: Removing commented codes in cc.associateWithNative. 2013-04-03 10:39:15 +08:00
James Chen 6d6bc03465 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj 2013-04-03 10:27:01 +08:00
James Chen 2de4dde0bd Merge pull request #2293 from dumganhar/iss1942-layertest 
fixed #1942: LayerTest for TestLua is ok.
 2013-04-02 02:54:21 -07:00