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

2385 Commits

Author SHA1 Message Date
Leon d2d02e0c52 fix compile error with android-ndk-r6 2011-07-19 16:54:42 +08:00
Walzer d2b44a203f issue #536, build success on win32 2011-07-19 16:03:42 +08:00
minggo 640d811809 [android] fixed #618: invoke java code(System.exit()) to finish programe 2011-07-19 16:01:22 +08:00
Walzer 768bfa9a9b issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet. 2011-07-19 15:22:13 +08:00
Walzer bc44855091 issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet. 2011-07-19 15:14:59 +08:00
minggo 58e53d7021 Merge pull request #404 from minggo/master 
update LuaCocos2d.cpp and pkg files
 2011-07-18 19:32:52 -07:00
minggo 914706735f update LuaCocos2d.cpp and pkg files 2011-07-18 17:04:15 +08:00
minggo c64fed4543 Merge pull request #403 from minggo/master 
Do some work for lua
 2011-07-17 19:36:50 -07:00
minggo 7a12bb9cdc fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate() 2011-07-18 10:31:41 +08:00
minggo d97fcbf752 fixed #612: export some CCNode methods to lua 2011-07-18 10:28:25 +08:00
minggo a3e9679578 fixed #611: add some functions for lua 2011-07-18 10:18:36 +08:00
minggo 29efe9bd39 Merge pull request #402 from minggo/iss615 
fixed #615: CCLog may crash when invoke lua function
 2011-07-17 18:40:23 -07:00
minggo 9bbab7897a fixed #615: CCLog may crash when invoke lua function 2011-07-14 17:52:56 +08:00
minggo 0817d59edf Merge pull request #401 from minggo/master 
[android] fixed #609: retain & release obj in CCSet
 2011-07-14 02:27:56 -07:00
minggo 4694926edb [android] fixed #609: retain & release obj in CCSet 2011-07-14 15:32:11 +08:00
minggo 257dfb1135 Merge pull request #400 from minggo/iss610 
[android] fixed #610: remove the support of ndk-r4
 2011-07-13 20:39:50 -07:00
minggo dd42936bb3 [android] fixed #610: remove the support of ndk-r4 2011-07-14 10:37:40 +08:00
Walzer 47e4c719e1 update the version in doxygen config 2011-07-14 00:33:27 +08:00
Walzer b3538884ea fix typo in authors & changelog 2011-07-13 22:36:37 +08:00
Walzer 3348698b6c changelog of 1.0.0-x-0.9.0 2011-07-13 18:10:05 +08:00
Walzer 679f4afe06 fixed #604. When I modify the sdk from "iphonesimulator4.1" to "Lastest iOS", the summary & info come out. How magic... It case waste me 4 hours!!! 2011-07-13 18:04:53 +08:00
minggo 1a25dd83a5 Merge pull request #398 from natural-law/master 
fixed #599
 2011-07-13 01:35:41 -07:00
natural-law cb247e711a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	tests/tests/controller.cpp
 2011-07-13 16:26:49 +08:00
Walzer ef7b3bd2d4 rename the version in install-templates-xcode.sh 2011-07-13 16:20:26 +08:00
natural-law 8ad7236ca2 fixed #599, Resolve the wrong orientation when exit the TouchesTest. 2011-07-13 16:17:50 +08:00
Walzer 62b52b37be Merge remote branch 'origin/master' 2011-07-13 16:13:20 +08:00
Walzer 1b1fd7446c [maramalade] add new test cases (bugs, DirectorTests) into test.mkb. Both HelloWorld & Tests are tested on marmalade 2011-07-13 16:00:22 +08:00
minggo 692d8450c2 Merge pull request #397 from minggo/master 
fix a bug of orientation
 2011-07-13 00:36:52 -07:00
minggo 14fe112915 Merge pull request #396 from natural-law/master 
Resolve a bug of BugsTest
 2011-07-13 00:35:45 -07:00
minggo a26fb13604 fix a bug of orientation 2011-07-13 15:32:03 +08:00
natural-law 9755ff59aa When click the "BACK" button in test case Bug-899. The button "MainMenu" is not visible if the device support retina. 2011-07-13 14:37:06 +08:00
Walzer 4fb5633c77 add authors 2011-07-13 13:41:34 +08:00
minggo 705b853583 Merge pull request #395 from minggo/master 
[win32] modify configuration of vs2101 release version
 2011-07-12 21:08:49 -07:00
minggo d5850224e4 [win32] modify configuration of vs2101 release version 2011-07-13 12:05:02 +08:00
minggo d0856f0e67 Merge pull request #394 from minggo/master 
update to 1.0.0 07-12
 2011-07-12 19:24:08 -07:00
minggo fe3aadf800 update to 1.0.0 07-12 2011-07-13 10:20:24 +08:00
minggo fcb2006fdc Merge pull request #392 from natural-law/master 
fixed #599
 2011-07-12 03:10:27 -07:00
minggo faa1c8ee16 Merge pull request #393 from minggo/master 
[win32] modify for vs2010
 2011-07-12 03:09:44 -07:00
minggo 760ec3201e [win32] modify for vs2010 2011-07-12 18:05:44 +08:00
natural-law 7b10874d5e The menu of BugsTest position is wrong when exit one bug test. 2011-07-12 18:02:40 +08:00
natural-law d4e575c4b2 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-12 17:47:24 +08:00
natural-law e6bc8d7c98 fixed #599, Resolve the wrong orientation when exit the TouchesTest. 2011-07-12 17:46:57 +08:00
minggo bf42201f83 Merge pull request #391 from liswei/master 
resolve the effect of PageTransitionForward&PageTransitionBackward
 2011-07-12 02:39:52 -07:00
liswei 21ce679992 resolve the effect of PageTransitionForward&PageTransitionBackward ,via to add setDepthTest. 2011-07-12 17:35:15 +08:00
Walzer 48420dca0c fixed #605, add CC_DLL to pure C methods in CCNS.h 2011-07-12 17:10:10 +08:00
minggo 47ab9602a8 Merge pull request #385 from flyingpacer/master 
fixed #602 and update lua support
 2011-07-12 01:16:52 -07:00
RongHong a8ae311349 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-07-12 16:04:48 +08:00
RongHong 935051a363 set gl perspctive project 2011-07-12 16:04:13 +08:00
minggo bf13472803 Merge pull request #386 from natural-law/master 
Resolve crash on ios
 2011-07-12 01:02:39 -07:00
natural-law e8ac968b3b Add the resource files to the ios project which used by BugsTest. And clean a warning in TileMapTest.cpp. 2011-07-12 15:56:42 +08:00