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

9175 Commits

Author SHA1 Message Date
minggo e7d9e09a44 Merge pull request #2586 from silverscania/master 
Bug in previous modifications made to GL_UNPACK_ALIGNMENT
 2013-05-20 18:59:03 -07:00
Lee, Jae-Hong 5faa5e92af Modify getWritablePath function. 2013-05-21 10:56:18 +09:00
Lee, Jae-Hong e1a947637f Use libcocos2d.a HelloCpp, TestCpp, and SimpleGame. 2013-05-21 10:43:24 +09:00
Lee, Jae-Hong f4340475a1 Insert spine directory. 2013-05-21 10:33:08 +09:00
Lee, Jae-Hong 6bb8d58d3a Update cocos2d project and use float.h 2013-05-21 10:32:34 +09:00
Lee, Jae-Hong 73590e57f6 Set relative include path. 2013-05-21 09:55:33 +09:00
folecr b727f36995 Update to latest bindings-generator with updated documentation for using the debugger. 2013-05-20 15:24:55 -07:00
folecr 554213d0eb Match CocosPlayer's JSB_DEBUGGER_PORT 2013-05-20 14:30:41 -07:00
folecr cf328b5592 Set socket option SO_NOSIGPIPE for IOS 2013-05-20 14:30:41 -07:00
folecr 95487da933 clearBuffers() and JSBDebug_BufferWrite() will both immediately write data in the output buffer to the socket. 
* Note : comments in the code say that locking is not an issue. This should be reviewed.
 2013-05-20 14:30:41 -07:00
folecr 923d12fa48 Clean up debugger server 
* Remove perpetual innner while loop
    * Macro to TRACE_DEBUGGER_SERVER
 2013-05-20 14:30:40 -07:00
folecr e0708f496a New debugger interface 2013-05-20 14:30:40 -07:00
folecr ebf235642d Call enableDebugger 2013-05-20 14:30:40 -07:00
Nicolas Gramlich cef2575180 Updated .classpath of Android project to latest ADT 22 build tool compatibility. 
Changes correspond to: https://groups.google.com/forum/?fromgroups#!msg/adt-dev/epOfZbKPFdk/RbR2VYNQ5_8J
 2013-05-20 14:39:25 -06:00
James Chen 63e4d9720e Update .travis.yml 2013-05-20 23:38:42 +08:00
James Chen 505e4bc8dd Updating .travis.yml, adding GEN_JSB env. 2013-05-20 23:29:14 +08:00
James Chen e57fdf87f0 Update generate-jsbindings.sh [ci skip] 2013-05-20 23:27:40 +08:00
James Chen 4d785fb28a Updating secure info in .travis.yml. 2013-05-20 22:55:46 +08:00
James Chen 07c62519c2 Update AUTHORS [ci skip] 2013-05-20 21:21:17 +08:00
James Chen d7dab9a1d3 Merge pull request #2589 from dumganhar/issue2092-XMLHttpRequest 
Merge PR #2561: Adding XMLHttpRequest for JSB.
 2013-05-20 06:19:21 -07:00
James Chen db4ee295ee fixed #2092: Adding macro to make sure header file to be included only once. 2013-05-20 21:13:55 +08:00
James Chen 8bdcda7ef2 issue #2092: Bug fix in MinXMLHTTPRequest::send 2013-05-20 21:13:11 +08:00
James Chen d402b349e2 issue #2092: Updating win32 project configuration. 2013-05-20 21:12:25 +08:00
James Chen 2306c515ae Merge branch 'issue2092-XMLHttpRequest' of https://github.com/dumganhar/cocos2d-x into issue2092-XMLHttpRequest 2013-05-20 21:08:33 +08:00
James Chen f6297aeb33 Updating iOS template. 2013-05-20 21:06:37 +08:00
James Chen 9e9b9ca831 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue2092-XMLHttpRequest 2013-05-20 20:55:29 +08:00
Shuja Shabandri be88ba45cd PivotJoint will now take 3 or 4 arguments like in html5 2013-05-20 14:54:34 +04:00
James Chen ad340f0a32 fixed #2092: Make some function static. 2013-05-20 18:11:55 +08:00
James Chen 0e0744faed fixed #2092: Updating iOS project configuration. 2013-05-20 17:48:52 +08:00
James Chen af655ce965 fixed #2092: #define httpresponse_selector(_SELECTOR) (SEL_HttpResponse)(&_SELECTOR) --> #define httpresponse_selector(_SELECTOR) (cocos2d::extension::SEL_HttpResponse)(&_SELECTOR). 2013-05-20 17:48:21 +08:00
James Chen 5254d3a702 fixed #2092: GC issues fix in XMLHttpRequest. 2013-05-20 17:47:47 +08:00
James Chen c305581bcf Updating the submodule of JS-Test. 2013-05-20 17:46:59 +08:00
James Chen 55be2f004c issue #2092: Removing unused code in XMLHttpHelper.h 2013-05-20 17:46:32 +08:00
minggo ad45c24c9a Merge pull request #2574 from minggo/AssetsManager-asynchronization 
Fix compiling error of AssetsManager project on windows
 2013-05-20 01:36:35 -07:00
