Rohan Kuruvilla
c47d9d4e7c
Adding Touch callbacks and capability to pass this around
2012-08-27 08:43:38 -07:00
folecr
a8a656de44
cleanup header
2012-08-27 08:43:38 -07:00
Rolando Abarca
a114502929
removes OBJECT_TYPE thing
2012-08-27 08:43:38 -07:00
Rolando Abarca
42ce395f05
uses proxy instead of Get/SetPrivate
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0e9ba1173a
Callbacks
2012-08-27 08:43:37 -07:00
Rolando Abarca
2ea8350518
adds OBJECT_TYPE info to CocosDenshion
2012-08-27 08:43:37 -07:00
Rolando Abarca
4e640ecb35
uses new ADD_OBJECT_TYPE macro
2012-08-27 08:43:37 -07:00
Rolando Abarca
701f5e9dfc
roots & unroots jsobject
2012-08-27 08:43:37 -07:00
Rolando Abarca
9d11298d8e
adds empty create for CCMenuItem
2012-08-27 08:43:37 -07:00
Rolando Abarca
a6a8103d2b
adds object type info to CCDirector
2012-08-27 08:43:37 -07:00
folecr
487b252a82
Remove macros
2012-08-27 08:43:34 -07:00
Rolando Abarca
e757d55a29
updates cocos2d-x API to support getObjectType()
2012-08-27 05:45:11 -07:00
Rolando Abarca
e6dbbceacd
updates gitignore
2012-08-27 05:45:11 -07: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
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
857608495c
Plugged CoreFoundation memory leaks identified by Static Analyzer.
2012-08-24 23:34:20 -07:00
Donald Alan Morrison
9f1899978e
Fixed potential memory leak identified by Static Analyzer.
2012-08-24 21:39:41 -07:00
Donald Alan Morrison
e4f6e48bf5
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 12:01:26 -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
Donald Alan Morrison
ee9f3d09a8
Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly
...
converted to 64 bits.
2012-08-24 09:22:02 -07:00
Donald Alan Morrison
2b4bab18af
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 09:00:57 -07:00
Donald Alan Morrison
9ef8b3b699
Fixed Warning C4114: same type qualifier used more than once. (Definition
...
signature does not match Implementation signature.)
2012-08-24 08:52:29 -07:00
Donald Alan Morrison
eaf0e71e57
Fixed VS2010 Warning C4800: 'JSBool' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 08:35:48 -07:00
James Chen
94af6928f2
Merge pull request #1238 from dumganhar/gles20
...
Some commits for blackberry port.
[1] Updated create-qnx-project.sh. Made it works ok under OSX and Linux system.
[2] Renamed create-qnx-project.sh(.vbs) to create-blackberry-project.sh(.vbs).
2012-08-24 07:47:34 -07:00