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

8942 Commits

Author SHA1 Message Date
minggo 3c8b26813e delete libxml2 2013-04-10 09:39:48 +08:00
Rohan Kuruvilla 3d7e8f0d84 Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation 2013-04-09 15:29:35 -07:00
James Chen c7bbbeb751 Merge pull request #2337 from dumganhar/master 
Fixing a typo.
 2013-04-09 03:09:37 -07:00
James Chen 9c563a883f Fixing a typo. 2013-04-09 18:08:43 +08:00
James Chen 783e7492c6 Merge pull request #2335 from dumganhar/master 
Updating iOS template.
 2013-04-09 00:32:03 -07:00
James Chen 854944c272 Updating iOS template. 2013-04-09 15:30:37 +08:00
James Chen eecdf3ad82 Merge pull request #2334 from CocosRobot/updategeneratedsubmodule_1365490150 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-08 23:52:11 -07:00
CocosRobot 40c5280527 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-09 14:49:20 +08:00
James Chen 95a907aeac Merge pull request #2333 from dumganhar/master 
[PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx.
 2013-04-08 23:48:29 -07:00
James Chen 90ad5410c7 [PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx. 2013-04-09 14:46:49 +08:00
James Chen a2c71f8e89 Exposing CCApplication to js. 2013-04-09 14:42:12 +08:00
James Chen b8ea3dfe99 Merge pull request #2332 from dumganhar/master 
cxx-generator ~> bindings-generator.
 2013-04-08 22:58:04 -07:00
James Chen 6d57d691f5 Updating bindings-generator. 2013-04-09 13:56:45 +08:00
James Chen 0d5d2e54fd cxx-generator ~> bindings-generator. 2013-04-09 13:47:12 +08:00
folecr e91ec3ede5 Clean up linked libraries 
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
 * Remove unused -lEGL
 2013-04-08 22:46:25 -07:00
James Chen ab0549b575 cxx-generator ~> bindings-generator for plugin. 2013-04-09 13:41:24 +08:00
James Gregory 1e1c4156e7 Switch to using GL_DYNAMIC_DRAW. 2013-04-08 22:08:44 -07:00
James Chen 59d8356eae Update AUTHORS 2013-04-09 12:57:07 +08:00
James Chen 55ec9de216 Merge pull request #2326 from harikrishnar/master 
fixed #2037: Major problem with initWithObjects method of CCArray.
 2013-04-08 21:50:33 -07:00
James Gregory 7fe7dee3c7 Remove debug print statement 2013-04-08 21:41:21 -07:00
James Gregory a807ee97d3 Switch makefile over to using Emscripten headers for freetype. 2013-04-08 21:09:53 -07:00
James Gregory 1ef5b398f9 List of things left to do to get Emscripten working 100%. Living document. 2013-04-08 21:09:21 -07:00
James Gregory d2eced4188 More client side buffer fixes. 2013-04-08 21:09:09 -07:00
James Gregory eca46e9bee More client side buffer fixes. 2013-04-08 21:08:34 -07:00
James Gregory b9d3bfd545 More client side buffer fixes. 2013-04-08 21:08:06 -07:00
James Gregory 77dda8c828 More client side buffer fixes. 2013-04-08 21:07:49 -07:00
James Gregory eac9fba261 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-04-08 21:06:36 -07:00
James Gregory 1f457d4ac9 Add freetype2 headers that match the .a we're using. 2013-04-08 21:06:07 -07:00
James Chen f50b26dff4 Update AUTHORS 2013-04-09 11:47:54 +08:00
James Chen 8e4848b243 Merge pull request #2328 from elmiro/readlink 
fixed #2036: Correction of passed buffer size to readlink ...
 2013-04-08 20:46:08 -07:00
James Chen 7114aef751 Merge pull request #2331 from dumganhar/master 
Updating genbindings.sh, cxx-generator ~> bindings-generator.
 2013-04-08 20:06:04 -07:00
James Chen d29ff33df1 Updating genbindings.sh, cxx-generator ~> bindings-generator. 2013-04-09 11:03:39 +08:00
James Chen e1ba283264 Merge pull request #2330 from dumganhar/rename-cxx-generator 
Renaming tools/cxx-generator to tools/bindings-generator.
 2013-04-08 19:39:59 -07:00
James Chen eef8e854c1 Updating .gitmodules. 2013-04-09 10:34:45 +08:00
James Chen cb4eb733c6 Renaming tools/cxx-generator to tools/bindings-generator. 2013-04-09 10:32:18 +08:00
James Gregory 8da87fe009 Copy resources in HelloCpp makefile 2013-04-08 19:17:10 -07:00
James Gregory 47ed9c663a Switch to slot-based GL buffer loading code for CCSprite. 2013-04-08 19:16:22 -07:00
James Gregory b0b629d32b Basis of Makefile for SimpleGame sample. 2013-04-08 19:15:27 -07:00
James Gregory b5a458fa3a Add missing Makefile reference to file utils for Emscripten. 2013-04-08 19:14:58 -07:00
James Gregory fbe36bb3c8 Increase heap size for Emscripten binaries, add in missing linkages. 2013-04-08 19:14:25 -07:00
James Gregory 2e0ff662c3 Add resources to TestCpp makefile 2013-04-08 19:13:56 -07:00
James Gregory 831c25ec80 Disable libcurl tests for Emscripten. 2013-04-08 19:13:22 -07:00
James Gregory 61bc858360 Add pre-build dependencies for Emscripten libpng, libz. 2013-04-08 19:12:04 -07:00
James Gregory df2dd57b5d Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-04-08 19:11:31 -07:00
James Gregory c50861aa1a Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-04-08 19:10:29 -07:00
James Gregory bc3f5c9854 Enable texture caching with emscripten. 2013-04-08 19:10:12 -07:00
James Gregory 3e5acf992b Fix Motion streak client side buffers 2013-04-08 19:09:38 -07:00
minggo ac43ff7584 Merge pull request #2325 from minggo/userdefault-hotfix 
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
 2013-04-08 18:34:20 -07:00
James Gregory 09b7f165d2 Add platform files for Emscripten. 2013-04-08 18:21:53 -07:00
James Gregory f42254125f Get CCGrid to work. 2013-04-08 17:51:30 -07:00