yangws
|
4d8596169e
|
Sync java code in Helloworld and tests.
|
2011-06-22 11:37:42 +08:00 |
minggo
|
ce1e7fa0e4
|
Merge pull request #310 from minggo/master
Make HelloWorld work ok
|
2011-06-21 19:21:57 -07:00 |
minggo
|
4f7db6b134
|
fixed #528: modify HelloWorld to works ok
|
2011-06-22 10:18:51 +08:00 |
minggo
|
fd86f1ef8c
|
Merge pull request #309 from minggo/master
fix a compile bug
|
2011-06-21 02:39:45 -07:00 |
minggo
|
53a5ec412e
|
fixed #528: fix a compile bug
|
2011-06-21 17:36:38 +08:00 |
minggo
|
6cb6359168
|
Merge pull request #308 from minggo/master
fixed #528
|
2011-06-21 02:06:11 -07:00 |
Walzer
|
f3375f0dbb
|
issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.
|
2011-06-21 17:02:08 +08:00 |
minggo
|
00cc1d277d
|
fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()
|
2011-06-21 16:59:17 +08:00 |
Walzer
|
ec2553d589
|
Merge commit 'cbab879c553e10682cc6d07d8af50bcf75d977f9' from Ming
|
2011-06-21 16:12:55 +08:00 |
Walzer
|
cbab879c55
|
add license of lua & lua++
|
2011-06-21 16:12:07 +08:00 |
Walzer
|
ddbdf67f97
|
Merge http://github.com/minggo/cocos2d-x into lua
|
2011-06-21 16:03:34 +08:00 |
minggo
|
968779912a
|
fixed #528: add copyright & modify pop menu position
|
2011-06-21 15:50:47 +08:00 |
Walzer
|
175e9394bc
|
Merge https://github.com/minggo/cocos2d-x into lua
|
2011-06-21 15:22:00 +08:00 |
Walzer
|
f80948d2eb
|
Merge pull request #303 from natural-law/master
fixed #323
|
2011-06-20 23:03:08 -07:00 |
Walzer
|
39f68dc303
|
Merge pull request #306 from moadib/prefix_increment
changed postfix increment of iterators to prefix increment
|
2011-06-20 23:00:49 -07:00 |
minggo
|
d72d8a52f4
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-21 13:53:04 +08:00 |
minggo
|
8066312098
|
fixed #528: refactor lua ok
|
2011-06-21 13:51:36 +08:00 |
Marat Yakupov
|
14c43f4246
|
changed postfix increment of iterators to prefix increment
|
2011-06-21 09:30:03 +04:00 |
natural-law
|
49a4481473
|
fixed #323, Remove the #include <map> in CCApplication_win32.cpp.
|
2011-06-21 12:01:59 +08:00 |
natural-law
|
ba4c3b8928
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-21 11:58:52 +08:00 |
natural-law
|
960ef65f53
|
fixed #323, Modify the implement of getCurrentLanguage method on win32.
|
2011-06-21 11:58:10 +08:00 |
minggo
|
80e618f6ed
|
issue #528: fix some bug & complete hello.lua
|
2011-06-21 11:47:57 +08:00 |
Walzer
|
3559258d94
|
Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 20:38:05 -07:00 |
Walzer
|
4d161e7948
|
fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer
|
2011-06-21 10:53:20 +08:00 |
minggo
|
826a7822ed
|
issue #528: refactor lua ok on iOS
|
2011-06-21 10:33:42 +08:00 |
minggo
|
2f97a43439
|
issue #528: refactor lua ok on Android
|
2011-06-21 10:18:43 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
Marat Yakupov
|
0b3586126b
|
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 10:40:27 +04:00 |
natural-law
|
fae0498b3c
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-17 10:49:25 +08:00 |
natural-law
|
cfee246959
|
fixed #323, Add an interface to get the current language.
|
2011-06-17 10:49:02 +08:00 |
Walzer
|
53cfa0c719
|
Merge pull request #302 from moadib/mutable_dictionary_pass_by_ref
Parameters In CCMutableDictionary methods should be passed by const reference instead copy
|
2011-06-15 23:52:22 -07:00 |
Marat Yakupov
|
7be492d1b5
|
Parameters should be passed by const reference instead copy
|
2011-06-16 09:27:51 +04:00 |
Walzer
|
bafe9147b6
|
Merge pull request #301 from yangws/master
Fix a bug in CCImage_win32.cpp
|
2011-06-15 20:10:45 -07:00 |
yangws
|
19eaefab72
|
CCImage_win32 hasn't release font resource in Destructor.
|
2011-06-16 10:55:57 +08:00 |
minggo
|
33008fc8de
|
Merge pull request #300 from minggo/lua
Lua support
|
2011-06-15 02:24:17 -07:00 |
minggo
|
1584a96214
|
[win32] modify CocosDenshion project file to show correct in vs2008
|
2011-06-15 16:22:22 +08:00 |
minggo
|
0c303fac09
|
Merge pull request #297 from liswei/issue502
Issue502
|
2011-06-15 01:16:04 -07:00 |
minggo
|
e352d83f37
|
add default.png for iOS
|
2011-06-15 15:52:48 +08:00 |
minggo
|
25de09e34b
|
lua support ok on win32
|
2011-06-15 15:50:16 +08:00 |
minggo
|
738f0b3426
|
Merge https://github.com/cocos2d/cocos2d-x into lua
|
2011-06-15 15:32:09 +08:00 |
minggo
|
44f24eb3ef
|
reconstruct lua project
|
2011-06-15 15:31:22 +08:00 |
minggo
|
732f64901c
|
HelloWorld remove lua support on Android
|
2011-06-15 14:31:51 +08:00 |
minggo
|
f7f6371666
|
HelloWorld remove lua support on iOS
|
2011-06-15 14:28:57 +08:00 |
minggo
|
92b22c7ad0
|
HelloWorld remove support on win32
|
2011-06-15 14:04:26 +08:00 |
minggo
|
dd78419a83
|
HelloLua runs ok on iOS
|
2011-06-15 13:55:30 +08:00 |
liswei
|
3e54282e04
|
fixed #502 modify CCConfiguration to singleton mode
|
2011-06-15 11:48:00 +08:00 |
minggo
|
73c33c28dd
|
HelloLua runs ok on win32
|
2011-06-15 11:43:00 +08:00 |
minggo
|
a4d9d1d4d0
|
add menu2.png
|
2011-06-15 11:13:17 +08:00 |
minggo
|
c5e974cc4c
|
delete menu2.PNG, the name is error
|
2011-06-15 11:12:38 +08:00 |
minggo
|
b087984acc
|
add HelloLua
|
2011-06-15 11:11:13 +08:00 |