From 82af2051e09e3d1c507aada422e10610cd83200d Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 28 Sep 2011 14:55:42 +0800 Subject: [PATCH 1/2] add ciaranj into AUTHORS --- AUTHORS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AUTHORS b/AUTHORS index ceb2e02031..cb9ec21bd3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,6 +30,10 @@ Developers: Dumganhar author of Bada port + + ciaranj + add a build file that correctly generates LuaCocos2d.cpp + add a lua template Cocos2d-x can not grow so fast without the active community. Thanks to all developers who report & trace bugs, dicuss the engine usage in forum & QQ groups! From 3912be7f9da0406ec3a47b66c8a116a3a440401a Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 28 Sep 2011 15:27:31 +0800 Subject: [PATCH 2/2] not get value of ok button from xml file --- HelloLua/android/gen/org/cocos2dx/hellolua/R.java | 1 - HelloLua/android/res/values/strings.xml | 3 +-- HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java | 4 +--- HelloWorld/android/gen/org/cocos2dx/application/R.java | 1 - HelloWorld/android/res/values/strings.xml | 1 - .../android/src/org/cocos2dx/lib/Cocos2dxActivity.java | 4 +--- tests/test.android/gen/org/cocos2dx/tests/R.java | 1 - tests/test.android/res/values/strings.xml | 1 - .../test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java | 6 +----- 9 files changed, 4 insertions(+), 18 deletions(-) diff --git a/HelloLua/android/gen/org/cocos2dx/hellolua/R.java b/HelloLua/android/gen/org/cocos2dx/hellolua/R.java index d55df294bc..ba4eac96cd 100644 --- a/HelloLua/android/gen/org/cocos2dx/hellolua/R.java +++ b/HelloLua/android/gen/org/cocos2dx/hellolua/R.java @@ -22,6 +22,5 @@ public final class R { } public static final class string { public static final int app_name=0x7f040000; - public static final int button_ok=0x7f040001; } } diff --git a/HelloLua/android/res/values/strings.xml b/HelloLua/android/res/values/strings.xml index bb4254762c..8736404c10 100644 --- a/HelloLua/android/res/values/strings.xml +++ b/HelloLua/android/res/values/strings.xml @@ -1,5 +1,4 @@ - HelloLua - Ok + HelloLua diff --git a/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java b/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java index 03f7b66f38..03cc9bc737 100644 --- a/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -24,8 +24,6 @@ THE SOFTWARE. package org.cocos2dx.lib; -import org.cocos2dx.application.R; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -226,7 +224,7 @@ public class Cocos2dxActivity extends Activity{ Dialog dialog = new AlertDialog.Builder(this) .setTitle(title) .setMessage(message) - .setPositiveButton(R.string.button_ok, + .setPositiveButton("Ok", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton){ diff --git a/HelloWorld/android/gen/org/cocos2dx/application/R.java b/HelloWorld/android/gen/org/cocos2dx/application/R.java index 1788ae79a8..22cec251e5 100644 --- a/HelloWorld/android/gen/org/cocos2dx/application/R.java +++ b/HelloWorld/android/gen/org/cocos2dx/application/R.java @@ -23,6 +23,5 @@ public final class R { } public static final class string { public static final int app_name=0x7f040000; - public static final int button_ok=0x7f040001; } } diff --git a/HelloWorld/android/res/values/strings.xml b/HelloWorld/android/res/values/strings.xml index cdba6d35aa..5efa161ddd 100644 --- a/HelloWorld/android/res/values/strings.xml +++ b/HelloWorld/android/res/values/strings.xml @@ -1,5 +1,4 @@ helloworld - Ok diff --git a/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxActivity.java b/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxActivity.java index 03f7b66f38..619f34231d 100644 --- a/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -24,8 +24,6 @@ THE SOFTWARE. package org.cocos2dx.lib; -import org.cocos2dx.application.R; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -226,7 +224,7 @@ public class Cocos2dxActivity extends Activity{ Dialog dialog = new AlertDialog.Builder(this) .setTitle(title) .setMessage(message) - .setPositiveButton(R.string.button_ok, + .setPositiveButton("Ok", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton){ diff --git a/tests/test.android/gen/org/cocos2dx/tests/R.java b/tests/test.android/gen/org/cocos2dx/tests/R.java index 6c0ec2df44..3a5224563e 100644 --- a/tests/test.android/gen/org/cocos2dx/tests/R.java +++ b/tests/test.android/gen/org/cocos2dx/tests/R.java @@ -22,6 +22,5 @@ public final class R { } public static final class string { public static final int app_name=0x7f040000; - public static final int button_ok=0x7f040001; } } diff --git a/tests/test.android/res/values/strings.xml b/tests/test.android/res/values/strings.xml index 32c0a50f2c..0af28e2c81 100644 --- a/tests/test.android/res/values/strings.xml +++ b/tests/test.android/res/values/strings.xml @@ -1,5 +1,4 @@ tests - Ok diff --git a/tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java b/tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java index 5315d0a197..03cc9bc737 100644 --- a/tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java +++ b/tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java @@ -24,10 +24,6 @@ THE SOFTWARE. package org.cocos2dx.lib; - - -import org.cocos2dx.tests.R; - import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; @@ -228,7 +224,7 @@ public class Cocos2dxActivity extends Activity{ Dialog dialog = new AlertDialog.Builder(this) .setTitle(title) .setMessage(message) - .setPositiveButton(R.string.button_ok, + .setPositiveButton("Ok", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int whichButton){