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
Darragh Coy
d0f8aaad9e
Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue
...
When calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' and 'CCFileUtils::createCCArrayWithContentsOfFile' on iOS/OSX these functions call upon 'CCFileUtils::fullPathForFilename' to resolve the path given into a full path which can be used with system file IO functions. This matches the convention found throughout the cocos2dx library and is expected behaviour. However, on Android and other platforms it appears calling 'CCFileUtils::createCCDictionaryWithContentsOfFile' or 'CCFileUtils:: createCCArrayWithContentsOfFile' does not do the same resolution using 'CCFileUtils::fullPathForFilename' - resulting in file paths which are correctly specified (and which worked on iOS/OSX) to fail to load on these platforms.
Fix this issue by performing a lookup/resolve of the file path using 'CCFileUtils::fullPathForFilename' before doing the low level loading work itself. This brings the behaviour of other platforms in line with iOS and OSX.
2013-03-29 22:51:25 -07:00
Andre Rudlaff
bcab80a0f1
Added TestCase for crash in CCScheduler
...
The code seems to look wrong (and it sure is) however in real-world
applications it might not be that eays to tell who has ownership of the object,
especially if weak references are involved.
2013-03-29 14:48:35 +01:00
sjchao
cd3a2be720
change comment type
2013-03-29 17:21:29 +08:00
sjchao
4690a45f3e
change a method name
...
change method name from isScissorEnable() to isScissorEnabled() in
class CCEGLViewProtocal
2013-03-29 17:19:47 +08:00
James Chen
8d5ff2b911
Update AUTHORS
2013-03-29 17:16:03 +08:00
James Chen
869f30ddfa
Merge pull request #2280 from CocosRobot/updategeneratedsubmodule_1364547743
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-29 02:14:02 -07:00
CocosRobot
9f50cb71e2
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-29 17:02:38 +08:00
James Chen
c50743b0ab
Merge pull request #2251 from tiantian20007/master
...
fixed #1937 : CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
2013-03-29 02:00:17 -07:00
Éloi Rivard
2664c5e4b9
Makefile
2013-03-29 09:41:15 +01:00
Éloi Rivard
64d9b73f39
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal
2013-03-29 09:40:41 +01:00
Éloi Rivard
2cc3674bb6
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal
2013-03-29 09:40:01 +01:00
Éloi Rivard
ddc9aa1cc6
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into openal
2013-03-29 09:38:25 +01:00
Éloi Rivard
2fca3b618f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal
2013-03-29 09:37:32 +01:00
Éloi Rivard
9e9f75cd34
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal
2013-03-29 09:33:22 +01:00
Éloi Rivard
b9ec3ead65
* Fixed CocosDenshionTestBug
2013-03-29 09:32:50 +01:00
tianTian
053efa0537
m_nDefaultTouchPriority is never used anymore; Instead, we setTouchPriority(1) directly for all CCControl by default.
2013-03-29 16:19:34 +08:00
sjchao
f1f31deb98
Fix the display bug when a scrollView nested in another scrollView
2013-03-29 16:05:28 +08:00
sjchao
18c43e29b2
change method name from getIsScissorEnable() to isScissorEnable()
2013-03-29 15:32:30 +08:00
James Chen
6db4358584
Merge pull request #2278 from CocosRobot/updategeneratedsubmodule_1364529763
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-28 21:05:13 -07:00
CocosRobot
7b37a9aaef
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-29 12:02:51 +08:00
James Chen
8380eec235
Update AUTHORS
2013-03-29 11:59:21 +08:00
James Chen
d052f6a752
Merge pull request #2275 from dumganhar/rohankuruvilla-ccbreader
...
fixed #1936 : Merging Pull Request #2273 : Adding OpenGL Bindings to Javascript.
2013-03-28 20:58:09 -07:00
James Chen
92d132ae19
Updating Android.mk to add OpenGL jsb support.
2013-03-29 11:43:25 +08:00
James Chen
fd1b056d6a
define JSB_INCLUDE_OPENGL in js_bindings_config.h
2013-03-29 11:41:32 +08:00