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

2759 Commits

Author SHA1 Message Date
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
James Chen a4e04d70c9 A memory leak fix in CCNotificationCenter. 2012-09-26 15:51:14 +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 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 0dfa1b566b Fixed compilation errors of blackberry platform. 2012-09-26 11:16:44 +08: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
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 f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08: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
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
minggo df24c919a4 Merge pull request #1377 from minggo/gles20 
fix auto building error
 2012-09-24 21:14:10 -07:00
minggo 74b9e2539b fix auto building error 2012-09-25 12:13:06 +08:00
Walzer 450f8f3a30 Merge pull request #1360 from jzgenius/NEWplatform-third_party-ios-libraries-libcurl 
Ne wplatform third party ios libraries libcurl
 2012-09-24 21:05:17 -07:00
minggo 3d177f926b Merge pull request #1373 from ByungChoi/fontconfig_link_fix 
fixed cocos2dx linux TestCpp build break
 2012-09-24 19:18:12 -07:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3 
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
 2012-09-24 21:22:20 +08:00
Byung Choi 624bedad38 fixed cocos2dx linux makefile to link libfontconfig 2012-09-24 20:14:42 +09:00
minggo 88952396e4 Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int 2012-09-24 15:16:30 +08:00
minggo 2ed7b9febe Merge pull request #1365 from dualface/luafix 
luabinding bugfix
 2012-09-23 20:17:23 -07:00
minggo 37f508b415 Merge pull request #1327 from Weeds/gles20 
[linux] font rendering enhancements
 2012-09-23 19:58:48 -07:00
dualface 863b0b89a3 Revert "[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS" 
This reverts commit 6eabead4e3.
 2012-09-24 10:58:43 +08:00
Donald Alan Morrison dec9fff7a7 UITextAlignment deprecated for NSTextAlignment. 
UITextAlignment on NSTextAlignment is injective, not surjective.
There is an equivalence relationship for a subset of NSTextAlignment.

http://en.wikipedia.org/wiki/One-to-one_function
 2012-09-22 20:56:10 -07:00
Byung Choi 68f38914b1 fixes #1359 , MSVC's stdint absence 2012-09-22 17:36:36 +09:00
jzgenius ad5b687848 [lib] New libcurl.a, armv7 & armv7s & simulator Supported. 2012-09-22 13:16:23 +08:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00
minggo dca626eab0 Merge pull request #1357 from ByungChoi/linux_makefile 
Linux makefile
 2012-09-21 02:12:45 -07:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
minggo 29fad4d570 Merge branch 'gles20-android-refactoring' of https://github.com/nicolasgramlich/cocos2d-x into merge_nicolas 2012-09-21 11:05:31 +08:00
Rohan Kuruvilla 423bdf3f5a Adding createWithTotalParticles static function to CCParticleSystemQuad 2012-09-20 18:02:17 -07:00
dualface e36c4abb65 [Lua] remove Lua script handler on CCNode destroy 2012-09-21 00:21:24 +08:00
dualface 6eabead4e3 [iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS 2012-09-20 23:32:26 +08:00
minggo e84606aa47 Update cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp 2012-09-20 16:15:00 +08:00
minggo 31c6f46b6a Merge pull request #1329 from dualface/gles20 
update luabinding for overloaded functions, fix mac CCLuaLog crash ...
 2012-09-20 01:11:36 -07:00
dualface 72e1bdc8cd add ccDrawCircle overloaded function, for jsbinding 2012-09-20 11:55:12 +08:00
dualface 2e900da66d add comment 2012-09-20 11:48:34 +08:00
dualface 1a162a09ad restore CCLayer:onExit() 2012-09-20 11:32:02 +08:00
minggo d662082ef1 Merge pull request #1334 from moadib/gles20 
Fixed statement which works but incorrect from point of C++ standard
 2012-09-19 20:10:15 -07:00
minggo 72356d1a84 Merge pull request #1341 from nichos1983/gles20 
fix bug of not checking object before post notification
 2012-09-19 19:04:14 -07:00
dualface 36908396d2 [Lua] disable CCLayer remove script touch handler on exit 2012-09-20 09:29:20 +08:00
dualface 93b669b936 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-20 09:27:45 +08:00
minggo 8cdf73640b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder 2012-09-19 18:08:17 +08:00
minggo 2f3cdc6538 issue #1470:modify linux makefile and re-create xcode template 2012-09-19 18:05:10 +08:00
nichos1983 16d3466f39 fix bug of not checking object before post notification 2012-09-19 15:28:36 +08:00
Ed Bartley 925c21cdde Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 2012-09-18 18:42:41 -04:00
Byung Choi 4a4ef87163 Fixes #1317 by http://gcc.gnu.org/wiki/Visibility 2012-09-19 04:59:33 +09:00
Byung Choi ad5836a3ca debug & release makefiles for cocos2dx, box2d, chipmunk, cocosdenshion 2012-09-19 04:42:57 +09:00
Nicolas Gramlich cd4b22a503 Merge branch 'gles20-official' into patch-5 2012-09-18 10:50:15 -07:00
moadib 6df8233b03 Fixed statement which works but incorrect from point of C++ rules applied to ternary operator and can cause compilation error on compiler different from MSVC 2012-09-18 13:15:05 +04:00
dualface cf5f3dedc7 [Win32] disable CCTextureAtlas use VAO, some windows display adapter driver cannot support VAO 2012-09-17 17:58:21 +08:00
dualface ded6e3edcf Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-17 17:55:41 +08:00