James Chen
0d8e7deb10
Reverted CCNotificationCenter.cpp. 'object' and 'target' should not be retained. We must use weak reference, otherwise the life-cycle of target object will be delayed until the destruction of CCNotificationCenter.
2012-09-26 16:25:13 +08:00
minggo
ff66536c30
Merge pull request #1395 from minggo/gles20
...
update AUTHORS and CHANGELOG
2012-09-26 01:05:44 -07:00
minggo
25d3f4215f
update AUTHORS and CHANGELOG
2012-09-26 16:04:22 +08:00
James Chen
4add2e806a
Merge pull request #1394 from dumganhar/gles20
...
A memory leak fix in CCNotificationCenter.
2012-09-26 00:52:41 -07:00
James Chen
a4e04d70c9
A memory leak fix in CCNotificationCenter.
2012-09-26 15:51:14 +08:00
James Chen
caf7b2a0e4
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-26 15:50:01 +08:00
James Chen
48a5ed22c8
Merge pull request #1379 from jzgenius/fix_CCNotificationObserver_performSelector
...
fixed #1485 : [1] The parameters 'target' and 'object' in the constructor of CCNotificationObserver needs to be retained;
[2] perform m_object to performSelector target.
2012-09-26 00:47:28 -07:00
James Chen
28e1813353
Merge pull request #1393 from dumganhar/gles20
...
Fixed some compilation errors for linux platform.
2012-09-26 00:34:19 -07:00
minggo
5c026c5285
Merge pull request #1392 from minggo/gles20
...
update CHANGELOG
2012-09-26 00:33:16 -07:00
minggo
1e950ed445
update CHANGELOG
2012-09-26 15:31:32 +08:00
James Chen
b48b329517
Removed js185-1.0.1.tar.gz.
2012-09-26 15:28:32 +08:00
James Chen
0ca7e00700
fixed some compilation errors for linux platform.
2012-09-26 15:23:10 +08:00
jzgenius
0517372557
add CC_SAFE_RETAIN into constructor of CCNotificationObserver.
2012-09-26 14:10:52 +08:00
James Chen
38eb0ad4fc
Merge pull request #1390 from dumganhar/gles20
...
Updated samples/TestCpp/proj.linux/Makefile.
2012-09-25 23:07:56 -07:00
James Chen
ac8edf1384
Updated samples/TestCpp/proj.linux/Makefile.
2012-09-26 14:06:49 +08:00
James Chen
adf5e43bd0
Merge pull request #1389 from dumganhar/gles20
...
Fixed compilation errors of blackberry platform.
2012-09-25 21:05:54 -07:00
James Chen
dacc4a4f64
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-26 12:03:06 +08:00
minggo
21fe5fe7ed
Merge pull request #1388 from minggo/gles20
...
fix some bugs when testing
2012-09-25 21:02:50 -07:00
minggo
dc3ba6e0cc
fix some bugs when testing
2012-09-26 12:01:42 +08:00
James Chen
0dfa1b566b
Fixed compilation errors of blackberry platform.
2012-09-26 11:16:44 +08:00
minggo
c3c1022fb4
Merge pull request #1380 from dualface/gles20
...
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
2012-09-25 19:30:04 -07:00
James Chen
d6e2dca998
Merge pull request #1387 from dumganhar/gles20
...
fixed #1484 : Minor memory-logic error in EditBoxImplIOS.mm.
2012-09-25 19:06:45 -07:00
James Chen
e8e55c600b
Merge branch 'gles20' of https://github.com/donaldalanmorrison/cocos2d-x into gles20
2012-09-26 09:49:48 +08:00
minggo
effb4b3121
Merge pull request #1386 from folecr/gles20
...
Fix comment. No functional changes.
2012-09-25 18:20:33 -07:00
folecr
53889c5b3c
Fix comment. No functional changes.
2012-09-25 13:55:06 -07:00
Donald Alan Morrison
f6b51c0a5f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-25 10:20:18 -07:00
Donald Alan Morrison
a245199075
Jianhua Chen pointed out a semantic error in my "fix". Thanks James!
...
The Static Analyzer doesn't search for this semantic error, even though it is common.
2012-09-25 10:13:49 -07:00
James Chen
9cacc24632
Merge pull request #1384 from dumganhar/gles20
...
Added library dependence for create-android-project script.
2012-09-25 07:13:42 -07:00
James Chen
fdb53e1e92
Added library dependence for create-android-project script.
2012-09-25 22:12:14 +08:00
James Chen
f75ff79e1b
Merge pull request #1383 from dumganhar/gles20
...
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
2012-09-25 06:54:29 -07:00
James Chen
4a3127f41f
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
2012-09-25 21:52:30 +08:00
dualface
0cd22c380e
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-25 18:45:29 +08:00
minggo
709dd5919b
Merge pull request #1382 from minggo/layer_gradient
...
fix some compiling errors when testing
2012-09-25 03:03:07 -07:00
minggo
6878b626cd
add new GUI component
2012-09-25 18:00:06 +08:00
minggo
2b35f1a20f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into layer_gradient
2012-09-25 17:38:17 +08:00
James Chen
3e442d161f
Merge pull request #1381 from dumganhar/iss1483_sync_cccontrol
...
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 02:30:30 -07:00
James Chen
d91d7c8317
issue #1483 : Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.
2012-09-25 17:26:09 +08:00
minggo
418816ea77
add fps_image.png into TestCpp
2012-09-25 17:06:59 +08:00
James Chen
83fe21b4f4
issue #1483 : Removed a comment.
2012-09-25 17:03:29 +08:00
James Chen
f7229f74d8
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 16:57:51 +08:00
dualface
8d104b8244
[Lua] add CCApplication:getTargetPaltform()
2012-09-25 16:43:36 +08:00
dualface
a2b468f2b3
[Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare
2012-09-25 16:27:54 +08:00
minggo
da97921099
fix compile errors of TestJavaScript
2012-09-25 16:21:28 +08:00
minggo
bfb886bdd2
Merge pull request #1378 from folecr/jsbindingsscript
...
JS Bindings generator script for Jenkins
2012-09-25 00:06:52 -07:00
jzgenius
e24ad0380b
[fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target.
2012-09-25 14:54:13 +08:00
jzgenius
ee6ffd8f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-25 14:43:20 +08:00
minggo
364d7a487a
Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
...
Comment some debug codes, because it will cause auto-building fail.
2012-09-25 14:42:45 +08:00
folecr
b5cfc3034b
Jenkins script to generate JS bindings
2012-09-24 21:48:12 -07:00
folecr
d01b6093d8
gendbings.sh generates userconf.ini
...
* ... and reads userconf.ini from current working directory
* ... also specify that this script is run by /bin/bash
2012-09-24 21:48:12 -07:00
folecr
1a6581383c
Spidermonkey headers are not used for generation
2012-09-24 21:48:11 -07:00