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

7858 Commits

Author SHA1 Message Date
James Gregory 239f857b19 Rebuild libfreetype without references to my home dir in it. 2013-04-22 13:01:10 -07:00
James Gregory 7d499ce32a Correct the resolution in main.cpp for TestCpp for Emscripten 2013-04-19 18:17:53 -07:00
James Gregory c5baaa215a Remove -DLINUX from Emscripten chipmunk makefile 2013-04-19 18:17:28 -07:00
James Gregory 46542f96b0 Add note on origin of libxml binary. 2013-04-19 18:16:20 -07:00
James Gregory 4d6173af34 Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-04-19 18:15:54 -07:00
James Gregory 54fc4d8583 Add libxml2 build for Emscripten. 2013-04-15 14:59:39 -07:00
James Gregory b327d3fdbb Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-04-12 14:52:53 -07:00
James Gregory e5cd965ed3 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-04-12 14:51:29 -07:00
James Gregory 1e1c4156e7 Switch to using GL_DYNAMIC_DRAW. 2013-04-08 22:08:44 -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 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
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
James Gregory 662b8b595f Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-04-04 22:20:59 -07:00
James Gregory f675bb43a3 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-04-04 22:19:39 -07:00
James Gregory 520832c1ed Build fixes for emscripten, add linkage to libfreetype.a 2013-04-03 21:43:31 -07:00
James Gregory fab342f931 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-04-03 21:42:49 -07:00
James Gregory 5f7ec9342b Remove freetype source and add libfreetype.a as built by the Emscripten test-suite. 
Revert "Add freetype 2.4.11 to repo"

This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-04-03 21:40:02 -07:00
James Gregory 86e77d8705 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-04-03 21:30:09 -07:00
James Gregory b650817742 Add freetype 2.4.11 to repo 2013-04-03 21:14:16 -07:00
James Gregory eefaae3413 ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-04-03 18:30:40 -07:00
James Gregory 5733d66c14 bool x = NULL => bool x = false, to silence Clang. 2013-04-03 18:30:09 -07:00
James Gregory 340467638a Add main.cpp files for app samples 2013-04-03 18:29:15 -07:00
James Gregory 30e3111bec Add #defines for Emscripten platform 2013-04-03 18:28:27 -07:00
James Gregory 5f195c131c Set build config for Emscripten rather than Linux out of the box. 2013-04-03 18:27:31 -07:00
James Gregory ea88b3701f Add Makefiles for Emscripten + Emscripten external 2013-04-03 18:26:55 -07:00
James Chen ac91c9e1af Update AUTHORS 2013-04-03 22:38:51 +08:00
James Chen 425b95152c Merge pull request #2295 from SevInf/master 
fixed #1999: CCEditBox iOS enchantments/bugfixes
 2013-04-03 07:37:29 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
James Chen a470a76d0b Merge pull request #2303 from dumganhar/master 
Updating SceneTest.lua.
 2013-04-03 03:32:04 -07:00
James Chen 031e77ccbe Updating SceneTest.lua. 2013-04-03 18:31:00 +08:00