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

4957 Commits

Author SHA1 Message Date
mustime 009d15845a issue #1425: update lua script 2012-08-30 15:32:29 +08:00
mustime 289eb65dde issue #1425: fix a problem that missing "MainMenu" 2012-08-29 18:16:59 +08:00
mustime c15c96ac28 Merge https://github.com/cocos2d/cocos2d-x into testlua 2012-08-29 17:29:33 +08:00
mustime cc4573c3e4 issue #1425: add ParticleTest to TestLua 2012-08-29 17:17:36 +08:00
mustime 7172e71e1a issue #1425: recreate LuaCocos2d.cpp for tolua++ binding 2012-08-29 17:14:16 +08:00
mustime df25d56cc3 issue #1425: update pkg for tolua++ binding 2012-08-29 17:10:06 +08:00
minggo f0068209f3 Merge pull request #1252 from mustime/testlua 
issue #1425: add EffectTest to TestLua
 2012-08-28 01:05:50 -07:00
mustime 22cf904038 issue #1425: add EffectTest to TestLua 2012-08-28 15:44:09 +08:00
minggo f7993b9954 Merge pull request #1250 from mustime/testlua 
issue #1425: remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
 2012-08-27 23:35:55 -07:00
minggo 1e11ac5d27 Merge pull request #1251 from minggo/gles20 
issue #1425: add icons for testlua
 2012-08-27 23:35:09 -07:00
minggo ff34cb7b39 issue #1425: add icons for testlua 2012-08-28 14:34:22 +08:00
mustime 69679ff545 issue #1425: remove endToLua interface in CCDirector.h, use renaming 
feature in tolua++ instead.
 2012-08-28 14:28:33 +08:00
minggo 76410f4b5b Merge pull request #1248 from mustime/testlua 
Testlua
 2012-08-27 23:18:22 -07:00
mustime f63a719981 issue #1425: fix the problem that missing Resources path 2012-08-28 14:14:09 +08:00
minggo 061e0a3893 Merge pull request #1249 from minggo/gles20 
update AUTHORS and CHANGELOG
 2012-08-27 23:04:04 -07:00
minggo d5565eeceb update AUTHORS and CHANGELOG 2012-08-28 14:03:00 +08:00
mustime 60a64d0eca issue #1425: remove the scheduleScriptHandler interface from CCNode 2012-08-28 12:49:43 +08:00
mustime 8ec843785c issue #1425: change the title from "HelloLua" to "TestLua" 2012-08-28 11:56:23 +08:00
mustime 9b384dace2 issue #1425: update for pkg files' change 2012-08-28 11:53:07 +08:00
mustime 91b9949e4b issue #1425: update pkg file 2012-08-28 11:52:22 +08:00
mustime fbf90e2c2c issue #1425: fix a error when using ccp in lua 2012-08-28 11:51:45 +08:00
mustime 4237ec42be issue #1425: add ios project for TestLua 2012-08-28 11:49:22 +08:00
mustime 9afede2474 issue #1425: update lua files 2012-08-28 11:48:34 +08:00
mustime 567f4b15aa issue #1425: fix a problem when searching lua files on ios project 2012-08-28 11:47:06 +08:00
minggo d1f92b8da4 Merge pull request #1239 from mustime/testlua 
Testlua
 2012-08-27 02:45:29 -07:00
James Chen ef906cd2ba Merge pull request #1247 from dumganhar/gles20 
Updated Makefiles for linux port.
 2012-08-27 01:45:26 -07:00
James Chen dd26a2fcd8 Updated Makefiles for linux port. 2012-08-27 16:43:02 +08:00
minggo 5905ea15c6 Merge pull request #1246 from minggo/iss1442_CREATE_FUNC 
fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
 2012-08-27 01:12:14 -07:00
minggo 0e81fd0568 fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC 2012-08-27 16:11:07 +08:00
mustime c0c3222238 issue #1425: fix a typo error 2012-08-27 15:42:19 +08:00
mustime fa3ec83eec issue #1425: fix a problem when copying files to assets 2012-08-27 15:35:25 +08:00
minggo 985c76120d Merge pull request #1244 from John-cdy/gles20 
issue #1404:Modify monkeyrunner python script.
 2012-08-27 00:30:31 -07:00
Caidongyang 3196b2aa11 issue #1404:Modify monkeyrunner python script. 2012-08-27 15:12:55 +08:00
mustime 6ac99e687b issue #1425: fix a error when designating the Resources path 2012-08-27 15:09:27 +08:00
James Chen 6681cf74ef Merge pull request #1243 from dumganhar/gles20 
Resource file searching implementation for blackberry port.
 2012-08-26 22:54:51 -07:00
James Chen 28150573c6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-27 13:48:55 +08:00
James Chen 7ccb720104 Resource file searching implementation for blackberry. 
Updated the package names of blackberry samples.
 2012-08-27 13:48:17 +08:00
mustime be116f5352 issue #1425: update TestLua project 2012-08-27 11:43:47 +08:00
minggo c7d365ca1c Merge pull request #1231 from donaldalanmorrison/gles20 
Gles20
 2012-08-26 20:17:40 -07:00
minggo b3b00a5ccd Merge pull request #1230 from John-cdy/gles20 
issue #1404:Modify some parameters in script files for windows.
 2012-08-26 20:04:51 -07:00
minggo 8f7e1c4fb1 Merge pull request #1242 from minggo/gles20 
fix a bug in android template
 2012-08-26 19:53:27 -07:00
minggo c1d6edc7ad fix a bug in android template 2012-08-27 10:50:55 +08:00
minggo 6e2b718243 Merge pull request #1241 from minggo/gles20 
add NULL as the last parameter to prevent crashing when creating CCSequence
 2012-08-26 19:48:36 -07:00
minggo a80c282844 add NULL as the last parameter to prevent crashing when creating CCSequence 2012-08-27 10:47:32 +08:00
James Chen 19589a3579 Merge pull request #1240 from dumganhar/gles20 
fixed some warnings in java codes for android port.
 2012-08-26 19:32:24 -07:00
mustime f641602e6e issue #1425: update vs10 proj configuration for TestLua 2012-08-27 10:23:05 +08:00
James Chen 1eb0d8bfd6 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-08-27 10:22:05 +08:00
James Chen 3d0b5bf455 fixed some warnings in java codes for android port. 2012-08-27 10:21:43 +08:00
mustime 7f55980259 issue #1425: add copy commands to copy Resources to android/assets 2012-08-27 10:12:33 +08:00
mustime 6cc4eb8878 issue #1425: remove copying Resources files commands in VS10 2012-08-27 10:04:30 +08:00