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

1914 Commits

Author SHA1 Message Date
minggo 33008fc8de Merge pull request #300 from minggo/lua 
Lua support
 2011-06-15 02:24:17 -07:00
minggo 1584a96214 [win32] modify CocosDenshion project file to show correct in vs2008 2011-06-15 16:22:22 +08:00
minggo 0c303fac09 Merge pull request #297 from liswei/issue502 
Issue502
 2011-06-15 01:16:04 -07:00
minggo e352d83f37 add default.png for iOS 2011-06-15 15:52:48 +08:00
minggo 25de09e34b lua support ok on win32 2011-06-15 15:50:16 +08:00
minggo 738f0b3426 Merge https://github.com/cocos2d/cocos2d-x into lua 2011-06-15 15:32:09 +08:00
minggo 44f24eb3ef reconstruct lua project 2011-06-15 15:31:22 +08:00
minggo 732f64901c HelloWorld remove lua support on Android 2011-06-15 14:31:51 +08:00
minggo f7f6371666 HelloWorld remove lua support on iOS 2011-06-15 14:28:57 +08:00
minggo 92b22c7ad0 HelloWorld remove support on win32 2011-06-15 14:04:26 +08:00
minggo dd78419a83 HelloLua runs ok on iOS 2011-06-15 13:55:30 +08:00
liswei 3e54282e04 fixed #502 modify CCConfiguration to singleton mode 2011-06-15 11:48:00 +08:00
minggo 73c33c28dd HelloLua runs ok on win32 2011-06-15 11:43:00 +08:00
minggo a4d9d1d4d0 add menu2.png 2011-06-15 11:13:17 +08:00
minggo c5e974cc4c delete menu2.PNG, the name is error 2011-06-15 11:12:38 +08:00
minggo b087984acc add HelloLua 2011-06-15 11:11:13 +08:00
liswei c6cd929dac fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)' 2011-06-15 09:56:33 +08:00
liswei 585792f3da Merge branch 'work1' 2011-06-14 16:29:41 +08:00
liswei 7c669cfcb4 fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly 2011-06-14 16:27:47 +08:00
minggo 71b5c890da Merge pull request #295 from natural-law/master 
fixed #524
 2011-06-14 01:25:41 -07:00
natural-law 5d70774b4f fixed #524, Parse the special format of plist files on ios & airplay. 2011-06-14 16:15:20 +08:00
minggo 49f1518893 fix a bug when compile in android 2011-06-14 15:43:45 +08:00
natural-law 214e86a5b6 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
 2011-06-14 15:05:52 +08:00
natural-law 489fb7824b fixed #524, Parse the special format of plist files. 2011-06-14 14:53:00 +08:00
minggo a7a22e528b remove the usage of NDController 2011-06-14 14:46:39 +08:00
minggo 9c49e27bf1 add extensions & tools directory 2011-06-14 14:31:25 +08:00
minggo 0f19c30921 remove redifine functions 2011-06-14 11:32:01 +08:00
minggo 4d8b2c284c support lua 2011-06-14 11:08:39 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
minggo 23362964bb Merge pull request #293 from liswei/master 
fixed #516
 2011-06-13 19:42:56 -07:00
Walzer 176dc46d9b [ios] fixed #398, rename install-templates-xcode3.sh to install-templates-xcode4.sh, do the magic of xcode4 template in it. 2011-06-13 21:09:06 +08:00
Walzer 362ab18c97 issue #398, xcode4 template for box2d & chipmunk 2011-06-13 20:35:39 +08:00
Walzer ac9c735cb5 issue #398, add template_generator.py & generator shell script, add box2d/chipmunk/cocosdenshion ctemplate 2011-06-13 18:20:57 +08:00
liswei eeeba67e9e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-06-13 17:00:46 +08:00
liswei 91326028ec fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion) 2011-06-13 16:58:55 +08:00
Walzer 220b89c321 issue #398, add resources required by helloworld template 2011-06-13 14:32:50 +08:00
Walzer a308196868 issue #398, cocos2d-x only template for xcode is ok now. hura! 2011-06-13 14:31:25 +08:00
Walzer 3b7d82eed7 add gitignore for xcode4 2011-06-13 13:47:01 +08:00
Walzer 93b61bb544 Merge remote branch 'origin/master' 2011-06-11 23:35:06 +08:00
Walzer 3ca208d30a issue #398, one more step on xcode4 template. But the new project still has compilation errors. 2011-06-11 23:34:46 +08:00
Walzer 37a40caa8d Merge pull request #292 from liswei/master 
#512 fix warnings in /Wall flag
 2011-06-11 08:33:31 -07:00
Walzer 9266be444b issue #398, add xcode4 templates, semi-finished. 2011-06-11 16:53:48 +08:00
liswei 52623d2549 Merge branch 'waring512' 2011-06-10 17:52:11 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
Walzer 409260c002 fix typo in changelog 2011-06-09 17:08:20 +08:00
Walzer f600846d4b Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp 2011-06-08 11:08:29 +08:00
RongHong 67eb87abfe To fix the crash when the gles version is too low 2011-06-08 10:02:07 +08:00
RongHong a13e8ae859 1.修正gles版本过低时会崩溃的问题 
2.修正unscheduleAllSelectors（）中遍历哈希表导致崩溃的问题
 2011-06-03 15:22:50 +08:00
Walzer de80caaec5 Merge pull request #289 from liswei/master 
fixed #521
 2011-06-02 19:57:24 -07:00
liswei 49410a2a07 Merge branch 'XXX' 2011-06-03 10:52:19 +08:00