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

9266 Commits

Author SHA1 Message Date
James Chen eb936b0feb Merge pull request #2522 from dumganhar/fix-building-error 
Fix compilation errors for linux port.
 2013-05-06 23:39:18 -07:00
James Chen 2418e72a0e Fix compilation errors for linux port. 2013-05-07 14:36:01 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
minggo 90b8dfd383 Merge pull request #2504 from wagaf-d/ccpchanges 
Move ccpX functions to CCPoint methods and operators
 2013-05-06 23:22:21 -07:00
minggo ea5d7bc5ad Merge pull request #2361 from tiantian20007/dictStuff 
Implement CCDictionary::writeToFile();
 2013-05-06 23:17:11 -07:00
James Chen ff610eea2f Update AUTHORS 2013-05-07 14:08:13 +08:00
James Chen eaad4f52af Merge pull request #2495 from ptekchand/master 
fixed #2116: Support negative node scales of CCScrollView.
 2013-05-06 23:06:54 -07:00
James Gregory c7ac6b9d01 Add libjpeg linkage. 2013-05-06 22:28:13 -07:00
James Chen 47cff27ecd Merge pull request #2519 from dumganhar/iss2106-js-bytecode 
fixed #2106: Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option.
 2013-05-06 22:09:27 -07:00
James Chen 800952a17a fixed #2106: Fixing wrong display of non-ascii characters. The compiler needs to setUTF8 for compile option. 2013-05-07 13:07:40 +08:00
Adrien Béraud 16d2b5a957 Assert that the user does not divide by 0 in CCPoint and CCSize 2013-05-07 14:58:43 +10:00
James Gregory adbc3f7552 Add note about Emscripten support to README 2013-05-06 21:41:28 -07:00
Adrien Béraud ca4c2edc29 Clarify CCPoint::rotate & unrotate documentation 2013-05-07 14:36:17 +10:00
James Gregory 14deb7160e Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	AUTHORS
 2013-05-06 21:32:46 -07:00
James Gregory ce2d97c848 Simplify Emscripten makefile a little. 2013-05-06 21:30:03 -07:00
James Gregory 0a4c4b13ef Merge fix 2013-05-06 21:30:03 -07:00
James Gregory a285117aca Disable unsafe GL opts, enable -O2 2013-05-06 21:29:45 -07:00
James Gregory d68d0e6d78 Add myself to authors so folks know who to blame :) 2013-05-06 21:29:44 -07:00
James Gregory 66acd358fc Remove lua samples from emscripten makefile 2013-05-06 21:29:44 -07:00
James Gregory fc7a9da304 Move to a separate Makefile for Emscripten. 2013-05-06 21:29:44 -07:00
James Gregory 7b04e6b0e7 Implement primitive drawing methods for Emscripten 2013-05-06 21:29:44 -07:00
James Gregory 92e4c76f20 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 21:29:44 -07:00
James Gregory fa77e6ede2 Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:29:44 -07:00
James Gregory 29cfe512a3 Remove debug print statement 2013-05-06 21:29:44 -07:00
James Gregory 41b5cfebb6 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 21:29:43 -07:00
James Gregory 5be2da896a Add resources to TestCpp makefile 2013-05-06 21:29:43 -07:00
James Gregory 36fc2ecf99 Get CCGrid to work. 2013-05-06 21:29:43 -07:00
James Gregory f386272486 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 21:29:43 -07:00
James Gregory 568562fac9 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 21:29:43 -07:00
James Gregory b4e193fbbb Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 21:29:43 -07:00
James Gregory 4255066ad2 Add freetype 2.4.11 to repo 2013-05-06 21:29:42 -07:00
James Gregory c1ed7504fe Add myself to authors so folks know who to blame :) 2013-05-06 21:29:41 -07:00
James Gregory 9ae67ff78a 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 21:25:47 -07:00
James Gregory ff1e0aefa0 Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:25:47 -07:00
James Gregory 0c8f7dd608 Enable texture caching with emscripten. 2013-05-06 21:23:06 -07:00
James Gregory 235b80e7f8 Get CCGrid to work. 2013-05-06 21:22:34 -07:00
James Gregory 9370c11444 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 21:19:36 -07:00
James Gregory 91ba2fe325 Add freetype 2.4.11 to repo 2013-05-06 21:19:35 -07:00
James Chen 363550167a Update AUTHORS 2013-05-06 21:17:53 -07:00
James Gregory cd166c789f Add missing files to testcpp makefile 2013-05-06 21:17:22 -07:00
James Gregory 7a3875b99d Point Emscripten root to be the external referenced by the tree. 2013-05-06 21:17:22 -07:00
James Gregory 2b8efda0f4 Use floats instead of doubles for Chipmunk. 2013-05-06 21:17:22 -07:00
James Gregory de9df010c3 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 21:17:22 -07:00
James Gregory 9b68a65fee Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-06 21:17:22 -07:00
James Gregory a2a394ebf4 Add myself to authors so folks know who to blame :) 2013-05-06 21:17:22 -07:00
sunzhuoshi a1011cecbc Fixed issue when non-ascii string used in script 2013-05-07 12:15:22 +08:00
James Gregory 062a5eefd8 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 21:13:21 -07:00
James Gregory 6c828bbe4f Switch to using GL_DYNAMIC_DRAW. 2013-05-06 21:13:21 -07:00
James Gregory 809b77d632 Get CCGrid to work. 2013-05-06 21:08:28 -07:00
James Gregory 4581fa7309 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 21:06:07 -07:00