samuele3hu
34b4cb48ab
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
2013-06-08 11:25:51 +08:00
samuele3hu
4be415cc04
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
2013-06-08 11:23:21 +08:00
James Chen
5c8d4378a6
Fixing compilation errors in TestLua for Win32.
2013-06-07 21:23:15 +08:00
James Chen
43e8573d8b
Merge pull request #2807 from dumganhar/master
...
[BB] Updating project configuration.
2013-06-07 03:49:10 -07:00
James Chen
7c650d7f28
[BB] Updating project configuration.
2013-06-07 18:45:58 +08:00
James Chen
3fc675a6df
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
2013-06-07 18:38:00 +08:00
James Chen
fc2c068a66
[BB] Updating project configuration.
2013-06-07 18:17:07 +08:00
James Chen
e3e90db71c
[BB] Adding extra lua script resource folder for TestLua.
2013-06-07 18:16:10 +08:00
samuele3hu
dda3c34be8
issue #2103 add webSocket lua test sample
2013-06-07 17:48:07 +08:00
James Chen
9298492384
Updating project configuration for Blackberry port.
2013-06-07 16:52:49 +08:00
samuele3hu
16a34b0da3
issue #2103 add webSocket lua test sample
2013-06-07 16:51:50 +08:00
samuele3hu
a2cf4933c4
issue #2103 add webSocket lua test sample
2013-06-07 14:57:36 +08:00
samuele3hu
cdbf8b7250
issue #2103 add webSocket lua test sample
2013-06-07 13:55:36 +08:00
samuele3hu
c021f700d3
issue #2103 add webSocket lua test sample
2013-06-07 12:54:39 +08:00
samuele3hu
5986d3904d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
2013-06-07 10:14:12 +08:00
samuele3hu
66d4acc31a
issue #2103 add webSocket lua test sample
2013-06-07 10:12:01 +08:00
minggo
4fa069df58
issue #2103:copy CCBReaderLoad.lua to TestLua Resources
2013-06-06 23:04:26 +08:00
samuele3hu
e4ec801363
issue #2103 add webSocket lua test sample
2013-06-06 22:29:02 +08:00
James Chen
ed4b9b2bb3
Marmalade projects fix.
2013-06-06 14:26:35 +08:00
minggo
cdf09c04ea
issue #2103:make HelloLua & TestLua work on vs2010
2013-06-05 17:43:49 +08:00
samuele3hu
6dd077b8bd
issue #2103 add cocosbuilder lua test sample
2013-06-05 15:17:00 +08:00
samuele3hu
37b508ad6d
issue #2103 modify some compile setup
2013-06-03 18:25:37 +08:00
samuele3hu
23eec2f1ce
issue #2103 modify some compile setup
2013-06-03 18:14:06 +08:00
samuele3hu
9352b60653
issue #2103 modify some compile setup and del some resource file
2013-06-03 17:40:31 +08:00
samuele3hu
bf1cd2e909
issue #2103 modify some compile setup
2013-06-03 16:56:45 +08:00
samuele3hu
db7a2a1290
issue #2103 modify some compile setup and delete some deprecated lua function
2013-06-03 16:07:06 +08:00
samuele3hu
7101bc4377
issue #2103 remove simple cocosbuilder sample
2013-06-03 14:59:04 +08:00
samuele3hu
afa6b81ba7
issue #2103 add cocosbuilder lua bind and add a simple sample
2013-06-03 13:47:12 +08:00
minggo
4f484cbcbf
enable c++11 for android projects
2013-06-03 11:02:41 +08:00
minggo
2cdb48bc22
enable c++11 for iOS projects
2013-06-03 10:57:06 +08:00
Jaroslaw Lewandowski
3f7c506638
Ability to save/retrieve CCData into/from CCUserDefault
2013-05-29 01:06:41 +01:00
samuele3hu
8b5450ef4a
issue #2103 modify some build script
2013-05-24 13:55:05 +08:00
samuele3hu
0a1c12a2d3
issue #2103 add some overlapping file and delete some comment line
2013-05-24 13:45:06 +08:00
samuele3hu
338c7c8d67
issue #2103 add more test lua
2013-05-24 11:42:27 +08:00
samuele3
5da5407efe
issue #2103 add menu test lua sample
2013-05-23 15:39:41 +08:00
Lee, Jae-Hong
6acd8c66c2
Adding lua libaray and sample projects for Tizen.
2013-05-22 21:45:53 +09:00
minggo
f34c977520
Merge pull request #2552 from samuele3hu/FirstBranch
...
First branch
2013-05-12 19:15:49 -07:00
samuele3
8015520834
issue #2103 Add more lua test case(Replace encoding error)
2013-05-13 10:07:22 +08:00
samuele3
3c9b98cb30
issue #2103 Add more lua test case(Add PerformanceSpriteTest of PerformanceTest)
2013-05-11 17:00:19 +08:00
samuele3
c47b104eca
issue #2103 Add more lua test case(Add PerformanceParticleTest of PerformanceTest)
2013-05-10 14:59:21 +08:00
samuele3
4e73425622
issue #2103 Add more lua test case(Add ToucheTest of PerformanceTest)
2013-05-09 16:59:39 +08:00
samuele3
e264582254
issue #2103 Add more lua test case(Add TextureTest of PerformanceTest)
2013-05-09 14:46:48 +08:00
samuele3
c39d6e2977
issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)
2013-05-09 11:31:40 +08:00
samuele3
c76a373c60
issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest)
2013-05-09 09:57:05 +08:00
minggo
b18ddf8b5a
Merge pull request #2524 from samuele3hu/FirstBranch
...
issue #2103 : Add more lua test case
2013-05-07 19:01:37 -07:00
samuele3
305c7d9deb
Add a newline
2013-05-07 16:14:23 +08:00
James Gregory
5a23190672
Add main.cpp files for app samples
2013-05-06 20:58:43 -07:00
James Gregory
c45e5797cf
Add Makefiles for Emscripten + Emscripten external
2013-05-06 20:58:02 -07:00
samuele3
20e802f1bc
issue #2103 : Add more lua test case
2013-05-06 16:05:20 +08:00
minggo
55e4de40f6
make AssetsManagerTest and TestLua run on iOS device
2013-04-28 11:19:03 +08:00
James Chen
0d18032f38
[Blackberry] Adding the resources of TestCpp for TestLua.
2013-04-27 14:41:30 +08:00
James Chen
6f5970491e
[Blackberry] Adding resources for TestLua.
2013-04-27 14:17:14 +08:00
James Chen
edc8444ca4
Updating blackberry project configurations.
2013-04-27 14:07:54 +08:00
minggo
ff207b68e0
disable menutest in lua
2013-04-27 11:17:10 +08:00
minggo
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
minggo
62231912be
Merge https://github.com/cocos2d/cocos2d-x
2013-04-26 10:36:46 +08:00
James Chen
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
minggo
9881012459
Merge https://github.com/cocos2d/cocos2d-x
2013-04-25 12:01:59 +08:00
James Chen
631b08e984
Updating project configuration for iOS.
2013-04-25 11:30:35 +08:00
minggo
fb7851b429
define checkAnim() before using it
2013-04-24 17:06:59 +08:00
James Chen
a005852fa5
issue #1847 : Using luajit for win32.
2013-04-17 10:46:38 +08:00
James Chen
928b6ad361
issue #1847 : Fix a typo in Ball.lua and Paddle.lua.
2013-04-17 09:52:26 +08:00
James Chen
6a56bb6d73
issue #1847 : [iOS] Using LuaJit for HelloLua and TestLua.
2013-04-17 09:51:28 +08:00
James Chen
79d58bcdb9
issue #1847 : Adding sources of Luajit2.0.1-hotfix, and adding android support.
2013-04-16 17:34:58 +08:00
James Chen
1a44f776f8
fixed #2005 : Adding CurrentLanguageTest for Testlua.
2013-04-07 16:34:07 +08:00
James Chen
268bd4dfad
fixed #2004 : Adding UserDefaultTest for TestLua.
2013-04-07 16:20:43 +08:00
James Chen
1913b2b3a5
[TestLua] The menu item of Tests which is not supported will be disabled.
2013-04-07 16:06:53 +08:00
James Chen
fce5deb0ec
Refactoring mainmenu.lua.
2013-04-07 15:56:05 +08:00
James Chen
6e1cf1e951
fixed #2002 : Adding EffectsAdvancedTest for TestLua.
2013-04-07 10:38:56 +08:00
James Chen
85b0fd306a
Adding CocosDenshionTest.
2013-04-06 14:32:46 +08:00
James Chen
63c0ede945
Removing a comment.
2013-04-06 14:00:59 +08:00
James Chen
5171e11765
Adding FontTest for TestLua.
2013-04-06 14:00:17 +08:00
James Chen
17b948367a
Adding ZwoptexTest.
2013-04-05 23:34:46 +08:00
James Chen
e754909c5f
Adding RenderTexture test for TestLua.
2013-04-05 17:13:46 +08:00
James Chen
2bff6d6480
Adding Texture2dTest. And format some lua codes.
2013-04-05 16:13:04 +08:00
James Chen
031e77ccbe
Updating SceneTest.lua.
2013-04-03 18:31:00 +08:00
James Chen
818a570b7f
fixed #1998 : Adding SceneTest.lua for TestLua.
2013-04-03 18:14:03 +08:00
James Chen
229d4329a5
fixed #1997 : Adding IntervalTest for TestLua.
2013-04-03 17:00:05 +08:00
James Chen
2d9f8ca8de
fixed #1814 : MenuTest for Testlua is ok.
2013-04-03 16:29:16 +08:00
James Chen
686775300d
fixed #1994 : ActionManagerTest.lua is ok.
2013-04-03 11:59:17 +08:00
James Chen
c54ee96705
issue #1994 : Adding actionManagerTest.lua.
2013-04-03 10:20:12 +08:00
James Chen
46b26cffd3
fixed #1993 : Adding ParallaxTest for TestLua.
2013-04-02 18:20:14 +08:00
James Chen
a73395507c
fixed #1942 : LayerTest for TestLua is ok.
2013-04-02 17:52:08 +08:00
James Chen
930487f6f7
Updating layerTest.lua.
2013-04-02 11:28:31 +08:00
James Chen
d0300d429c
issue #1942 : Adding LayerTest, first commit.
2013-04-01 18:05:35 +08:00
James Chen
a7f1fba762
TileMapTest.lua is ok.
2013-04-01 17:39:27 +08:00
James Chen
57a76a3a86
Using universal config for TestLua.
2013-04-01 17:39:27 +08:00
James Chen
be4d15fbba
Updating LabelTest.lua
2013-04-01 17:39:26 +08:00
James Chen
9ea35977db
new tile map tests
2013-04-01 17:39:26 +08:00
James Chen
4a1eab5101
CCLOG -> cclog
2013-04-01 17:39:26 +08:00
James Chen
205123f661
Adding TileMapTest.lua
2013-04-01 17:39:26 +08:00
James Chen
d401fb3771
labeltest.lua finish.
2013-04-01 17:39:25 +08:00
James Chen
8854fc046f
BitmapFontMultiLineAlignment is ok.
2013-04-01 17:39:25 +08:00
James Chen
5a623b9b07
Some tests in LabelTest.lua are ok.
2013-04-01 17:39:25 +08:00
James Chen
a388f401bf
Updating LabelTest.lua.
2013-04-01 17:39:25 +08:00
James Chen
8c5f278d06
Updating mainMenu.lua
2013-03-26 18:18:37 +08:00
James Chen
567e1fa15f
Adding LabelTest.lua. Three tests in LabelTest works ok.
2013-03-26 18:14:14 +08:00
minggo
07eaf286fb
add c project setting for lua samples
2013-03-19 16:49:16 +08:00
minggo
0a8b4f923f
delete parameter(-o igncr) when running build_native.sh in eclipse project
2013-03-19 13:48:32 +08:00
minggo
1560bb2af8
don't require un-exist file in ActionsTest.lua
2013-03-18 11:26:38 +08:00
folecr
6dba49f25b
Android build_native.sh now reads local.properties for environment variables
2013-03-15 16:44:16 -07:00
minggo
7c8de5aebe
issue #1803:add SpriteOffsetAnchorFlip
2013-03-14 18:14:01 +08:00
minggo
5936f4db2c
issue #1803:add SpriteBatchNodeOffsetAnchorRotationalSkewScale
2013-03-14 17:45:21 +08:00
minggo
e47baa7984
issue #1803:add SpriteBatchNodeOffsetAnchorSkewScale
2013-03-14 15:49:20 +08:00
minggo
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
minggo
0fe38f073c
issue #1803:add SpriteOffsetAnchorSkewScale
2013-03-14 14:35:33 +08:00
minggo
d18a664e08
issue #1803:handle onExit event to release resources
2013-03-14 11:53:34 +08:00
minggo
e82074eb4f
issue #1803:refactor lua codes
2013-03-13 17:45:09 +08:00
minggo
e9df9918f7
issue #1803:add SpriteBatchNodeOffsetAnchorScale
2013-03-12 18:21:34 +08:00
minggo
5c107f289e
Merge pull request #2136 from yuezang/feature_1803
...
issue #1803:add spritetest lua test case
2013-03-10 23:05:54 -07:00
wangshuai
78d5c480b7
add spritetest lua test case
2013-03-11 13:49:09 +08:00
Sam Clegg
9eb9524659
Add 'make run' target for linux projects.
...
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
build system.
- Remove redundant main.h files.
2013-03-08 10:01:03 -08:00
wangshuai
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
minggo
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
Sam Clegg
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
Sam Clegg
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
wangshuai
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
Sam Clegg
4d0aa01c4b
Fix all gcc warnings in NaCl build.
2013-03-05 17:01:40 -08:00
wangshuai
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
Sam Clegg
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
wangshuai
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
wangshuai
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
James Chen
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
James Chen
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
James Chen
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
James Chen
8c261c1789
issue #1770 : Updating linux makefile.
2013-02-06 15:59:29 +08:00
minggo
07cd6d2bb2
issue #1689:modify lua samples to make them work correctly
2013-02-04 14:50:45 +08:00
minggo
3ea562b4ad
fix some logical errors and compiling errors
2013-01-28 23:19:57 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
733a334ec2
issue #1683 : Fixed compilation errors for linux.
2013-01-28 18:32:34 +08:00
James Chen
c19b9885fe
Adding COCOS2D_DEBUG=1 for sample projects.
2013-01-28 10:22:32 +08:00
James Chen
eec0ba3c19
Getting full path in before playing sound.
2013-01-27 19:20:49 +08:00
James Chen
de8a237d73
Merge pull request #1881 from dumganhar/linux-fix
...
fixed #1676 : Refactoring Makefile and eclipse project configuration for LINUX port.
2013-01-22 03:22:41 -08:00
James Chen
3f57b01f94
Fix for 32bit.
2013-01-22 18:30:16 +08:00
James
1d7650767b
Updated Makefile and project configurations for linux port.
2013-01-22 16:45:35 +08:00
James Chen
219657ee1a
Merge pull request #1872 from moadib/android_manifest_gles20
...
fixed #1673 : Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
2013-01-21 23:52:32 -08:00
ivzave
737fc4ce9e
do not overwrite existing resources in TestLua
2013-01-21 18:01:57 +04:00
moadib
e39829269d
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
2013-01-21 13:03:55 +04:00
johnangel
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
johnangel
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
James Chen
9ef74bef80
fixed #1636 : Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
...
Added platform macro for CCEditBoxImpl* files.
2013-01-05 11:10:24 +08:00
James Chen
ec72701414
Merge pull request #1815 from fape/marmalade_testlua
...
Marmalade TestLua postbuild script
2013-01-03 18:53:47 -08:00
James Chen
f6b57a9b92
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-04 10:16:18 +08:00
fape
94471a06b6
rename and add commandline argument to cccopy.py
2013-01-03 20:52:22 +01:00
fape
3c89bf1d83
marmalade TestLua: add postbuild script to copy resources
2013-01-03 14:47:57 +01:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
James Chen
d2ad820a48
fixed #1627 : Adding view name for sample applications.
2012-12-29 14:50:00 +08:00
James Chen
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
James Chen
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
James Chen
c68884a121
issue #1625 : Updated EffectsTest.cpp and EffectsTest.lua.
2012-12-27 11:48:46 +08:00
James Chen
eb417274fb
fixed #1621 : fix compilation error of eclipe project.
2012-12-24 11:15:56 +08:00
ivzave
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
ivzave
0538b22300
repair linux cli build
2012-12-22 04:14:15 +04:00
minggo
89fb58e791
issue #1603:change pathes of android codes
2012-12-21 17:28:14 +08:00
James Chen
e670d702a8
issue #1603 : Updated TestLua project setting for iOS port.
2012-12-20 21:58:26 +08:00
James Chen
a36446cba2
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
2012-12-20 18:39:52 +08:00
minggo
65e01b9ade
issue #1603:build ok on mac
2012-12-20 18:02:24 +08:00
James Chen
f65717cd86
issue #1603 : updated linux project configuration.
2012-12-20 17:49:34 +08:00
James Chen
08aa5066a5
issue #1603 : updated blackberry, linux, marmalade project configurations.
2012-12-20 17:47:30 +08:00
James Chen
dcfd38756d
Updated android build files.
2012-12-20 14:04:49 +08:00
James Chen
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +08:00