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

9334 Commits

Author SHA1 Message Date
James Chen 498bf3ad7a Merge pull request #2635 from samuele3hu/issue2103_testlua 
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
 2013-05-24 01:39:26 -07:00
samuele3hu 26267aee56 issue #2103 modify some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 16:27:03 +08:00
James Chen bdc70fb312 Merge pull request #2630 from samuele3hu/issue2103_testlua 
Add some skip function name to tools/tojs/cocos2dx_extension.ini
 2013-05-24 01:12:14 -07:00
James Chen d771853058 Merge pull request #2631 from samuele3hu/issue2103_testlua 
Add some skip function name to tools/tojs/cocos2dx_extension.ini
 2013-05-24 01:11:52 -07:00
samuele3hu a1ef0db7b7 issue #2103 add some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 15:40:02 +08:00
James Chen 2e3023b863 Merge pull request #2627 from samuele3hu/issue2103_testlua 
add more test lua
 2013-05-23 23:51:17 -07:00
James Chen 60a0f4ec6b Merge pull request #2626 from samuele3hu/issue2103_testlua 
Add more Test Lua
 2013-05-23 23:50:57 -07:00
samuele3hu 8b5450ef4a issue #2103 modify some build script 2013-05-24 13:55:05 +08:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 01399f9d5e issue #2103 add more test lua 2013-05-24 11:46:07 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
James Chen 9a36d8080a Merge pull request #2625 from guanqun/current-master 
remove the un-used static variable in PluginUtilsIOS
 2013-05-23 19:34:55 -07:00
Lu Guanqun aeb1e53026 remove the un-used static variable in PluginUtilsIOS 2013-05-24 03:54:07 +08:00
James Chen 0a20c73f68 Merge pull request #2623 from zynga/XMLHttpRequest_cchttpclient 
fixed #2092: Fixed setHeader while Android had problems with stringstreams.
 2013-05-23 06:34:50 -07:00
Carsten Sandtner 820983f40c Fixed setHeader while Android had problems with stringstreams. 2013-05-23 14:37:32 +02:00
James Chen 19e7771130 Merge pull request #2621 from samuele3hu/MenuTest 
issue #2103: Add menu test sample of testlua
 2013-05-23 03:26:48 -07:00
zhangbin 514f7fe5d5 Add reflection in plugin on android. 2013-05-23 17:57:55 +08:00
samuele3 bfce20d1ae Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 17:51:06 +08:00
James Chen 870818ec9c Merge pull request #2620 from CocosRobot/updategeneratedsubmodule_1369302025 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-23 02:47:11 -07:00
samuele3 4c5ceb7ac3 Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 17:44:41 +08:00
CocosRobot 41c7adb532 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-23 09:40:35 +00:00
James Chen 62552f94cb Merge pull request #2619 from dumganhar/iss2217-atlas-fps 
fixed #2217: Using CCLabelAtlas instead of CCLabelTTF to show FPS.
 2013-05-23 02:35:21 -07:00
James Chen 91a355cdb0 Updating cocos2dx/Android.mk. 2013-05-23 17:10:30 +08:00
James Chen 131d97a3d6 fixed #2217: Updating the comment for FPS display by using CCLabelAtlas. 2013-05-23 16:55:53 +08:00
James Chen 8448280ed3 issue 2217: Updating Make file and project configuration to add ccFPSImage.c. 2013-05-23 16:50:48 +08:00
James Chen d6a0af86eb fixed #2217: Updating logic when m_bIgnoreContentScaleFactor is enabled. 2013-05-23 16:12:04 +08:00
James Chen 42102bcf0a issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
James Chen 733b551bf6 issue #2217: Revert changes in CCPlatformMacro.h. 2013-05-23 15:59:45 +08:00
samuele3 93dd778e08 issue #2103 add a newline to CCInterger.pkg 2013-05-23 15:49:06 +08:00
samuele3 24a34e50bf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 15:40:48 +08:00
samuele3 5da5407efe issue #2103 add menu test lua sample 2013-05-23 15:39:41 +08:00
James Chen 22e259360e fixed #2217: Format codes in CCDirector::createStatsLabel. 2013-05-23 15:11:48 +08:00
James Chen bb11182279 fixed #2217: Using CCLabelAtlas instead of CCLabelTTF to show FPS. 2013-05-23 15:06:57 +08:00
James Chen 4c69d63d5d Merge pull request #2617 from dumganhar/iss2215-ccconfiguration 
fixed #2215: CCConfiguration extension (rewritten)
 2013-05-22 19:43:41 -07:00
minggo 737fecb62e Merge pull request #2616 from guanqun/fix-version 
update to the latest version in script
 2013-05-22 19:11:58 -07:00
James Chen 731b3c2324 fixed #2215: Updating project configuration for other platforms after adding ConfigurationTest. 2013-05-23 10:09:35 +08:00
James Chen cd3774a54f Merge branch 'ccconfiguration_extension_2' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-ccconfiguration_extension_2 2013-05-23 09:50:39 +08:00
James Chen 12ee71545b Update run-script.sh, adding travis-ci build of TestCpp,AssetsMangerTest and Testlua for android. 2013-05-23 09:48:11 +08:00
Ricardo Quesada 8a34153a83 fixes compilation issues on Linux and Android 2013-05-22 18:11:37 -07:00
Ricardo Quesada 207fc4be9c Adds ConfigurationTest to the suite 2013-05-22 17:56:05 -07:00
Ricardo Quesada ecf04e337c Fixes memory bug and adds support for loadConfigFile 2013-05-22 17:03:00 -07:00
Lu Guanqun e66fd174ef update to the latest version in script 2013-05-23 07:10:49 +08:00
Ricardo Quesada 836a61cd3e CCConfiguration extension (rewritten) 
rewritten to prevent conflicts while rebasing
 2013-05-22 13:00:34 -07:00
James Chen 10ba265f46 Merge pull request #2614 from pyrasis/tizen_2.1 
Adding lua libaray and sample projects for Tizen.
 2013-05-22 06:12:17 -07:00
Lee, Jae-Hong 6acd8c66c2 Adding lua libaray and sample projects for Tizen. 2013-05-22 21:45:53 +09:00
James Chen a70740bd90 Merge pull request #2613 from dumganhar/iss2214-spidermonkey-v21 
fixed #2214: Upgrading Spidermonkey to Firefox v21
 2013-05-22 03:09:06 -07:00
James Chen 974546557d fixed #2214: Upgrading Spidermonkey to Firefox v21 2013-05-22 17:31:07 +08:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1 
Update projects to Tizen 2.1 SDK.
 2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
James Chen 5c506e2edc Merge pull request #2607 from pyrasis/background_foreground_tizen 
Implementing foreground and background status for Tizen port.
 2013-05-21 21:43:51 -07:00