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

32017 Commits

Author SHA1 Message Date
minggo 5e15545dbd [Android] fix an error when string is 2011-06-27 16:01:25 +08:00
liswei bb59728543 issue #521 set depthtest value for true ,then set depthtest value for false 2011-06-27 15:34:26 +08:00
minggo 686b9ae179 fix the test title 2011-06-27 15:22:55 +08:00
minggo ad8a545541 Merge pull request #325 from natural-law/master 
fixed #542
 2011-06-27 00:04:47 -07:00
natural-law 739d6d30e5 Modify the vcproj files to build liblua & HelloLua projects with release configuration. 2011-06-27 14:11:29 +08:00
natural-law 72f17ecbdf fixed #542, Record the volume user specified though the background music is not playing. 2011-06-27 11:43:27 +08:00
minggo 7ca759470c Merge pull request #324 from yangws/master 
Wrap glScissor in CCEGLVIew::setScissorInPoints.
 2011-06-26 20:09:43 -07:00
yangws 59f37ddb5d fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints. 2011-06-27 10:55:45 +08:00
Walzer bf99245dbb hide the xcode4 template generator script into tools folder 2011-06-25 14:20:10 +08:00
Walzer 4b7513a46e [android] roll back to use dynamic link in tempalte. 2011-06-25 14:13:08 +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 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00
Walzer 70b4d701d3 fixed #538, xcode template for cocos2d-x lua project 2011-06-24 21:25:51 +08:00
Walzer fa671c4c0d Merge remote branch 'origin/master' 2011-06-24 21:04:00 +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 8f4b20391e Merge pull request #322 from minggo/iss538 
[Android] modify android template to work on new codes
 2011-06-24 03:02:17 -07:00
minggo a02f7c75d9 [Android] modify android template to work on new codes 2011-06-24 17:24:01 +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 ea0bf7cdd2 Merge pull request #321 from minggo/iss538 
[iOS] fixed #538: add template of lua for xcode3
 2011-06-24 01:23:20 -07:00
minggo 42ce3c2649 Merge pull request #320 from minggo/master 
[Android] Totally fix the problem of drawing text
 2011-06-24 00:39:54 -07:00
minggo 5677e74813 [iOS] fixed #538: add template of lua for xcode3 2011-06-24 15:35:00 +08:00
minggo e8fda66ccc Merge https://github.com/cocos2d/cocos2d-x 2011-06-24 13:55:52 +08:00
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
Walzer e39195d996 issue #580 add RootViewController to xcode4 templates, issue #398 fix the duplicate names to cocos2d-x 2011-06-24 12:43:45 +08:00
Walzer 37e5c21aba issue #580 add RootViewController to xcode4 templates 2011-06-24 11:38:23 +08:00
Walzer d4aa30a850 Merge remote branch 'origin/master' 2011-06-24 11:22:29 +08:00
Walzer 8f770ec929 issue #540 for HelloWorld/ios, split main.m, add pause/resume/startAnimation/stopAnimation controls 2011-06-24 11:22:11 +08:00
Walzer 4bb1ef5c72 Merge pull request #319 from liswei/issue539 
Issue539
 2011-06-23 18:58:46 -07:00
liswei 0c5f28fc11 fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-24 09:29:55 +08:00
liswei 4793713daa fixed #539 call unzOpen, then may not call unzClose(WVGA) 2011-06-23 18:24:32 +08:00
Walzer a676e0d401 [ios] issue #538, add xcode4 template for lua project 2011-06-23 17:13:53 +08:00
Walzer 156dfa8859 Merge remote branch 'origin/master' 2011-06-23 16:31:52 +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
Walzer 9e74b1f50d fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios. 2011-06-23 16:31:04 +08: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 39d62d69a7 add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest. 2011-06-23 16:02:16 +08:00
Walzer fea9f3b943 add script_support to cocos2d-wophone.vcproj 2011-06-23 15:59:28 +08:00
Walzer d6a729d7f1 update cocos2d-win32.vc2008.sln to match the new folder structure of cocos2d-x/lua 2011-06-23 15:47:56 +08:00
Walzer 14956c4f87 add icon for HelloLua on ios 2011-06-23 15:36:25 +08:00
Walzer 1239af43ba Merge commit '0530d21725b5b4d811fa45eed84d1d711530831f' from lua-branch 2011-06-23 15:18:04 +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