Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1718 from minggo/gles20 

do some modification
This commit is contained in:
minggo 2012-12-04 01:26:59 -08:00
parent df87c0717d cb2427e780
commit 4ad979eae7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/include/ccConfig.h
View File

@ -107,7 +107,7 @@ To enabled set it to 1. Disabled by default.
Default value: 0.1f Default value: 0.1f
*/ */
#ifndef CC_DIRECTOR_STATS_INTERVAL #ifndef CC_DIRECTOR_STATS_INTERVAL
#define CC_DIRECTOR_STATS_INTERVAL (0.1f) #define CC_DIRECTOR_STATS_INTERVAL (0.5f)
#endif #endif
/** @def CC_DIRECTOR_FPS_POSITION /** @def CC_DIRECTOR_FPS_POSITION

2
samples/CocosDragonJS/proj.ios/CocosDragonJS.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
84cd25be53945443ed529554d1a4035b6989d150 4377122f5035f20d5266fff054f52039c3eb59f4

8
samples/WatermelonWithMe/proj.ios/WatermelonWithMe.xcodeproj/project.pbxproj
View File

@ -603,6 +603,10 @@
15628F5B15F0F5C2000CF24B /* Resources */ = { 15628F5B15F0F5C2000CF24B /* Resources */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
159004D1166DE34B006BF838 /* Icon-144.png */,
159004CF166DE346006BF838 /* Icon-72.png */,
159004CD166DE33E006BF838 /* Icon-114.png */,
159004CB166DE338006BF838 /* Icon-57.png */,
159003FF166DAD84006BF838 /* res */, 159003FF166DAD84006BF838 /* res */,
1A995C5E166B3F52001C34E9 /* boot-jsb.js */, 1A995C5E166B3F52001C34E9 /* boot-jsb.js */,
1A995C5F166B3F52001C34E9 /* main.js */, 1A995C5F166B3F52001C34E9 /* main.js */,
@ -779,10 +783,6 @@
A92275321517C094001B78AA = { A92275321517C094001B78AA = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
159004D1166DE34B006BF838 /* Icon-144.png */,
159004CF166DE346006BF838 /* Icon-72.png */,
159004CD166DE33E006BF838 /* Icon-114.png */,
159004CB166DE338006BF838 /* Icon-57.png */,
15426AE915B5733200712A7F /* cocos2dx.xcodeproj */, 15426AE915B5733200712A7F /* cocos2dx.xcodeproj */,
15384E3C16119CC30021DC07 /* bindings */, 15384E3C16119CC30021DC07 /* bindings */,
2628297C15EC7196002C4240 /* chipmunk */, 2628297C15EC7196002C4240 /* chipmunk */,