minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
0231f65716
Merge pull request #1208 from minggo/iss1382_ccb_reader
...
fixed #1382:safe retain mOwner to avoid crash caused by null pointer
2012-08-20 20:23:03 -07:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
minggo
0c5ba1989d
Merge pull request #1206 from aninggo/patch-1
...
Update cocos2dx/platform/mac/CCGL.h
2012-08-20 20:08:29 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08: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
ningxu
84a946f676
Update cocos2dx/platform/mac/CCGL.h
...
add VAO support
2012-08-20 23:07:43 +08: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
minggo
4db53b2f91
fixed #1382:safe return mOwner to avoid crash caused by null pointer
2012-08-20 15:54:53 +08: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
mustime
108c7608ec
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-20 09:33:30 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
minggo
c014496467
Merge pull request #1192 from John-cdy/gles20
...
issue #1404:Adjust the time of some testcases.
2012-08-17 06:14:21 -07:00
James Chen
a08fdd4ce1
Merge pull request #1194 from dumganhar/gles20
...
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 00:29:41 -07:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00