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

4802 Commits

Author SHA1 Message Date
Donald Alan Morrison e4f6e48bf5 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 12:01:26 -07:00
Donald Alan Morrison 3eb3ebc67a Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 11:20:23 -07:00
Donald Alan Morrison ee9f3d09a8 Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly 
converted to 64 bits.
 2012-08-24 09:22:02 -07:00
Donald Alan Morrison 2b4bab18af Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 09:00:57 -07:00
Donald Alan Morrison 9ef8b3b699 Fixed Warning C4114: same type qualifier used more than once. (Definition 
signature does not match Implementation signature.)
 2012-08-24 08:52:29 -07:00
Donald Alan Morrison eaf0e71e57 Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or 
'false' (performance warning).
 2012-08-24 08:35:48 -07:00
Donald Alan Morrison 5ba3ff4d9a Fixed VS2010 Warning C4065: switch statement contains 'default' but no 'case' labels. 2012-08-24 01:33:28 -07:00
Donald Alan Morrison 3c7846e32f Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch 2012-08-23 23:35:25 -07:00
Donald Alan Morrison 7ebcf82a2e Added *.opensdf to (dot)gitignore file for Visual Studio. 2012-08-23 22:57:07 -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 5612e35487 Added ipch/ to (dot)gitignore for Visual Studio generated pre-compiled headers. 2012-08-23 21:27:20 -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 e3094d80d0 Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method. 2012-08-23 13:41:54 -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 7d66f62881 Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy. 2012-08-20 18:09:51 -07:00
Donald Alan Morrison 61a5b2a742 Plugged a memory leak identified by LLVM Static Analyzer. 2012-08-20 16:48:07 -07:00
Donald Alan Morrison c482a246be Plugged potential memory leak found by LLVM Static Analyzer. 2012-08-20 16:40:26 -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
Donald Alan Morrison d6ec91807c For Release Builds: 
+                               GCC_PREPROCESSOR_DEFINITIONS = (
+                                       "NS_BLOCK_ASSERTIONS=1",
+                                       "NDEBUG=1",
+                               );
For All Builds:
+                               WARNING_CFLAGS = "-fdiagnostics-show-option";
 2012-08-20 16:11:11 -07:00
Donald Alan Morrison 75ae8d2201 Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 14:54:12 -07:00
Donald Alan Morrison c75f73aa41 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:33:34 -07:00
Donald Alan Morrison 70f383ec2f Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 14:30:37 -07:00
Donald Alan Morrison 4f80c54884 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:26:35 -07:00
Donald Alan Morrison 9a8d1ca8b8 Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.) 2012-08-20 14:18:12 -07:00
Donald Alan Morrison cbeb2bb1b9 Silenced warning of function override by category implementation, by surrounding with a clang pragma. 2012-08-20 14:08:49 -07:00
Donald Alan Morrison e6e0684ecb Added explicit cast to silence warning of implicit cast. 2012-08-20 14:01:48 -07:00
Donald Alan Morrison b4061c0d89 Changed tee files to (dot)tee files [hidden]. 2012-08-20 13:18:42 -07:00
Donald Alan Morrison 9771391eed It's nice to have a local version of the doxygen html directory! :^) 2012-08-20 13:14:57 -07:00
minggo e2140aea0b Merge pull request #1205 from minggo/gles20 
use CCSprite::createWithSpriteFrame() to create a sprite
 2012-08-20 02:29:34 -07:00
minggo c854562b03 use CCSprite::createWithSpriteFrame() to create a sprite 2012-08-20 17:28:17 +08:00
James Chen 631307373c Merge pull request #1204 from dumganhar/gles20 
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
 2012-08-20 02:10:00 -07:00
James Chen fd1343b951 Updated win32 template and fix a bug in win32/CCEGLView.cpp. 2012-08-20 17:08:29 +08:00
James Chen 0a2304d0c1 Merge pull request #1203 from dumganhar/gles20 
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
 2012-08-20 01:33:42 -07:00
James Chen 0861877594 kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle. 2012-08-20 16:32:22 +08:00
James Chen 7fb1a160e3 Merge pull request #1202 from dumganhar/gles20 
fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
 2012-08-20 01:01:37 -07:00
James Chen 7eb5d85298 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb 2012-08-20 15:49:24 +08:00
James Chen 6c9b4d3357 fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs. 2012-08-20 15:49:02 +08:00
minggo 0baf8743c2 Merge pull request #1201 from minggo/gles20 
change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project
 2012-08-20 00:44:00 -07:00
minggo a8f2c74b9e change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project 2012-08-20 15:42:56 +08:00
minggo 77c244c6bc Merge pull request #1200 from minggo/iss1433_remove_fps_png_in_template 
fixed #1433:remove fpsxxx.png in win32 template
 2012-08-20 00:16:49 -07:00
minggo 40ee7496cd fixed #1433:remove fpsxxx.png in win32 template 2012-08-20 15:15:21 +08:00
minggo fbe9aa29dc Merge pull request #1199 from minggo/iss1433_remove_fps_png_in_template 
issue #1433:remove fpsxxx.png in xcode template
 2012-08-19 23:33:06 -07:00
minggo c307e02c43 issue #1433:remove fpsxxx.png in xcode template 2012-08-20 14:31:30 +08:00
minggo a1b679ca60 Merge pull request #1198 from minggo/iss1377_tmx_tile_crack 
reset texture parameter of CCTMXLayer after coming to foreground on android
 2012-08-19 23:08:35 -07:00
minggo 738f150ecd fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android 2012-08-20 14:06:29 +08:00
minggo c8808b5be2 Merge pull request #1197 from mustime/bug1284 
issue #1284: fix a compile error for missing android.so
 2012-08-19 21:53:32 -07:00
mustime cd6241655b issue #1284: fix a compile error for missing android.so 2012-08-20 12:49:59 +08:00
James Chen b63d4d7702 Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb 2012-08-20 11:40:23 +08:00
James Chen b3cbb646c8 Merge pull request #1196 from dumganhar/gles20 
fixed #1432: MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
 2012-08-19 19:40:30 -07:00
James Chen 63888a7eb5 issue #1432: MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen. 2012-08-20 10:38:21 +08:00