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

9259 Commits

Author SHA1 Message Date
James Gregory b226e5fe57 Add missing assets from "Extentions" to TestCpp. 2013-05-06 13:28:06 -07:00
James Gregory 60a3b8aea3 Set orientation to 0 for Emscripten, thus avoiding a segfault. 2013-05-06 13:28:06 -07:00
James Gregory 15309c9b56 Switch to O1 for now. 2013-05-06 13:28:05 -07:00
James Gregory 5953679ed5 Remove LOG prefixes from emscripten makefiles 2013-05-06 13:28:05 -07:00
James Gregory 1e063064e4 Remove lua samples from emscripten makefile 2013-05-06 13:28:05 -07:00
James Gregory 64ea0ccffb Updates to my TODO list. 2013-05-06 13:28:04 -07:00
James Gregory 5035496b70 Move to a separate Makefile for Emscripten. 2013-05-06 13:28:04 -07:00
James Gregory f0d2fd1e1f Fix the ordering of vertex attributes for CCProgressTimer. 2013-05-06 13:28:04 -07:00
James Gregory 8e0728710f Implement primitive drawing methods for Emscripten 2013-05-06 13:28:04 -07:00
James Gregory 2395130755 Enable -O2 optimization now that Emscripten seems to succeed. 2013-05-06 13:26:35 -07:00
James Gregory c162b4f8f9 Delete tmp directory after generating data file. 2013-05-06 13:26:35 -07:00
James Gregory f5d2a7ee7d Bump Emscripten version 2013-05-06 13:26:34 -07:00
James Gregory c6b280bde3 Rebuild libfreetype without references to my home dir in it. 2013-05-06 13:26:34 -07:00
James Gregory 8615586889 Correct the resolution in main.cpp for TestCpp for Emscripten 2013-05-06 13:26:34 -07:00
James Gregory 2b0798e2e1 Remove -DLINUX from Emscripten chipmunk makefile 2013-05-06 13:26:34 -07:00
James Gregory c2a22dde35 Add note on origin of libxml binary. 2013-05-06 13:26:33 -07:00
James Gregory 4783bd6249 Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-06 13:26:33 -07:00
James Gregory feb23619dc Add libxml2 build for Emscripten. 2013-05-06 13:26:33 -07:00
James Gregory d33b20550a Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-05-06 13:26:33 -07:00
James Gregory 8704c4396b Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-06 13:26:32 -07:00
James Gregory 62ce178520 Switch to using GL_DYNAMIC_DRAW. 2013-05-06 13:26:32 -07:00
James Gregory db19fce3a3 Remove debug print statement 2013-05-06 13:26:32 -07:00
James Gregory 13ade854bc Switch makefile over to using Emscripten headers for freetype. 2013-05-06 13:26:32 -07:00
James Gregory b3acdd6647 List of things left to do to get Emscripten working 100%. Living document. 2013-05-06 13:26:32 -07:00
James Gregory c9b86b8277 More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory e488c2e35c More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 21a53cdcfc More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 30a2a1cdf1 More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 0fd908bd13 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 13:26:32 -07:00
James Gregory 120198d486 Add freetype2 headers that match the .a we're using. 2013-05-06 13:26:32 -07:00
James Gregory 58d9478b98 Copy resources in HelloCpp makefile 2013-05-06 13:26:31 -07:00
James Gregory 5e2f52b6d6 Switch to slot-based GL buffer loading code for CCSprite. 2013-05-06 13:26:31 -07:00
James Gregory 8af0e8a72a Basis of Makefile for SimpleGame sample. 2013-05-06 13:26:31 -07:00
James Gregory ea071d9897 Add missing Makefile reference to file utils for Emscripten. 2013-05-06 13:26:31 -07:00
James Gregory 46faeace36 Increase heap size for Emscripten binaries, add in missing linkages. 2013-05-06 13:26:31 -07:00
James Gregory b40b12d345 Add resources to TestCpp makefile 2013-05-06 13:26:31 -07:00
James Gregory 1d43e88123 Disable libcurl tests for Emscripten. 2013-05-06 13:26:31 -07:00
James Gregory f0f642d2fc Add pre-build dependencies for Emscripten libpng, libz. 2013-05-06 13:26:31 -07:00
James Gregory 10ebd44628 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-06 13:26:31 -07:00
James Gregory 576ff593c7 Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-05-06 13:26:31 -07:00
James Gregory d44b552df1 Enable texture caching with emscripten. 2013-05-06 13:26:30 -07:00
James Gregory 2c89f69ee0 Fix Motion streak client side buffers 2013-05-06 13:23:44 -07:00
James Gregory 047c53790d Add platform files for Emscripten. 2013-05-06 13:23:44 -07:00
James Gregory e7077af4f9 Get CCGrid to work. 2013-05-06 13:23:44 -07:00
James Gregory 6ae68248c1 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 13:23:44 -07:00
James Gregory d26492af71 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 13:23:43 -07:00
James Gregory c71dff8c41 Build fixes for emscripten, add linkage to libfreetype.a 2013-05-06 13:23:43 -07:00
James Gregory d7dd9a24b7 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 13:23:43 -07:00
James Gregory eb2f918418 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-05-06 13:23:43 -07:00
James Gregory 5d34490126 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 13:23:43 -07:00