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

8947 Commits

Author SHA1 Message Date
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
James Gregory 4e3c5a5eb9 Add missing file from CocosDenshion. 2013-05-06 13:28:07 -07:00
James Gregory c9c71a7404 Add myself to authors so folks know who to blame :) 2013-05-06 13:28:07 -07:00
James Gregory e4c0829666 Interval test working now also -- update TODO. 2013-05-06 13:28:07 -07:00
James Gregory e7b5216396 Add missing fonts to TestCpp makefile, fixing layertest. 2013-05-06 13:28:07 -07:00
James Gregory 83f55cc52d Updated TODO list 2013-05-06 13:28:07 -07:00
James Gregory 115ae59ffc Add missing assets from TestCpp's Makefile 2013-05-06 13:28:07 -07:00
James Gregory 0318774343 Add libtiff to Emscripten builds, plus some build flags. 2013-05-06 13:28:07 -07:00
James Gregory 74d49d73a0 Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-05-06 13:28:07 -07:00
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