Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,762 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

182 Commits

Author SHA1 Message Date
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 9f7d091e95 Merge pull request #2470 from minggo/master 
disable menutest in lua
 2013-04-26 20:18:23 -07:00
minggo ff207b68e0 disable menutest in lua 2013-04-27 11:17:10 +08:00
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +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 42b74758f5 change Android.Manifest.xml to unix style 2013-03-19 16:30:11 +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 9cc4b7ab29 fixed a bug of respond touch events in hello.lua. The event type is string now. 2013-02-20 12:03:21 +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 a771bc8183 issue #1689:modify lua Android.mk 2013-02-04 12:02:21 +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