Walzer
|
14956c4f87
|
add icon for HelloLua on ios
|
2011-06-23 15:36:25 +08:00 |
Walzer
|
1239af43ba
|
Merge commit '0530d21725b5b4d811fa45eed84d1d711530831f' from lua-branch
|
2011-06-23 15:18:04 +08:00 |
Walzer
|
0530d21725
|
Merge commit 'fad68460540a7f924bad3e0c46391377fc26ee63' into lua
|
2011-06-23 14:53:36 +08:00 |
Walzer
|
c5f230ccab
|
#issue 528, update HelloLua.xcodeproj for new folder name
|
2011-06-23 14:51:44 +08:00 |
minggo
|
626d3e0921
|
[android] fixed #364: synchrolize java code to HelloLua
|
2011-06-23 14:46:58 +08:00 |
Walzer
|
fad6846054
|
[win32] fix a bug in HelloLua.win32.vcproj.user to find Resource path
|
2011-06-23 14:46:16 +08:00 |
minggo
|
53eafa77ff
|
Merge https://github.com/cocos2d/cocos2d-x into iss364
|
2011-06-23 14:45:25 +08:00 |
minggo
|
10cdd7f798
|
[android] fixed #364: line break ok on Android
|
2011-06-23 14:44:20 +08:00 |
Walzer
|
d0ab7fcd3f
|
Merge pull request #315 from minggo/master
HelloLua works ok on android
|
2011-06-22 22:42:26 -07:00 |
minggo
|
d4bd6e63d2
|
synchrolize java code to HelloLua
|
2011-06-23 12:47:02 +08:00 |
Walzer
|
19c539247d
|
[android] issue #528, rename the folders in cocos2d-x/lua, for xcode4 template generator.
|
2011-06-23 12:01:02 +08:00 |
Walzer
|
3323b806d0
|
Merge remote branch 'origin/master'
|
2011-06-23 11:34:56 +08:00 |
Walzer
|
4781b09170
|
[android] make HelloLua/build_native.sh can be executed on mac osx, remove skia dependance.
|
2011-06-23 11:34:33 +08:00 |
Walzer
|
d4e9e5a9d9
|
Merge pull request #314 from yangws/master
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 20:10:09 -07:00 |
Walzer
|
094b2e7ac0
|
[ios] add script_support into xcode3 templates
|
2011-06-23 10:11:09 +08:00 |
Walzer
|
3498a91710
|
[ios] issue #528, add script_support into xcode4 template
|
2011-06-23 10:01:57 +08:00 |
Walzer
|
a98a3b9ca7
|
[airplay] add script_support
|
2011-06-23 09:31:18 +08:00 |
yangws
|
2c22cf0621
|
fixed #537 update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 17:55:03 +08:00 |
Walzer
|
45933b177f
|
Merge pull request #313 from minggo/iss535
[Android] Use Android widget Bitmap to drawing string
|
2011-06-22 02:17:07 -07:00 |
Walzer
|
67ac46647f
|
issue #531, Merge liswei/issue531 manually.
|
2011-06-22 17:13:01 +08:00 |
minggo
|
71c13b34bf
|
Merge https://github.com/cocos2d/cocos2d-x into iss535
|
2011-06-22 17:00:11 +08:00 |
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
Walzer
|
96996d4d52
|
Merge pull request #311 from yangws/master
Sync java code in Helloworld and tests and Add icon for Helloworld and tests on Android..
|
2011-06-22 01:11:49 -07:00 |
Walzer
|
1485a35338
|
update tests.xcodeproject to add lua support in cocos2dx lib. I finished it in xcode4 but don't know if this xcodeproject file will work on xcode4
|
2011-06-22 15:36:53 +08:00 |
Walzer
|
8bab593246
|
move extensions/NDControls to cocos2d-x-extensions repository
|
2011-06-22 14:54:45 +08:00 |
yangws
|
01f277674e
|
Add icon for Helloworld and tests on Android.
|
2011-06-22 13:59:31 +08:00 |
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 |