James Chen
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
22b2f722b5
fixed #1220 : Using CCString::stringWithContentsOfFile to get string from lua script files.
2012-05-04 14:31:56 +08:00
James Chen
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
Phenix Yu
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
Phenix Yu
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
minggo
6988964a6e
refactor lua support
2012-02-09 18:12:45 +08:00
YuLei Liao
e74b842a58
update HelloLua
2012-02-09 17:48:15 +08:00
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
minggo
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
Phenix Yu
786feb6a8d
Merge remote-tracking branch 'remotes/upstream/master'
...
Conflicts:
HelloLua/Classes/AppDelegate.cpp
HelloLua/Resource/hello.lua
HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
HelloLua/win32/HelloLua.win32.vcproj
HelloLua/win32/HelloLua.win32.vcxproj.filters
cocos2dx/include/ccMacros.h
cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
lua/cocos2dx_support/LuaCocos2d.cpp
lua/cocos2dx_support/LuaEngineImpl.cpp
template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
tests/test.win32/test.win32.vcxproj.filters
2011-11-15 14:43:55 +08:00
Phenix Yu
441f8e6da9
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
...
Conflicts:
cocos2dx/CCScheduler.cpp
lua/cocos2dx_support/LuaEngine.cpp
lua/cocos2dx_support/LuaEngine.h
2011-11-15 14:00:52 +08:00
minggo
edb86b1154
issue #707 : require works ok on iOS
2011-09-05 17:42:08 +08:00
Phenix Yu
ed42bc388c
fixed lua memory leak
2011-08-18 12:26:33 +08:00
minggo
ab781654d7
all tests works ok on vs2010 & fix a bug that HelloLua may crashed on win32 when it eixt
2011-08-17 18:24:36 +08: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
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
Walzer
f3375f0dbb
issue #528 , improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.
2011-06-21 17:02:08 +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
dd78419a83
HelloLua runs ok on iOS
2011-06-15 13:55:30 +08:00
minggo
b087984acc
add HelloLua
2011-06-15 11:11:13 +08:00