minggo
|
de372042ba
|
Merge branch 'gles20' of https://github.com/donaldalanmorrison/cocos2d-x into gles20
|
2012-08-24 09:46:33 +08:00 |
minggo
|
56ce6869d6
|
Merge pull request #1227 from donaldalanmorrison/gles20
Gles20
|
2012-08-23 18:32:39 -07:00 |
Squallium
|
bd09615a26
|
Wrong access to CCApplication::sharedApplication() pointer
|
2012-08-23 22:53:16 +02:00 |
Donald Alan Morrison
|
e3094d80d0
|
Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method.
|
2012-08-23 13:41:54 -07:00 |
James Chen
|
26a31b21b3
|
issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class.
|
2012-08-24 00:24:04 +08:00 |
James Chen
|
ee3e68014b
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
|
2012-08-24 00:16:11 +08:00 |
James Chen
|
1685e5c497
|
issue #1429: Used java code to implement keyboard layout.
|
2012-08-24 00:15:15 +08:00 |
James Chen
|
7f2c9f6fb4
|
issue #1429: Removed some used codes.
|
2012-08-23 23:09:12 +08:00 |
minggo
|
5fb9563c63
|
Merge pull request #1222 from minggo/gles20
fix some bug of xcode template & remove unneeded files
|
2012-08-23 03:37:00 -07:00 |
minggo
|
3d3e5b3a93
|
fix some bug of xcode template & remove unneeded files
|
2012-08-23 18:36:08 +08:00 |
minggo
|
83606d7691
|
Merge pull request #1212 from mustime/testlua
Testlua
|
2012-08-23 03:08:25 -07:00 |
minggo
|
7bf0f09b95
|
Merge pull request #1221 from minggo/gles20
fix some bugs while testing
|
2012-08-23 03:05:05 -07:00 |
minggo
|
1a814ec492
|
Merge pull request #1220 from John-cdy/gles20
issue #1404: Add android automated testing scripts for Mac OS and fixed ...
|
2012-08-23 03:03:26 -07:00 |
minggo
|
37cb691600
|
fix some bugs while testing
|
2012-08-23 18:01:28 +08:00 |
Caidongyang
|
b5483bf6f7
|
issue #1404: Add android automated testing scripts for Mac OS and fixed some errors in previous scripts.
|
2012-08-23 17:21:11 +08:00 |
mustime
|
b815504d69
|
issue #1425: change the design of CCCallFunc::create(int nHandler)
|
2012-08-23 16:27:22 +08:00 |
mustime
|
96e621bae8
|
issue #1425: recreate LuaCocos2d.cpp for .pkg files' changes
|
2012-08-23 16:13:08 +08:00 |
mustime
|
36a99a099e
|
issue #1425: add TestLua project
|
2012-08-23 16:10:50 +08:00 |
James Chen
|
06038163ca
|
iss1429: Finished using Dialog to implement CCEditBox for android port.
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
|
2012-08-23 15:34:57 +08:00 |
minggo
|
23bd0268cf
|
Merge pull request #1217 from zeaster/gles20
fixed #1298: double firing CCCallFunc action in CCSequence
|
2012-08-23 00:34:06 -07:00 |
minggo
|
7a6f5cd872
|
Merge pull request #1219 from minggo/iss1441_testcpp_resources
fixed #1441: put hd and ipad resources into separate directory
|
2012-08-22 23:28:42 -07:00 |
minggo
|
0c5cec0056
|
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
|
2012-08-23 14:26:39 +08:00 |
minggo
|
d83cdbda09
|
fixed #1441: put hd and ipad resources into separate directory
|
2012-08-23 14:20:32 +08:00 |
mustime
|
be3a02c7f3
|
issue #1425: fixed the problem when using ccBezierConfig to create
CCBezierAction
|
2012-08-23 13:54:23 +08:00 |
mustime
|
ceb5e41ab0
|
issue #1425: fixed the problem when using ccBezierConfig to create
CCBezierAction
|
2012-08-23 13:52:12 +08:00 |
James Chen
|
a437099779
|
issue #1429: Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
|
2012-08-23 09:42:28 +08:00 |
yichao.zhang
|
988a8d8a60
|
fixed #1298: do not update last action when it is done in IntervalAction
|
2012-08-22 19:48:32 +08:00 |
James Chen
|
9553031196
|
fixed #1112: Lua support for blackberry port.
|
2012-08-22 18:48:57 +08:00 |
James Chen
|
dbd02b2726
|
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua
|
2012-08-22 18:28:11 +08:00 |
minggo
|
99b81e3e38
|
Merge pull request #1216 from minggo/iss1439_synchronize
fixed #1439:synchronize to cocos2d-iphone v2.0.0
|
2012-08-22 00:52:54 -07:00 |
minggo
|
3b442dfc0f
|
fixed #1439:synchronize to cocos2d-iphone v2.0.0
|
2012-08-22 15:51:25 +08:00 |
minggo
|
c7d20e2fef
|
Merge pull request #1214 from John-cdy/gles20
issue #1404: Add android test python script files and modify android com...
|
2012-08-22 00:26:41 -07:00 |
minggo
|
3b1bfa5852
|
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
fixed #1440:convert offert point to pixel
|
2012-08-21 23:30:37 -07:00 |
minggo
|
2a9d29ba21
|
fixed #1440:convert offert point to pixel
|
2012-08-22 14:29:23 +08:00 |
mustime
|
1ffdbc1639
|
issue #1425: add standard comment on CCCallFunc::create(int nHandler) and
CCCallFuncN::create(int nHandler)
|
2012-08-22 14:21:48 +08:00 |
mustime
|
354f7a51b2
|
issue #1425: recreate luacocos2d.cpp to meet pkg files
|
2012-08-22 12:02:56 +08:00 |
Caidongyang
|
6ed075f09a
|
issue #1404: Add android test python script files and modify android compile script files.
|
2012-08-22 11:08:18 +08:00 |
James Chen
|
bcbd161398
|
issue #1429: First commit CCEditBox for android port.
|
2012-08-22 09:47:04 +08:00 |
mustime
|
d01842a37b
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-08-22 09:39:21 +08:00 |
Dale Ducharme
|
d76d9a6451
|
Adding lua scripting to BlackBerry port.
|
2012-08-21 13:32:28 -04:00 |
mustime
|
57659d1584
|
issue #1425: modifing pkg files for Lua
|
2012-08-21 18:42:35 +08:00 |
minggo
|
ce274cfb4f
|
Merge pull request #1209 from minggo/iss1437_return_pointer
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
|
2012-08-21 02:47:47 -07:00 |
minggo
|
7cc5d084ce
|
Merge pull request #1 from dumganhar/iss1437_return_pointer
issue #1437: fixed some compile errors.
|
2012-08-21 02:47:02 -07:00 |
James Chen
|
4c2702fcef
|
issue #1437: fixed some compile errors for blackberry port.
|
2012-08-21 17:42:56 +08:00 |
James Chen
|
55ea089fc2
|
Merge branch 'iss1437_return_pointer' of https://github.com/dumganhar/cocos2d-x into gles20
|
2012-08-21 17:25:32 +08:00 |
James Chen
|
fac3e9c8de
|
issue #1437: fixed some compile errors.
|
2012-08-21 17:25:03 +08:00 |
James Chen
|
314a9225a3
|
Merge branch 'iss1437_return_pointer' of https://github.com/dumganhar/cocos2d-x into gles20
|
2012-08-21 17:24:40 +08:00 |
James Chen
|
74cb2f459d
|
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into gles20
|
2012-08-21 17:22:37 +08:00 |
minggo
|
bc07682875
|
Merge pull request #1211 from minggo/gles20
change version
|
2012-08-21 02:03:53 -07:00 |
minggo
|
e939285c93
|
change version
|
2012-08-21 17:03:01 +08:00 |