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

20 Commits

Author SHA1 Message Date
Thomas Perl 4860e3551c Add new platform: CC_PLATFORM_QT5 2013-07-24 20:18:43 +02:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
Mat Hopwood 24115675b0 Marmalade Cocos2d-x Main Repo Changes 
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
 2012-10-19 16:38:58 +01:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
Donald Alan Morrison 3ee17b1a23 Merge with c9674e85e8. The diff revealed 
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
 2012-08-23 22:32:33 -07:00
Donald Alan Morrison 82bb62f8e3 MSVC++2010 doesn't accept C99-style named-initialization like clang. 2012-08-23 20:58:25 -07:00
Donald Alan Morrison 81d8dd0eb2 Silenced a false-positive warning from the LLVM Static Analyzer with initialization. 
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA.  Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
 2012-08-20 18:30:12 -07:00
Donald Alan Morrison abe45e53b5 Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 16:16:00 -07:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
James Chen c4056b1bb0 fixed #1269: Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen ad50d6ee57 fixed #1270: Fixed some warning on win32. 2012-05-29 17:11:33 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
minggo 04c0d794af fixed #1139: fix the bug that screen becomes black when backing to foreground on Android 2012-04-17 17:55:26 +08:00
James Chen 931c42a621 Updated some files. 2012-04-04 21:58:04 +08:00
James Chen c73c84f79b issue #1056: Fixed a bug in CCDirector::setProjection. 
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
 2012-03-28 17:02:07 +08:00
James Chen 2ac2da9c97 issue #1056: 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest. 
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
 2012-03-21 15:43:35 +08:00
minggo 74aaf4c6ca issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
James Chen bd59979495 add gles2.0 libraries for win32. 
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
 2012-03-12 15:22:03 +08:00