James Chen
031e77ccbe
Updating SceneTest.lua.
2013-04-03 18:31:00 +08:00
James Chen
984f0b59eb
Merge pull request #2301 from dumganhar/iss1998-lua-SceneTest
...
fixed #1998 : Adding SceneTest and IntervalTest for TestLua.
2013-04-03 03:15:35 -07:00
James Chen
818a570b7f
fixed #1998 : Adding SceneTest.lua for TestLua.
2013-04-03 18:14:03 +08:00
James Chen
229d4329a5
fixed #1997 : Adding IntervalTest for TestLua.
2013-04-03 17:00:05 +08:00
James Chen
de863965cc
Merge pull request #2300 from dumganhar/iss1814-lua-menu-test
...
fixed #1814 : [LUA] Adding MenuTest for Testlua.
2013-04-03 01:32:36 -07:00
James Chen
2d9f8ca8de
fixed #1814 : MenuTest for Testlua is ok.
2013-04-03 16:29:16 +08:00
James Chen
5fec94e563
Merge pull request #2297 from dumganhar/iss1994-actionmanager-test
...
fixed #1994 : Adding actionManagerTest.lua.
2013-04-02 21:00:10 -07:00
James Chen
686775300d
fixed #1994 : ActionManagerTest.lua is ok.
2013-04-03 11:59:17 +08:00
James Chen
8d5ec65cc8
Update AUTHORS
2013-04-03 11:18:15 +08:00
James Chen
c173208b10
Merge pull request #2296 from rtissera/jni_fixes
...
fixed #1996 : JNI fixes, added missing JNIEXPORT / JNICALL declarations
2013-04-02 20:15:52 -07:00
James Chen
f1d48b41e2
issue #1944 : Fixing a typo.
2013-04-03 10:39:40 +08:00
James Chen
ad555e70fb
issue #1944 : Removing commented codes in cc.associateWithNative.
2013-04-03 10:39:15 +08:00
James Chen
6d6bc03465
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1944-remove-associate-nativeobj
2013-04-03 10:27:01 +08:00
James Chen
c54ee96705
issue #1994 : Adding actionManagerTest.lua.
2013-04-03 10:20:12 +08:00
Romain Tisserand
15d4e75cdb
JNI fixes, added missing JNIEXPORT / JNICALL declarations
...
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
2013-04-02 22:15:12 +02:00
Sergej Tatarincev
17caacbeb5
Resize CCEditBox subviews when contentSize changes
...
1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
2013-04-02 16:34:33 +03:00
Sergej Tatarincev
380ec78fcd
Allow to set EditBox font name and size separately
2013-04-02 16:31:30 +03:00
James Chen
654931d838
Merge pull request #2294 from dumganhar/iss1993-parallax-test
...
fixed #1993 : Adding ParallaxTest for TestLua.
2013-04-02 03:21:08 -07:00
James Chen
46b26cffd3
fixed #1993 : Adding ParallaxTest for TestLua.
2013-04-02 18:20:14 +08:00
James Chen
2de4dde0bd
Merge pull request #2293 from dumganhar/iss1942-layertest
...
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 02:54:21 -07:00
James Chen
a73395507c
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 17:52:08 +08:00
minggo
e30559b038
Update AUTHORS
2013-04-02 13:52:34 +08:00
minggo
e8ba299b80
Merge pull request #2289 from DenizPiri/master
...
print() function in LUA should write to android device log (adb logcat)
2013-04-01 22:42:17 -07:00
James Chen
27d84daab3
Merge pull request #2292 from CocosRobot/updategeneratedsubmodule_1364875303
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-01 21:04:12 -07:00
CocosRobot
1462c2a570
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-02 12:01:52 +08:00
James Chen
ec7a2f4c5c
fixed #1944 : The subclass of cc.Sprite,cc.Layer... doesn't need cc.associateWithNative anymore.
2013-04-02 11:35:55 +08:00
James Chen
930487f6f7
Updating layerTest.lua.
2013-04-02 11:28:31 +08:00
minggo
ee1365c13f
Update AUTHORS
2013-04-02 10:59:48 +08:00
minggo
3d0a5e52c6
Merge pull request #2267 from nickveri/master
...
Added some missing function for setting integer shader uniforms in CCGLProgram
2013-04-01 19:52:11 -07:00
yodesoft
fa9339916d
Improve font rendering performance
2013-04-02 10:16:51 +08:00
Deniz Piri
c73a6e3b14
LUA: print() function should use CCLOG internally.
...
CCLOG uses __android_log_print internally, this allows lua's print() function
to print to android log output and allows developer to see print output from
LUA using "adb logcat".
2013-04-01 19:16:43 +02:00
Michael Chinen
6f5173f448
android:Add emulator detection and config change to allow running OpenGL ES 2.0 projects in the emulator
...
Code taken from forum post by Romain TISSERAND
http://www.cocos2d-x.org/boards/6/topics/12563?r=25446#message-25446
2013-04-01 20:41:33 +09:00
James Chen
d0300d429c
issue #1942 : Adding LayerTest, first commit.
2013-04-01 18:05:35 +08:00
James Chen
90a0eccb09
Merge pull request #2286 from dumganhar/lua-test
...
fixed #1941 : Adding TileMapTest for TestLua.
2013-04-01 02:45:05 -07:00
James Chen
a7f1fba762
TileMapTest.lua is ok.
2013-04-01 17:39:27 +08:00
James Chen
57a76a3a86
Using universal config for TestLua.
2013-04-01 17:39:27 +08:00
James Chen
be4d15fbba
Updating LabelTest.lua
2013-04-01 17:39:26 +08:00
James Chen
9ea35977db
new tile map tests
2013-04-01 17:39:26 +08:00
James Chen
4a1eab5101
CCLOG -> cclog
2013-04-01 17:39:26 +08:00
James Chen
205123f661
Adding TileMapTest.lua
2013-04-01 17:39:26 +08:00
James Chen
5fd2acca47
Updating CCLabelBMFont.pkg, CCLabelTTF.pkg, and updating luabinding.
2013-04-01 17:39:26 +08:00
James Chen
d401fb3771
labeltest.lua finish.
2013-04-01 17:39:25 +08:00
James Chen
8854fc046f
BitmapFontMultiLineAlignment is ok.
2013-04-01 17:39:25 +08:00
James Chen
5a623b9b07
Some tests in LabelTest.lua are ok.
2013-04-01 17:39:25 +08:00
James Chen
a388f401bf
Updating LabelTest.lua.
2013-04-01 17:39:25 +08:00
James Chen
65720983d8
Update AUTHORS
2013-04-01 13:52:42 +08:00
James Chen
42aafa7519
Merge pull request #2285 from DarraghCoy/ccuserdefault_android_fix
...
Fix CCUserDefault.cpp compiling on Android.
2013-03-31 22:45:18 -07:00
Darragh Coy
7f565bb2fa
Fix CCUserDefault.cpp compiling on Android.
...
CCUserDefault.cpp shouldn't compile on Android.
2013-03-31 22:24:10 -07:00
waiter
c9e36438a8
Add ActionRemoveSelf in TestCpp/ActionTest
...
Add ActionRemoveSelf in TestCpp/ActionTest
2013-04-01 10:18:26 +08:00
Michael Chinen
227d2cf60b
Add emulator detection hack to allow running OpenGL ES 2.0 projects in the emulator
2013-03-31 20:47:43 +09:00