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
|
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
|
ff34cb7b39
|
issue #1425: add icons for testlua
|
2012-08-28 14:34:22 +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 |
mustime
|
8ec843785c
|
issue #1425: change the title from "HelloLua" to "TestLua"
|
2012-08-28 11:56:23 +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
|
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 |
mustime
|
6ac99e687b
|
issue #1425: fix a error when designating the Resources path
|
2012-08-27 15:09:27 +08: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
|
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 |
mustime
|
f641602e6e
|
issue #1425: update vs10 proj configuration for TestLua
|
2012-08-27 10:23: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 |
mustime
|
1b70d8193f
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
Conflicts:
samples/TestLua/proj.win32/TestLua.win32.vcxproj
|
2012-08-27 10:00:00 +08:00 |
Donald Alan Morrison
|
5075a83271
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
cocos2dx/kazmath/src/ray2.c
|
2012-08-25 00:00:27 -07:00 |
Donald Alan Morrison
|
3eb3ebc67a
|
Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or
'false' (performance warning).
|
2012-08-24 11:20:23 -07:00 |
James Chen
|
1a5dd4fbb0
|
Updated vs2010 project configuration for TestLua.
|
2012-08-24 18:42:03 +08:00 |
James Chen
|
86d1d457a1
|
Added vs2008 project for TestLua.
|
2012-08-24 18:27:47 +08:00 |
minggo
|
cb93713433
|
Merge pull request #1234 from minggo/gles20
use absolute path in CCFileUtils
|
2012-08-24 02:58:33 -07:00 |
minggo
|
bcd691ad9f
|
use absolute path in CCFileUtils
|
2012-08-24 17:55:29 +08:00 |
minggo
|
cf1d61f3de
|
Merge pull request #1232 from minggo/gles20
fix compiling error of linux
|
2012-08-24 01:09:37 -07:00 |
mingo
|
ba4d75a60e
|
issue #1445: fix compiling error of linux
|
2012-08-24 15:53:26 +08:00 |
James Chen
|
8e67592df2
|
Updated project configures of blackberry port.
|
2012-08-24 14:57:44 +08:00 |
Donald Alan Morrison
|
3c7846e32f
|
Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch
|
2012-08-23 23:35:25 -07:00 |
James Chen
|
85304b9441
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua
|
2012-08-24 10:27:20 +08:00 |
mustime
|
4c7ad0d0d1
|
issue #1425: testlua project
|
2012-08-24 10:23:23 +08:00 |
mustime
|
f55aedb5e9
|
issue #1425: add android proj on TestLua
|
2012-08-24 10:18:59 +08:00 |
mustime
|
f67b513d08
|
issue #1425: add android proj on TestLua
|
2012-08-24 10:07:15 +08:00 |
James Chen
|
26a31b21b3
|
issue #1429: Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class.
|
2012-08-24 00:24:04 +08:00 |
James Chen
|
ee3e68014b
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
|
2012-08-24 00:16:11 +08:00 |
James Chen
|
1685e5c497
|
issue #1429: Used java code to implement keyboard layout.
|
2012-08-24 00:15:15 +08:00 |
minggo
|
83606d7691
|
Merge pull request #1212 from mustime/testlua
Testlua
|
2012-08-23 03:08:25 -07:00 |
minggo
|
37cb691600
|
fix some bugs while testing
|
2012-08-23 18:01:28 +08:00 |