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

9295 Commits

Author SHA1 Message Date
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
Lee, Jae-Hong 4152850592 Remove EVENT_COME_TO_BACKGROUND notification. 2013-05-22 13:17:54 +09:00
James Chen b037a38821 Merge pull request #2610 from dumganhar/iss1644-dict2jsval-crash 
fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash, and improving performance for ccarray_to_jsval.
 2013-05-21 20:59:14 -07:00
James Chen e21926edb8 fixed #1644: Passing NULL parameter to ccdictionary_to_jsval will cause crash. 2013-05-22 11:56:47 +08:00
minggo e07761688e Merge pull request #2591 from nicolasgramlich/patch-1 
Updated .classpath of Android project to latest ADT 22 build tool compatibility.
 2013-05-21 19:43:25 -07:00
minggo 7ac1a68968 Update AUTHORS 
[ci ignore]
 2013-05-22 10:42:40 +08:00
minggo d6b0170217 Update AUTHORS 
[ci ignore]
 2013-05-22 10:40:39 +08:00
minggo 2ac874dca1 Merge pull request #2608 from FlowerpotGames/CCLabelTTF-Const-Update 
CCLabelTTF::enableShadow(…) const update
 2013-05-21 18:39:32 -07:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate 
Add Audio Support for Emscripten
 2013-05-21 18:32:12 -07:00
James Gregory 060f60b91f Bump Emscripten version 2013-05-21 16:39:25 -07:00
James Gregory 05ca831e0d Add audio cleanup methods for Emscripten. 2013-05-21 16:37:24 -07:00
Ed Bartley 719eb15326 Make shadowOffset parameter of CCLabelTTF::enableShadow(…) a const reference. 2013-05-21 15:42:26 -04:00
James Chen fca83437b9 Merge pull request #2606 from pyrasis/tizen_2.1 
Support Tizen 2.1 SDK.
 2013-05-21 07:20:50 -07:00
Lee, Jae-Hong d83ed86739 Implementing foreground and background status and modify CocosDenshion comment. 2013-05-21 22:48:51 +09:00
Lee, Jae-Hong 4b248d5f8c Delete Tizen 2.0 headers and libraries. 2013-05-21 21:52:10 +09:00
Lee, Jae-Hong 6f34c7cb46 Support Tizen 2.1 SDK. 2013-05-21 21:22:31 +09:00
James Chen 42c94ad5a7 Merge pull request #2605 from CocosRobot/updategeneratedsubmodule_1369132578 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-21 03:39:09 -07:00
CocosRobot 552082d491 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 10:36:26 +00:00
James Chen 4a44dc1976 Merge pull request #2604 from dumganhar/master 
Updating cocos2dx.ini. CCTMXLayer::positionAt --> getPositionAt
 2013-05-21 03:30:22 -07:00
James Chen ff616a1d29 Updating cocos2dx.ini. CCTMXLayer::positionAt --> getPositionAt 2013-05-21 18:20:49 +08:00
minggo b2e7c256d3 Merge pull request #2603 from minggo/master 
fix compiling error of iOS
 2013-05-21 03:20:07 -07:00
minggo 0857fdd599 issue #2188:fix compiling error of iOS 2013-05-21 18:18:44 +08:00
James Chen 9339802407 Update .travis.yml, not only build master branch. 2013-05-21 18:06:49 +08:00
James Chen 1a80057538 Merge pull request #2602 from dumganhar/master 
[Travis] Adding Real email info for git. [ci skip]
 2013-05-21 03:04:37 -07:00
James Chen 21f435fdd6 [Travis] Adding Real email info for git. [ci skip] 2013-05-21 18:03:17 +08:00
James Chen cb001478ee Merge pull request #2601 from dumganhar/mac-travis-support 
[Travis CI] Using linux by default.
 2013-05-21 02:31:19 -07:00
James Chen 13f50b2072 [Travis CI] Using linux by default. [ci skip] 2013-05-21 17:29:23 +08:00
James Chen e4755fec24 Merge pull request #2600 from dumganhar/mac-travis-support 
issue #2105: Adding iOS travis support, not finished.
 2013-05-21 02:08:30 -07:00
James Chen 0891e0bde9 Updating generate-jsbindings.sh, android is built on linux host. 2013-05-21 16:48:49 +08:00
James Chen aa49b7555d Android is built on Ubuntu host. 2013-05-21 16:39:26 +08:00
James Chen 8d2dcfe4be Android build uses linux as host. And a fix in generate-jsbindings.sh. 2013-05-21 16:25:54 +08:00
James Chen 6ac72da487 Updating file mode. +x 2013-05-21 16:17:58 +08:00
James Chen 19ede723f2 Adding iOS travis support, not finished. 2013-05-21 16:13:47 +08:00
James Chen 580457d909 Merge pull request #2596 from pyrasis/tizen_description 
Adding description for Tizen and Modify AUTHORS file. [ci skip]
 2013-05-21 00:40:31 -07:00
James Chen 002fbf34f0 Merge pull request #2599 from CocosRobot/updategeneratedsubmodule_1369121759 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-21 00:38:02 -07:00
CocosRobot 8a56b1627d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 07:36:03 +00:00
James Chen eccbbcb2a1 Update AUTHORS [ci skip] 2013-05-21 15:32:53 +08:00