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

10072 Commits

Author SHA1 Message Date
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
James Chen 1128f9dfc6 Merge pull request #2564 from folecr/jsdb 
fixed #2187: JavaScript debugger improved and bugfixed.
 2013-05-21 00:31:51 -07:00
James Chen 125a6d71b6 Merge pull request #2598 from CocosRobot/updategeneratedsubmodule_1369119518 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-21 00:14:57 -07:00
CocosRobot c454fe62df [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-21 06:58:43 +00:00
James Chen 361004d4d3 Update cocos2dx.ini, don't generate binding for CCSet::acceptVisitor. 2013-05-21 14:52:54 +08:00
James Chen f3b4182b9e Update generate-jsbindings.sh 2013-05-21 14:23:34 +08:00
Lee, Jae-Hong 9ac3de134b Adding description for Tizen platform and change order between Korean name and ID. 2013-05-21 15:13:25 +09:00
minggo cc2b00e9fe Merge pull request #2573 from j4m3z0r/emscriptenate 
Use browser font rendering instead of FreeType
 2013-05-20 22:50:28 -07:00
James Chen 9257c4f4e8 Adding GEN_JSB env for Travis-ci to auto generate jsbinding glue codes. 2013-05-21 13:48:53 +08:00
James Chen 71512ae491 Update generate-jsbindings.sh 2013-05-21 13:45:56 +08:00
James Chen 09221b8c26 Update .travis.yml 2013-05-21 13:24:27 +08:00
James Chen d98b13b096 Update .travis.yml 2013-05-21 13:15:03 +08:00
James Chen 868dc8fcd5 Update .travis.yml 2013-05-21 13:11:58 +08:00
James Chen 6614927cf3 Merge pull request #2593 from dumganhar/jsb_travis 
Updating .travis.yml.
 2013-05-20 22:02:50 -07:00
James Chen 1797735cb1 Updating .travis.yml. 2013-05-21 12:51:56 +08:00
James Chen f86430aff4 Removing old secures. 2013-05-21 12:49:21 +08:00
James Chen b20c002751 Update AUTHORS [ci skip] 2013-05-21 11:21:31 +08:00
James Chen 66e631fd35 Merge pull request #2590 from smshuja/master 
fixed #2186: New PivotJoint will now accept 3 or 4 parameters like in html5 version.
 2013-05-20 20:20:13 -07:00
James Chen 1e6e60a56f Update AUTHORS [ci skip] 2013-05-21 11:10:11 +08:00
James Gregory da7113a04f Implement audio for Emscripten using SDL. Still needs methods to release samples when we're done with them. 2013-05-20 20:09:56 -07:00
James Chen acef98a350 Merge pull request #2572 from pyrasis/tizen 
fixed #2185: Cocos2d-x Tizen support.
 2013-05-20 20:08:28 -07:00
minggo e7d9e09a44 Merge pull request #2586 from silverscania/master 
Bug in previous modifications made to GL_UNPACK_ALIGNMENT
 2013-05-20 18:59:03 -07:00
Lee, Jae-Hong 5faa5e92af Modify getWritablePath function. 2013-05-21 10:56:18 +09:00
Lee, Jae-Hong e1a947637f Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame. 2013-05-21 10:43:24 +09:00
Lee, Jae-Hong f4340475a1 Insert spine directory. 2013-05-21 10:33:08 +09:00
Lee, Jae-Hong 6bb8d58d3a Update cocos2d project and use float.h 2013-05-21 10:32:34 +09:00