Commit Graph

40 Commits

Author SHA1 Message Date
minggo d490bd983e Merge pull request #337 from natural-law/master
fixed #551
2011-06-29 20:08:51 -07:00
natural-law f7e31bac17 fixed #551, Add project dependence for project liblua. And set the WorkingDirectory of project HelloLua in VS2010. 2011-06-30 10:55:38 +08:00
minggo 6c47f53b13 [Android] fixed #547: line wrap OK on Android 2011-06-29 15:45:30 +08:00
minggo e8853583df Merge pull request #329 from minggo/master
Fix some bug
2011-06-27 18:23:26 -07:00
yangws c56dd6e747 delete a log output using printf in AppDelegate.cpp 2011-06-27 17:08:03 +08:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
minggo 5e15545dbd [Android] fix an error when string is 2011-06-27 16:01:25 +08:00
natural-law 739d6d30e5 Modify the vcproj files to build liblua & HelloLua projects with release configuration. 2011-06-27 14:11:29 +08:00
Walzer 688131c958 [android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests 2011-06-25 12:11:40 +08:00
Walzer 3db735de73 [android] load dynamic libaries in HelloLua.java 2011-06-25 11:58:13 +08:00
Walzer fbcb3806d9 [android] HelloLua use shared link with other libraries 2011-06-25 11:57:34 +08:00
Walzer e606027b59 fixed #528, Lua can get the CCTouch array in callback function; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now. 2011-06-24 21:03:33 +08:00
Walzer 49b98d2057 Merge remote branch 'origin/master' 2011-06-24 17:00:29 +08:00
Walzer a88aa00526 improve HelloLua, rename images, add error msg in LuaEngine, refactor hello.lua, add RootViewController. issue #540 #528 2011-06-24 17:00:14 +08:00
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
Walzer 9dd436a96e Merge pull request #317 from minggo/master
[Android] Exit program when key back is entered
2011-06-23 01:31:38 -07:00
minggo e13247afc9 [android] synchrolize java code to HelloLua 2011-06-23 16:10:59 +08:00
Walzer 481010a417 Merge pull request #316 from minggo/iss364
[Android] line break ok on Android
2011-06-23 01:04:22 -07:00
Walzer 14956c4f87 add icon for HelloLua on ios 2011-06-23 15:36:25 +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
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 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 f3375f0dbb issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object. 2011-06-21 17:02:08 +08:00
minggo 968779912a fixed #528: add copyright & modify pop menu position 2011-06-21 15:50:47 +08:00
minggo 80e618f6ed issue #528: fix some bug & complete hello.lua 2011-06-21 11:47:57 +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
minggo 25de09e34b lua support ok on win32 2011-06-15 15:50:16 +08:00
minggo 44f24eb3ef reconstruct lua project 2011-06-15 15:31:22 +08:00
minggo dd78419a83 HelloLua runs ok on iOS 2011-06-15 13:55:30 +08:00
minggo 73c33c28dd HelloLua runs ok on win32 2011-06-15 11:43:00 +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