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

9267 Commits

Author SHA1 Message Date
James Gregory 51d42d7392 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-06 20:59:47 -07:00
James Gregory 7d563a818a Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-05-06 20:59:47 -07:00
James Gregory 19c6a50d50 Enable texture caching with emscripten. 2013-05-06 20:59:46 -07:00
James Gregory a1c628f80a Fix Motion streak client side buffers 2013-05-06 20:58:46 -07:00
James Gregory edcd0f12e4 Add platform files for Emscripten. 2013-05-06 20:58:46 -07:00
James Gregory 9500448f87 Get CCGrid to work. 2013-05-06 20:58:46 -07:00
James Gregory 089a47d937 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 20:58:45 -07:00
James Gregory aa2739a109 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 20:58:45 -07:00
James Gregory 77e9f4902e Build fixes for emscripten, add linkage to libfreetype.a 2013-05-06 20:58:45 -07:00
James Gregory 9d6db6953e Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 20:58:45 -07:00
James Gregory 1d307d676d 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 20:58:45 -07:00
James Gregory ea6a5fde17 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 20:58:45 -07:00
James Gregory d5ec8f240e Add freetype 2.4.11 to repo 2013-05-06 20:58:44 -07:00
James Gregory 955ba1bfd3 ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-05-06 20:58:43 -07:00
James Gregory 0bef8d4325 bool x = NULL => bool x = false, to silence Clang. 2013-05-06 20:58:43 -07:00
James Gregory 5a23190672 Add main.cpp files for app samples 2013-05-06 20:58:43 -07:00
James Gregory 4f56f93269 Add #defines for Emscripten platform 2013-05-06 20:58:43 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
minggo 923234a095 Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl 
Fixing linking errors for TestCPP with libcurl
 2013-05-06 20:52:58 -07:00
James Gregory c58ef91413 Simplify Emscripten makefile a little. 2013-05-06 20:34:15 -07:00
minggo 877e6032dc Update AUTHORS 2013-05-07 11:08:53 +08:00
minggo 80dfd4d493 Merge pull request #2407 from sergey-shambir/attribute_format 
Added __attribute__(__format__()) for CCLog and CCString
 2013-05-06 20:06:52 -07:00
James Chen dc4673a8b3 Update AUTHORS 2013-05-07 11:04:08 +08:00
James Chen b902fa1428 Merge pull request #2518 from dumganhar/iss2106-js-bytecode 
fixed #2106: Addig support for javascript bytecode.
 2013-05-06 20:02:15 -07:00
James Chen 9a7c849ce4 fixed #2106: Fixing a bug on android when only jsc files exist. 2013-05-07 10:50:09 +08:00
James Chen bf6bbba6ee Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode 2013-05-07 09:43:24 +08:00
James Gregory e322538e7c Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	cocos2dx/draw_nodes/CCDrawingPrimitives.cpp
	cocos2dx/platform/CCPlatformMacros.h
	cocos2dx/proj.emscripten/cocos2dx.mk
	external/emscripten
	samples/Cpp/TestCpp/proj.emscripten/Makefile
 2013-05-06 14:52:03 -07:00
James Gregory 70f4a30d1e Merge fix 2013-05-06 14:46:34 -07:00
James Gregory 319a63ddc3 Bump Emscripten Version 2013-05-06 14:46:10 -07:00
James Gregory 7884b7d5af Disable unsafe GL opts, enable -O2 2013-05-06 14:33:20 -07:00
James Gregory f366f25d79 Add missing files to testcpp makefile 2013-05-06 14:33:20 -07:00
James Gregory b4dc48cf63 Point Emscripten root to be the external referenced by the tree. 2013-05-06 14:33:20 -07:00
James Gregory c75e44b97c Use floats instead of doubles for Chipmunk. 2013-05-06 14:33:20 -07:00
James Gregory ec69c1a533 Enable texture cache on Emscripten. Not sure yet if this is the best balance, since we're both short on memory *and* compute time. 2013-05-06 14:33:20 -07:00
James Gregory 0aa7178324 Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-06 14:33:20 -07:00
James Gregory 8ba936996f Add myself to authors so folks know who to blame :) 2013-05-06 14:33:19 -07:00
James Gregory e84f157788 Remove lua samples from emscripten makefile 2013-05-06 14:22:39 -07:00
James Gregory 4891aa4e74 Move to a separate Makefile for Emscripten. 2013-05-06 14:21:41 -07:00
James Gregory f0553dbeec Implement primitive drawing methods for Emscripten 2013-05-06 14:21:04 -07:00
James Gregory 17c7081ba3 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 14:10:36 -07:00
James Gregory 607e1cc78b Switch to using GL_DYNAMIC_DRAW. 2013-05-06 14:09:26 -07:00
James Gregory 91112bd380 Remove debug print statement 2013-05-06 14:09:26 -07:00
James Gregory 5176219012 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 14:08:02 -07:00
James Gregory 610acaecdd Add resources to TestCpp makefile 2013-05-06 14:05:48 -07:00
James Gregory a3393851cb Get CCGrid to work. 2013-05-06 14:00:00 -07:00
James Gregory d85e4fcb9b Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 13:57:30 -07:00
James Gregory 0b700e9ef5 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 13:56:33 -07:00
James Gregory 24a5fbce0c Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 13:52:43 -07:00
James Gregory 1a29b7e0e9 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 13:49:31 -07:00
James Gregory 99716ecb33 Add freetype 2.4.11 to repo 2013-05-06 13:49:31 -07:00