James Chen 9d385dbd71 Merge branch 'XMLHttpRequest_cchttpclient' of https://github.com/zynga/cocos2d-x into zynga-XMLHttpRequest_cchttpclient 2013-05-20 14:02:55 +08:00
James Chen 3b77ffe478 Merge pull request #2578 from ricardoquesada/grid_projection_fix 
Grid setProjection2D fix
 2013-05-19 22:42:51 -07:00
James Chen d7b97bea25 Update AUTHORS [ci skip] 2013-05-20 12:59:41 +09:00
James Chen e1a71fb8e1 Merge pull request #2584 from smshuja/master 
fixed #2179: pointQueryFirst returns invalid Shape when a shape is not found.
 2013-05-19 20:57:00 -07:00
silverscania 1d23f1a2b4 The real cause of the problem for the texture corruption was when using textures with no alpha. 
The function bitsPerPixelForFormat returns the wrong number for RGB_888.
 2013-05-19 18:53:59 +03:00
Shuja Shabandri 32498521b4 pointQuery first returns invalid instance of Shape 
Signed-off-by: Shuja Shabandri <shuja@shabandri.com>
 2013-05-19 18:39:54 +04:00
silverscania 5adb4bc895 For some non power of two textures, even if the row alignment was 8, 4 or 2, setting this resulted in corruption. 
See ddafa42850 (commitcomment-3243089) for texture example.
Fix by setting alignment to 1 for ALL non-PO2 textures.
 2013-05-19 15:17:48 +03:00
silverscania 1973a52fbe Revert "Try to fix bugs that came up but just keeping the old parameters for row alignment: 4 or 1" 
This was not the correct fix.
This reverts commit 110ea5a501.
 2013-05-19 15:12:39 +03:00
silverscania 110ea5a501 Try to fix bugs that came up but just keeping the old parameters for row alignment: 4 or 1 2013-05-19 13:55:20 +03:00
James Chen c84baf9e79 Merge pull request #2582 from dumganhar/ios_template_fix 
[iOS] Template fix.
 2013-05-19 03:17:29 -07:00
James Chen 78000c70fc [iOS] Template fix. 2013-05-19 18:12:14 +08:00
James Gregory 391fb636fa Add a flag to indicate whether raw image data is pre-multiplied or not, and switch to using Emscripten's SDL implementation when loading images from file (much faster) 2013-05-17 17:11:52 -07:00
James Gregory 7cca63130c Pre-multiply text when rendered by Emscripten's SDL implementation (since HTML5 canvas is non-pre-multiplied). 2013-05-17 17:10:51 -07:00
James Gregory ae5454cffc Remove SDL code from texture cache, and move all image loading code to CCImage. 2013-05-17 17:09:28 -07:00
James Gregory 2bcbf5c2b8 Coordinates are already in terms of pixels -- no need to do content scaling 2013-05-17 17:08:46 -07:00
Ricardo Quesada ba12022134 Grid setProjection2D fix 
It doesn't multiply it by the CC_CONTENT_SCALE_FACTOR().
Not needed since it is CCDirector::getWinSizeInPixels() already has it
calculated
 2013-05-17 15:30:19 -07:00