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

326 Commits

Author SHA1 Message Date
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK. 
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
 2013-07-10 13:04:08 +09:00
Éloi Rivard 05ae6f8518 Fixed some warnings 2013-07-09 16:33:21 +02:00
Éloi Rivard e6354bbf0a Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
Éloi Rivard b8242cfe97 Removed unused include in eclipse HelloLua project 2013-07-09 15:23:19 +02:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen 7d3a63bb23 issue #2371: Adding HelloLua and TestLua projects for MAC. 2013-07-04 17:10:47 +08:00
James Chen 83b23c67fd issue #2371: Set design resolution for TestLua. 2013-07-04 17:07:34 +08:00
James Chen 4196f2036e Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix 
issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
 2013-06-25 08:41:28 -07:00
James Chen 3e052d5525 issue #2325: Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library. 2013-06-25 23:21:06 +08:00
minggo 6539fd52ba Merge pull request #2989 from samuele3hu/glMoudle 
issue #2276: Add OpenGL lua module
 2013-06-25 02:23:15 -07:00
samuele3hu 46bcf6ddba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle 2013-06-25 15:22:14 +08:00
samuele3hu 3b058fe019 issue #2276: Add OpenGL lua module 2013-06-25 14:55:57 +08:00
folecr 6708983de2 Update target to android-10 for NDK code 2013-06-24 15:14:14 -07:00
folecr 7d4ce91b6b Up the minSdkVersion to 9 2013-06-24 15:14:14 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 88a0dbec5e Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-21 21:29:25 +08:00
minggo 0a768da240 issue #2305: use 4.7 toolchain to fix compiling errors 2013-06-21 17:17:23 +08:00
samuele3hu e36c6f544a issue #2276: Modify ScrollView and LuaScrollView class 2013-06-21 14:17:41 +08:00
samuele3hu 35f0b07aa6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 11:16:46 +08:00
James Chen 0879a12516 issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects. 2013-06-21 11:14:03 +08:00
samuele3hu a862543a4c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-21 10:44:03 +08:00
samuele3hu c527fecfe3 issue #2276: Add scrollview sample test in cocosbuilder and modify some config 2013-06-21 10:43:02 +08:00
Sam Clegg 04d7d5a061 [NaCl] Add support for building using glibc toolchain. 
BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
 2013-06-20 12:56:14 -07:00
Sam Clegg 5c4545de3c [NaCl] Remove use of -lnosys 2013-06-20 12:56:13 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
samuele3hu 71fe43ee97 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop 2013-06-20 22:40:21 +08:00
samuele3hu 15c69563e2 issue #2276: Add ScrollView lua binding and test sample 2013-06-20 22:39:30 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00
samuele3hu fb075d7a7d issue #2277: Delete some conflict file and resolve some error 2013-06-20 11:28:16 +08:00
samuele3hu 0c4f99080b issue #2277: modify platform config except win32 2013-06-20 10:19:46 +08:00
samuele3hu b818001007 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-19 16:43:15 +08:00
samuele3hu b48cf5997d issue #2277: Add OpenGL lua test samples 2013-06-19 16:40:02 +08:00
James Chen 504a9e714e issue #2300: copy --> clone for luabinding. 2013-06-19 12:08:26 +08:00
James Chen 3cd82c8bf3 Merge pull request #2917 from pyrasis/tizen_2.1 
[Tizen] Enable Hardware Acceleration.
 2013-06-18 04:32:18 -07:00
Lee, Jae-Hong 4b828cfff2 Enable Hardware Acceleration. 2013-06-18 19:17:49 +09:00
samuele3hu 778708426c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-17 14:38:08 +08:00
samuele3hu 26f1bd5171 issue #2277: Add OpenGL lua binding 2013-06-17 14:19:00 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen b388e7e45e [win32] Updating TestLua. 2013-06-09 18:34:02 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
samuele3hu bc699c1c1e issue #2103 modify AudioEngine framework and CocosDenshionTest sample 2013-06-09 10:32:23 +08:00
James Chen 4edd35e2b1 Merge pull request #2829 from dumganhar/nacl-fix 
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
 2013-06-08 03:00:04 -07:00
James Chen aee8e829ca [Android] Updating Application.mk for HelloLua and TestLua. 2013-06-08 17:28:03 +08:00
James Chen bf781feba1 [NaCL] Updating project. 2013-06-08 16:08:55 +08:00
James Chen 51aa2433fc Updating makefile for native client. 2013-06-08 15:35:45 +08:00
samuele3hu 836bfe1d3f issue #2103 modify audioEngine table name to AudioEngine 2013-06-08 14:06:19 +08:00
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 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
minggo 7bd9717944 make lua works ok on iOS 2013-06-04 15:12:16 +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 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