James Chen
9f7019e48c
Updated a comment.
2012-10-17 16:52:09 +08:00
James Chen
5ab37c86b2
Fix a bug about calculating client area on win32.
2012-10-17 16:50:07 +08:00
James Chen
249ef92697
fix a bug about wrong touch area for windows.
2012-10-17 15:38:03 +08:00
James Chen
3f7b79fb08
issue #1511 : Rename some static variables.
2012-10-17 15:14:34 +08:00
James Chen
2779b4f1ab
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel
2012-10-17 15:08:25 +08:00
James Chen
ddfc08904a
issue #1024 : Made blackberry/CCImage.cpp compiled ok.
2012-10-17 10:57:21 +08:00
John Garrison
8e7b939f61
Added TTF support to Blackberry
2012-10-16 13:47:04 -04:00
johnangel
cd82403638
Fix to make MultiTouchTest work properly
2012-10-16 19:02:24 +02:00
johnangel
054128c5ee
Correction for touch and display area
2012-10-16 18:53:31 +02:00
johnangel
a2e1400402
Merge remote branch 'upstream/gles20' into gles20
2012-10-16 08:42:30 +02:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
johnangel
8d0dc8d2a7
Windows Touch support for desktop
2012-10-15 10:39:42 +02:00
James Chen
a6b57f7d79
Merge pull request #1451 from micahli/gles20
...
fixed #1508 : Potential observer array modification while it's traversed in CCNotificationCenter.
2012-10-14 22:50:47 -07:00
James Chen
a65f13defe
issue #1486 : Fix bugs for CCEditBox iOS port.
2012-10-15 13:01:36 +08:00
minggo
93d702e3cc
fixed #1491:remove dependency of FontLabel lib
2012-10-15 12:03:15 +08:00
micahli
c69a11296e
fix the potential Container iterator bug with CCNotification
...
revert last fix which may contain other bugs
2012-10-15 09:55:37 +08:00
minggo
67383ff7ce
Merge pull request #1453 from shinriyo/patch-2
...
getDelta() is delta function
2012-10-14 18:34:03 -07:00
minggo
eadbbf6928
Merge pull request #1447 from minggo/android-effect
...
use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
2012-10-14 18:29:35 -07:00
shinriyo
1569550528
getDelta() is delta function
...
I'm sorry, I mistook the pull request.
2012-10-14 21:20:31 +09:00
James Chen
2c670a9efc
issue #1486 : Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR().
2012-10-13 18:19:37 +08:00
micahli
7d1d46ee3f
fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address
2012-10-13 16:44:46 +08:00
James Chen
6cf602ea3b
issue #1486 : CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture.
2012-10-13 10:18:03 +08:00
minggo
0a39fa8bef
fixed #1507 : use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
2012-10-12 17:43:43 +08:00
James Chen
965540ecec
issue #1486 : fix a warning in CCAutoreleasePool.cpp.
2012-10-12 16:03:53 +08:00
James Chen
f5abe422ea
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1486-multi-res
2012-10-12 15:50:11 +08:00
James Chen
e1c0ea761b
issue #1486 : Removed some unused codes, made it works on WINDOWS.
2012-10-12 09:58:42 +08:00
Rohan Kuruvilla
540b41c091
Fixing LabelAtlas to read texture relative to path of plist file
2012-10-11 18:44:46 -07:00
James Chen
cdf54a872f
issue #1486 : A bug fix.
2012-10-11 17:02:27 +08:00
James Chen
ade54a3de7
Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
...
Conflicts:
samples/HelloCpp/Classes/AppDelegate.cpp
samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
James Chen
26a5f31f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1469-moonwarriors
2012-10-10 15:25:49 +08:00
James Chen
48b146a098
issue #1469 : Exported 'cocos2dVersion'.
2012-10-10 15:08:11 +08:00
minggo
d8b0c75675
fixed #1500:fix a memory leak
2012-10-10 12:02:56 +08:00
minggo
96b3232910
fixed #1500:make rendertexture work ok on certain Qualcomm Andreno gpu
2012-10-10 11:36:02 +08:00
johnangel
e510bee238
Displaying window size in Debug mode
2012-10-09 10:58:56 +02:00
johnangel
e7340f6c1b
ESC button on Windows will now behave like Back button on mobile phones
2012-10-08 18:46:19 +02:00
johnangel
72aa46afe5
Refactoring code
2012-10-08 18:38:04 +02:00
johnangel
c6da27b793
Debug app uses executable directory; Non-debug app uses local app data
...
directory
2012-10-08 17:22:27 +02:00
johnangel
ad7dacc281
Merge remote branch 'upstream/gles20' into gles20
2012-10-08 16:35:43 +02:00
James Chen
be236155e9
Fix a typo.
2012-10-08 14:58:24 +08:00
James Chen
f6c34e23e6
Adding some comments for CCDictionary::objectForKey method.
2012-10-08 14:55:46 +08:00
James Chen
70286073e1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-10-08 14:53:22 +08:00
James Chen
719cb7b7a6
fixed #1496 : An error of comparing font's face name in CCImage of win32 port.
2012-10-08 14:52:08 +08:00
James Chen
6d29e63294
fixed #1494 : Change the value of CCObject::m_uAutoreleaseCount in CCAutoreleasePool class.
2012-10-08 14:05:03 +08:00
James Chen
54b4c690d1
fixed #1494 : Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times.
2012-10-08 13:41:48 +08:00
Ed Bartley
04527f7378
Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views.
2012-10-06 23:39:47 -04:00
Ed Bartley
a9177fed6f
Fix Typo.
...
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
2012-10-05 10:24:17 -04:00
Sergey Buravtsov
9eec2d69ee
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org/boards/6/topics/4336
2012-10-01 16:08:11 +04:00
johnangel
0f2dac9d8e
Saving data to C:\Documents and Settings\<User Name>\Local
...
Settings\Application Data as designed for Windows apps
2012-10-01 11:55:21 +02:00
minggo
6b9affae65
Merge pull request #1402 from Horcruxes/patch-1
...
Update cocos2dx/platform/ios/CCFileUtils.mm
2012-09-29 00:35:35 -07:00
minggo
936cb19684
Merge pull request #1405 from dualface/complete_delete_ccdirector
...
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-28 19:20:36 -07:00
walzer
0cca568ffe
fixed #1492 , assert if user add an CCObject* into CCAutoreleasePool twice.
2012-09-28 18:22:00 +08:00
Horcruxes
cb66f1673e
Update cocos2dx/platform/ios/CCFileUtils.mm
...
fixing cannot read data using CCArray::createWithContentsOfFile
2012-09-27 12:31:53 +10:00
walzer
c9772c76ec
fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums
2012-09-27 00:44:40 +08:00
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
Sergey Vikhirev
05eb4352e8
Remove retina specific methods and logic
2012-09-24 14:22:02 +04: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
10fa047965
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-21 00:29:16 +08: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
johnangel
778f663e76
Returning setViewName to be able to set game window title
2012-09-19 19:56:58 +02:00
johnangel
acac470f7b
Fixing GPF when old OpenGL version is detected
2012-09-19 19:36:09 +02: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
dualface
44e5bdf7a8
restore CCDirector
2012-09-17 15:12:13 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
Andre Rudlaff
394b64d61f
[linux] fixed font rendering artifacts
...
This patch fixes the black pixels
around fonts when rendered using
CCLabelTTF.
see http://www.cocos2d-x.org/issues/706
This fix is for linux only, but may
be applied to other platforms as well
2012-09-17 02:33:23 +02:00
Andre Rudlaff
44ccc40269
[linux] use fontconfig to select system fonts
...
This patch removes the hardcoded font paths
from the linux project and uses fontconfig
to find the best match for a given font-family
The implementation also adds the possibility
to load a font file from the applications
resource directory
2012-09-18 00:57:29 +02:00
Walzer
f475bcf102
CCString::stringWithContentsOfFile should call CCString::createWithContentsOfFile, but not CCString::create
2012-09-16 16:21:42 +08:00
Walzer
b8fad67ef4
Fix English syntax in CCDrawingPrimitives.cpp
2012-09-16 10:18:06 +08:00
minggo
7e123f3aec
Merge pull request #1322 from NatWeiss/fixtmxparser2
...
Fixes a bug in the TMX parser which caused tileset images not to load.
2012-09-15 18:50:44 -07:00
minggo
eab52552be
Merge pull request #1320 from NatWeiss/fixccthread
...
Fixes CCThread.cpp so it is not included for Mac builds.
2012-09-15 18:47:42 -07:00
Nat Weiss
53e4da5d5c
Fixes a bug in the TMX parser which caused tileset images not to load on Android.
2012-09-15 15:59:15 -07:00
Donald Alan Morrison
6816fb94fc
A few more minor documentation changes. OK, enough for today! :-)
2012-09-15 15:12:28 -07:00
Donald Alan Morrison
216ebab0e1
Minor English Spelling Corrections, etc.
2012-09-15 14:19:14 -07:00
johnangel
fdec1ba4b9
Fixing include paths to be able to compile cocos2d-x using
...
external Visual Studio solution, without copying all files
2012-09-15 16:34:31 +02:00
Walzer
9a042b8056
fix a potential memory leak in CCTextureCache::addImage. Thanks to Alexander Markevich.
2012-09-15 21:11:50 +08:00
Nat Weiss
febafa6e82
Fixes CCThread.cpp so it is not included for Mac builds.
...
The Mac platform already has it's own CCThread.mm.
2012-09-15 00:37:12 -07:00
Donald Alan Morrison
b29f9a7f3b
Missed one spelling error.
2012-09-14 15:41:42 -07:00
Donald Alan Morrison
b8412f3b7e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-14 15:27:55 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
dualface
2866fa8f56
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-14 18:00:30 +08:00
dualface
515ec3c482
ccDrawCircle() add scaleX and scaleY
2012-09-14 18:00:11 +08:00
dualface
62709d7c71
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-14 17:57:56 +08:00
dualface
2869aba7b4
avoid unused memory alloc
2012-09-14 17:54:53 +08:00
johnangel
a9f37d4e8b
OpenGL access violation fix
2012-09-13 19:22:03 +02:00
johnangel
6396089b16
Revert "OpenGL access violation fix"
...
This reverts commit 81fda22597
.
2012-09-13 19:18:43 +02:00
johnangel
81fda22597
OpenGL access violation fix
2012-09-13 19:13:38 +02:00
Nicolas Gramlich
f03c0caaf9
Added proper JNIEXPORT/JNICALL markers to android platform jni bindings.
2012-09-13 09:34:30 -07:00
Walzer
150ef1f320
Update cocos2dx/platform/win32/CCEGLView.cpp
2012-09-13 15:53:57 +08:00
Walzer
5718dc1397
fixed #1474 , check OpenGL version of win32
...
When OpenGL version is too old to run 2dx (<1.5), popup a warning dialog to warn users.
2012-09-13 15:52:46 +08:00
dualface
4aa74d8f5e
[Mac] fix CCLuaLog crash
2012-09-13 10:26:47 +08:00
dualface
9418afacf9
delete CCDirector after call CCDirector::purgeDirector()
2012-09-13 10:26:30 +08:00
Nicolas Gramlich
675d0adce5
Merge with gles20-official.
2012-09-12 16:51:01 -07:00
flamingo
bb82930789
Update cocos2dx/platform/win32/CCEGLView.cpp
...
extra endings in linux logging
2012-09-12 22:17:56 +04:00
YuLei
400af95093
restore CCDirector
2012-09-11 16:07:56 +08:00
YuLei
e1600b0977
delete CCDirector after call CCDirector::purgeDirector()
2012-09-11 15:49:10 +08:00
YuLei
fc3a55a065
[Lua] move LUA_FUNCTION, LUA_TABLE, LUA_STRING declare to CCLuaEngine.h
2012-09-11 15:44:33 +08:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
Ed Bartley
c67412618d
Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
...
Conflicts:
extensions/GUI/CCScrollView/CCScrollView.cpp
2012-09-10 10:50:30 -04:00
Ed Bartley
01103c4cb1
Remove optimization of the mac debug build
2012-09-10 10:48:34 -04:00
moadib
97a11c0e06
Handle window close event on Linux platform
2012-09-10 17:53:33 +04:00
James Chen
ae320b5f9c
stage sth.
2012-09-10 18:38:18 +08:00
James Chen
2f51246bbd
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
2012-09-10 17:01:00 +08:00
James Chen
6a1aae95aa
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
...
Conflicts:
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
2012-09-10 17:00:22 +08:00
YuLei
8fa431fe0a
[Mac] remove CCEGLView::purgeSharedOpenGLView()
2012-09-10 16:50:45 +08:00
Walzer
b1572beb0b
fixed #1453 , fix a typo in platform/ios/CCGL.h
...
#include <OPenGLES/ES2/glext.h> is fixed to #include <OpenGLES/ES2/glext.h>
2012-09-10 15:05:56 +08:00
James Chen
1460f4e42f
issue #1458 : Updated project configuration for all platforms.
...
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
Nicolas Gramlich
4c7705171a
Android JAVA refactoring. Android JNI Cleanup.
2012-09-07 17:23:04 -07:00
ebartley
f027c4a9f7
Merge branch 'gles20' of https://github.com/FlowerpotGames/cocos2d-x into gles20
2012-09-07 15:01:52 -04:00
ebartley
5deeb3f8fa
Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.
2012-09-07 15:00:21 -04:00
Ed Bartley
a392b17182
MAC project is missing the header search path to /include
2012-09-07 13:14:22 -04:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
minggo
23e5c69616
Merge pull request #1280 from Yodesoft/gles20
...
Supported display Unicode chars.
2012-09-07 01:12:05 -07:00
minggo
af32d42eb7
Merge pull request #1286 from moadib/gles20
...
Fixed crash with CCLabelBMFont
2012-09-06 22:51:00 -07:00
dualface
08f5617fde
[Win32] fix: CCLuaLog crash when dump large message (>16K)
2012-09-07 10:41:54 +08:00
dualface
a8aa299c2a
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-07 10:16:57 +08:00
dualface
4968ab126f
[Win32] fix CCLuaLog() crash
2012-09-07 10:15:17 +08:00
moadib
a574d17bed
Added comment as minggo requested
2012-09-06 10:09:29 +04:00
YuLei
3679f742cb
Merge branch 'gles20' of github.com:dualface/cocos2d-x into gles20
2012-09-06 09:50:52 +08:00
dualface
eae5f7368e
[Win32] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
2012-09-06 09:49:38 +08:00
YuLei
7ba88dca4c
[Mac] fix: after call CCApplication::setResourceRootPath(), CCFileUtils::fullPathFromRelativePath() not check resourceDirectory
2012-09-06 09:44:40 +08:00
ivzave
cf67922ee0
remove delete this from init methods
2012-09-05 22:30:44 +04:00
YuLei
a5e34ee754
[Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename()
2012-09-05 16:15:09 +08:00
moadib
1b51b709ee
Fixed crash with CCLabelBMFont when center- or right-aligned text have line breaks each other
2012-09-05 11:36:34 +04:00
dualface
affcb70ecc
add CCApplication::setResourceRootPath()
...
add CCApplication::setStartupScriptFilename()
2012-09-05 14:38:39 +08:00
YuLei
6115769044
restore CCApplicationProtocol.h and CCFileUtils.h
2012-09-05 13:36:27 +08:00
dualface
1dc7c48cf6
[Win32] add CC_DISABLE_ASSERT check
2012-09-04 11:34:55 +08:00
dualface
3befb0ffdc
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-04 11:20:33 +08:00
YuLei
39b019b2cb
[Mac] fix CC_ASSERT error
...
[Mac] add CC_DISABLE_ASSERT check
[cocos2d-x] CCSprite::createWithSpriteFrame() check pSpriteFrame
2012-09-04 11:16:59 +08:00
yodesoft
95f204cd17
Add font table to handler font info, eg. family_name, style_name, filename
2012-09-04 10:48:02 +08:00
dualface
9fa8d87bc0
Merge remote-tracking branch 'origin/gles20' into gles20
2012-09-04 02:41:46 +08:00
dualface
2160e56cb1
[Win32] fix CCFileUtils:fullPathFromRelativePath() check m_isWorkingDirectory
2012-09-04 02:41:16 +08:00
YuLei
539a524627
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-04 02:16:35 +08:00
YuLei
09b0d9c843
[Mac] fix memory leaks
2012-09-04 02:06:04 +08:00
YuLei
a25b1b3f2f
[Mac] fix memory leaks
2012-09-04 01:22:06 +08:00
YuLei
39f672e5bf
fix: cleanup scheduler after call CCDirector::end()
2012-09-04 01:21:32 +08:00
YuLei
03374fa83b
add CCApplicationProtocol:setStartupScriptFilename(), getStartupScriptFilename()
...
CCFileUtils:setResourceDirectory() add isWorkdingDir argument
2012-09-03 18:05:59 +08:00
minggo
56c329cf0e
reset texture parameter when coming to foreground on android
2012-09-03 16:47:18 +08:00
minggo
1a2dd6ae35
Merge branch 'gles20' of https://github.com/MartinSherburn/cocos2d-x into merge_texparams
2012-09-03 16:04:41 +08:00
yodesoft
b0d7ecec42
Supported display Unicode chars.
2012-09-03 12:38:29 +08:00
dualface
9809798280
[Win32] add menubar to window
...
[Win32] set custom window message proc
[Win32] resize window
2012-09-03 00:58:42 +08:00
YuLei Liao
c1beb9d3bf
[Win32] CCLog() print to STDOUT
2012-09-02 13:21:30 +08:00
YuLei Liao
d4c53d43b9
[Win32] add custom menu and custom windows message proc
2012-09-02 04:38:52 +08:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
0f213beae2
issue #1454 : Fixed a bug in CCMenuItem::activate.
2012-08-31 22:33:14 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
Martin Sherburn
afd8391ca8
Fixed bug where texParams would get lost after reloading textures on android
2012-08-30 20:36:24 +01:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
James Chen
2ac2658612
Fixed a bug that 'CCEGLView::sharedEGLView()->isRetinaEnabled()' always returns false when retina mode is enabled on win32.
2012-08-30 10:43:54 +08:00
James Chen
21547fb96f
Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp,
...
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
2012-08-29 14:49:04 -07:00
James Chen
7c5b3c472e
Added CCParticleSystem::createWithTotalParticles.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
55423ed5b9
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
06f240fa5e
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
d6e1d6b4fa
Commented some codes.
2012-08-29 21:50:09 +08:00
YuLei
f14eccb6e5
[Mac] add miss CCLuaLog
2012-08-29 18:40:42 +08:00
YuLei
66b221dc79
[Lua] update luabinding
2012-08-29 17:32:47 +08:00
folecr
d4948939b6
Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles
...
* ... they should only be included by cocos+JavaScript applications
2012-08-28 17:43:57 -07:00
Rohan Kuruvilla
c62462d997
Including callback support for onEnterTransitionDidFinish and onExitTransitionDidStart
2012-08-28 17:43:35 -07:00
YuLei
f6a17f69f7
update tolua++ pkg files
...
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:53:52 +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
mustime
69679ff545
issue #1425 : remove endToLua interface in CCDirector.h, use renaming
...
feature in tolua++ instead.
2012-08-28 14:28:33 +08:00
YuLei
b411c00f38
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 14:23:31 +08:00
minggo
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
mustime
60a64d0eca
issue #1425 : remove the scheduleScriptHandler interface from CCNode
2012-08-28 12:49:43 +08:00
YuLei
02e77faf51
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-28 12:22:57 +08:00
YuLei
2c518e43b2
[Lua] fix CCLayer:registerScriptTouchHandler()
...
[Lua] make CCNotificationCenter script support
2012-08-28 12:08:15 +08:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
folecr
9e226faa6c
Use #ifdef COCOS2D_JAVASCRIPT for JS specific code
2012-08-27 08:43:40 -07:00
Rolando Abarca
b7a7eec7b8
typo
2012-08-27 08:43:40 -07:00
Rolando Abarca
188cb8052d
fixes CCLabelBMFont create
...
also, a small bug in CCMenuItemToggle
2012-08-27 08:43:39 -07:00
Rolando Abarca
f210b666ee
removes a few warnings
2012-08-27 08:43:39 -07:00
folecr
876f7857e1
Fix CCMenuItemToggle::create()
2012-08-27 08:43:39 -07:00
Rolando Abarca
bee9099102
updates CCMenuItem and CCAnimation
2012-08-27 08:43:39 -07:00
Rolando Abarca
033ae81871
adds COCOS2D_JAVASCRIPT for some specifics parts
2012-08-27 08:43:39 -07:00
folecr
cd87364277
Includes for typeinfo and spidermonkey_specifics.h
2012-08-27 08:43:39 -07:00
Rolando Abarca
5f4bafda08
fixes CCMenuItemToggle::create()
...
Works with no arguments (items). You can add items later
2012-08-27 08:43:39 -07:00
Rolando Abarca
ce40351855
updates CCScheduler to work with the JS Bindings
2012-08-27 08:43:39 -07:00
Rolando Abarca
a97d0f5a95
fixes default values for functions
2012-08-27 08:43:39 -07:00
Rolando Abarca
4ce9cc9810
adds typeinfo and fixes overloaded funcs
2012-08-27 08:43:38 -07:00
Rolando Abarca
2598fc97d1
adds TypeInfo to some classes
2012-08-27 08:43:38 -07:00
Rolando Abarca
c6db10772c
fixes default arguments for the generator
2012-08-27 08:43:38 -07:00
rohankuruvilla
77f723789b
Adding support for cc.CallFunc.
2012-08-27 08:43:38 -07:00
folecr
0c9b7718a0
Cocos2D-X depends on spidermonkey scripting core now.
...
* Define COCOS2D_JAVASCRIPT
* Include the scripting core library
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
0cf880d620
Fixing touch handling to remove the need to registerTouchHandler
2012-08-27 08:43:38 -07:00
Rohan Kuruvilla
c47d9d4e7c
Adding Touch callbacks and capability to pass this around
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
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
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
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
James Chen
3d0b5bf455
fixed some warnings in java codes for android port.
2012-08-27 10:21:43 +08:00
YuLei
a38b8d4a00
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
...
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
2012-08-25 17:08:33 +08:00
YuLei
8b54355aa1
[Lua] update luabinding
...
[Lua] add LuaValue, LuaDict, LuaArray
2012-08-25 15:05:59 +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
James Chen
6c4bdc238f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-24 18:02:34 +08:00
James Chen
2eeca6f000
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-24 18:02:00 +08:00
James Chen
369eb3daa3
[WIN32] Enabled retina. Updated the implementation of fullPathFromRelativePath.
2012-08-24 18:01:16 +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
e011be88d8
fixed a bug in CCFileUtils.cpp of blackberry port.
2012-08-24 14:35:51 +08:00
James Chen
5e5b71a396
fixed a bug in CCEGLView.cpp.
2012-08-24 14:35:24 +08:00
Donald Alan Morrison
3ee17b1a23
Merge with c9674e85e8
. The diff revealed
...
there was no actual conflict, so only a dot was added to the comment so
git would accept the commit (otherwise "nothing to commit"); and thus the
history is preserved.
2012-08-23 22:32:33 -07:00
Donald Alan Morrison
82bb62f8e3
MSVC++2010 doesn't accept C99-style named-initialization like clang.
2012-08-23 20:58:25 -07:00
minggo
f8df93c59c
Merge pull request #1228 from mustime/testlua
...
Testlua
2012-08-23 19:15:50 -07:00
minggo
fa0dbb7c65
Merge pull request #1226 from Squallium/gles20
...
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 19:11:07 -07:00
mustime
c9674e85e8
fixed a compile error on WIN32
2012-08-24 10:10:14 +08:00
mustime
f67b513d08
issue #1425 : add android proj on TestLua
2012-08-24 10:07:15 +08:00
James Chen
998cb276ba
Merge pull request #1224 from dumganhar/android_editbox
...
issue #1429 : CCEditBox for android port
2012-08-23 18:53:24 -07:00
minggo
56ce6869d6
Merge pull request #1227 from donaldalanmorrison/gles20
...
Gles20
2012-08-23 18:32:39 -07:00
Squallium
bd09615a26
Wrong access to CCApplication::sharedApplication() pointer
2012-08-23 22:53:16 +02:00
Donald Alan Morrison
e3094d80d0
Silenced LLVM SA Warning/Error regarding static singleton pattern. Added dealloc method.
2012-08-23 13:41:54 -07: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
James Chen
7f2c9f6fb4
issue #1429 : Removed some used codes.
2012-08-23 23:09:12 +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
mustime
b815504d69
issue #1425 : change the design of CCCallFunc::create(int nHandler)
2012-08-23 16:27:22 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
23bd0268cf
Merge pull request #1217 from zeaster/gles20
...
fixed #1298 : double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo
0c5cec0056
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
2012-08-23 14:26:39 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
yichao.zhang
988a8d8a60
fixed #1298 : do not update last action when it is done in IntervalAction
2012-08-22 19:48:32 +08:00
minggo
99b81e3e38
Merge pull request #1216 from minggo/iss1439_synchronize
...
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo
3b442dfc0f
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 15:51:25 +08:00
minggo
3b1bfa5852
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
...
fixed #1440:convert offert point to pixel
2012-08-21 23:30:37 -07:00
minggo
2a9d29ba21
fixed #1440:convert offert point to pixel
2012-08-22 14:29:23 +08:00
mustime
1ffdbc1639
issue #1425 : add standard comment on CCCallFunc::create(int nHandler) and
...
CCCallFuncN::create(int nHandler)
2012-08-22 14:21:48 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
ce274cfb4f
Merge pull request #1209 from minggo/iss1437_return_pointer
...
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
2012-08-21 02:47:47 -07:00
James Chen
4c2702fcef
issue #1437 : fixed some compile errors for blackberry port.
2012-08-21 17:42:56 +08:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
minggo
e939285c93
change version
2012-08-21 17:03:01 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08:00
Donald Alan Morrison
81d8dd0eb2
Silenced a false-positive warning from the LLVM Static Analyzer with initialization.
...
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA. Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
2012-08-20 18:30:12 -07:00
Donald Alan Morrison
7d66f62881
Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy.
2012-08-20 18:09:51 -07:00
Donald Alan Morrison
61a5b2a742
Plugged a memory leak identified by LLVM Static Analyzer.
2012-08-20 16:48:07 -07:00
Donald Alan Morrison
c482a246be
Plugged potential memory leak found by LLVM Static Analyzer.
2012-08-20 16:40:26 -07:00
Donald Alan Morrison
abe45e53b5
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 16:16:00 -07:00
Donald Alan Morrison
d6ec91807c
For Release Builds:
...
+ GCC_PREPROCESSOR_DEFINITIONS = (
+ "NS_BLOCK_ASSERTIONS=1",
+ "NDEBUG=1",
+ );
For All Builds:
+ WARNING_CFLAGS = "-fdiagnostics-show-option";
2012-08-20 16:11:11 -07:00
Donald Alan Morrison
75ae8d2201
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:54:12 -07:00
Donald Alan Morrison
c75f73aa41
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:33:34 -07:00
Donald Alan Morrison
70f383ec2f
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 14:30:37 -07:00
Donald Alan Morrison
4f80c54884
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:26:35 -07:00
Donald Alan Morrison
9a8d1ca8b8
Silenced Static Analyzer Warning by removing unneeded assignment. (Value never read.)
2012-08-20 14:18:12 -07:00
Donald Alan Morrison
cbeb2bb1b9
Silenced warning of function override by category implementation, by surrounding with a clang pragma.
2012-08-20 14:08:49 -07:00
Donald Alan Morrison
e6e0684ecb
Added explicit cast to silence warning of implicit cast.
2012-08-20 14:01:48 -07:00
ningxu
84a946f676
Update cocos2dx/platform/mac/CCGL.h
...
add VAO support
2012-08-20 23:07:43 +08:00
James Chen
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
James Chen
0861877594
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
2012-08-20 16:32:22 +08:00
James Chen
7eb5d85298
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb
2012-08-20 15:49:24 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
minggo
738f150ecd
fixed #1377:reset texture parameter of CCTMXLayer after coming to foreground on android
2012-08-20 14:06:29 +08:00
James Chen
b63d4d7702
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_bb
2012-08-20 11:40:23 +08:00
James Chen
63888a7eb5
issue #1432 : MutiTouchTest crashes on IOS if putting more than 5 fingers on the screen.
2012-08-20 10:38:21 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
minggo
316c484936
Merge pull request #1173 from mustime/bug1284
...
issue #1284 : add detection for I9100 model
2012-08-16 18:39:28 -07:00
James Chen
797c15b9a2
Merge pull request #1188 from dumganhar/gles20
...
fixed #1419 : Updated eclipse project configurations for linux port.
2012-08-16 03:22:40 -07:00
James Chen
48fa8a4e88
fixed #1419 : Update eclipse project configurations for linux port.
2012-08-16 18:09:01 +08:00
minggo
756a7e3b0c
Merge pull request #1186 from minggo/gles20
...
remove some unneeded codes
2012-08-15 23:53:22 -07:00
minggo
714b9ef838
remove some unneeded codes
2012-08-16 14:51:58 +08:00
James Chen
3c33c43fd4
fixed a bug in CCActionInterval.cpp.
...
CCSequence::create(pAction2, CCDelayTime::create(d1 - d2)); ~> CCSequence::createWithTwoActions(pAction2, CCDelayTime::create(d1 - d2));
2012-08-16 14:29:27 +08:00
James Chen
605f63f2b7
Merge branch 'gles20' into minggo_iss1405
2012-08-16 12:04:44 +08:00
minggo
416ce6b91d
fixed #1430 : add some comment
2012-08-16 11:45:52 +08:00
minggo
6a9da80292
fixed #1430 : compute correct label's width or height when its value is 0
2012-08-16 11:43:44 +08:00
James Chen
de2c00b7ae
issue #1405 : fixed some compile error on win32 and linux.
2012-08-16 11:30:25 +08:00
minggo
bcf61cdf26
issue #1405:use enum to distinguish target
2012-08-16 10:21:15 +08:00
minggo
4a97f52cd4
issue 1405:implement CCFileUtils::getResourceDirectory() on iOS
2012-08-15 16:03:55 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
mustime
0933a032e9
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1284
2012-08-14 09:41:18 +08:00
mustime
89f0508043
issue #1284 : add detection for I9100 model
2012-08-13 17:14:33 +08:00
Walzer
d99b7463b7
Merge pull request #1172 from walzer/gles20
...
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 08:34:58 -07:00
Walzer
9681c8d690
fix the out-of-range crash in CCArray::randomObject()
2012-08-11 23:31:51 +08:00
Walzer
e964e861f2
Merge pull request #1162 from tongpengfei/gles20
...
fixed linux FontTest vertical alignment
2012-08-11 07:32:32 -07:00
Walzer
a77a4eac03
add more details in doxygen comments.
2012-08-10 13:58:34 +08:00
James Chen
ba78ac7d6d
issue #1405 : Remove unused method 'CCEGLView::getFrameSize' for ios port.
2012-08-09 18:28:49 +08:00
James Chen
03c2366821
Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-09 17:50:39 +08:00
James Chen
6e2cace72d
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
2012-08-09 17:19:20 +08:00
James Chen
a7ce8f2e21
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res
2012-08-09 17:16:10 +08:00
pengfei tong
82a2b9819c
[LOG] remove noused code
2012-08-09 16:57:16 +08:00
pengfei tong
075a2a6a8a
Merge branch 'test' into gles20
2012-08-09 16:41:24 +08:00
pengfei tong
188e267e7a
[FIX] FontTest vertical alignment
2012-08-09 16:35:43 +08:00
pengfei tong
11be0edb06
[FIX] FontTest vertical alignment
2012-08-09 16:08:16 +08:00
minggo
c31415b7bd
issue #1405:resolution supports on mac
2012-08-09 14:34:20 +08:00
James Chen
826dfe4102
issue #1405 : multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method.
2012-08-09 12:49:33 +08:00
Walzer
7863375cf8
issue #1424 , http wrapper compiled pass on linux
2012-08-09 11:15:06 +08:00
Walzer
08198c082e
issue #1424 , http wrapper has been tested on iOS, mac, android port.
2012-08-09 10:45:11 +08:00
minggo
c34812567f
issue #1405 : modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector
2012-08-09 10:23:39 +08:00
minggo
cc39dc55f4
issue #1405:remove unneeded functions of CCFileUtils
2012-08-08 18:39:33 +08:00
minggo
3395bba327
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-08 17:42:45 +08:00
minggo
3853611e62
issue #1405:support loading resources from directory defined by developer
2012-08-08 17:42:04 +08:00
minggo
f6115d5667
issue #1405:zoom out work ok
2012-08-07 18:24:45 +08:00
minggo
5d8f909af4
issue #1405:multi resolution works ok
2012-08-07 14:29:46 +08:00
minggo
9ccf3cefdf
fixed #1417:add header search path and add CCTouch.cpp into mac project
2012-08-06 11:08:06 +08:00
James Chen
e9aa3743fa
issue #1405 : muti-resolution works ok on linux.
2012-08-03 13:56:18 +08:00
James Chen
ed69b62461
fixed #1419 : Update cocos2d.h.
2012-08-03 11:16:34 +08:00
James Chen
086e63103d
fixed #1419 : Merge gles20 linux port.
...
There are still some issues:
1. CocosDeshionTest crash.
2. FontTest result is not correct.
2012-08-03 11:07:59 +08:00
James Chen
9c26e38563
Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20
2012-08-03 10:10:33 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
c82c8412a8
[LOG] fix makefile
2012-08-02 13:19:40 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
minggo
5399aac590
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-02 10:50:15 +08:00
minggo
426a52447d
issue #1405:correct touch coordinate when enable retina with retina supportted device
2012-08-01 18:44:10 +08:00
minggo
0b2396c54b
issue #1405:support three type of resolution
2012-08-01 16:56:12 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
Walzer
dc37896ed9
change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs
2012-08-01 13:24:23 +08:00
Walzer
ba224cc283
add CCTouch.cpp into proj.win32, android.mk, xcode4 template.
2012-07-31 23:32:19 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
mustime
1a55b7c5ba
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381
2012-07-27 18:29:57 +08:00
mustime
5bc130dee7
issue #1381 : change the setContentSize interface in CCScrollView
2012-07-27 18:20:11 +08:00
mustime
9949a34669
issue 1381: change setContentSize(CCSize size) to setContentSize(const
...
CCsize & size) in CCNode
2012-07-27 16:57:56 +08:00
minggo
7bfc88c568
Merge pull request #1130 from mustime/bug1284
...
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 20:31:51 -07:00
mustime
bfc53e3453
issue #1284 : using OpenSL for playing effects on I9100
2012-07-26 15:30:09 +08:00
James Chen
18b1d097c7
Merge pull request #1126 from dumganhar/gles20
...
fixed a compile error on win32.
2012-07-25 22:56:46 -07:00
minggo
16c469fa4e
Merge pull request #1127 from mustime/bug1381
...
issue #1381 : change the setContentSize interface in the subclasses of CCNode
2012-07-25 21:39:44 -07:00
mustime
9ad241c8f8
issue #1381 : change the setContentSize interface in the subclasses of
...
CCNode
2012-07-26 12:03:37 +08:00
James Chen
b716f4ff62
fixed a compile error on win32.
2012-07-26 11:42:31 +08:00
Nat Weiss
9f0be2de05
Added Mac cpp HelloWorld and Tests.
2012-07-24 19:07:31 -07:00
minggo
ed6b396782
fixed #1403:support png8
2012-07-24 16:43:48 +08:00
minggo
0a2570fec7
fixed #1383:save UserDefault.xml to Library/caches
2012-07-24 11:34:20 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
James Chen
9a6729551c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399
2012-07-23 11:59:47 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00
James Chen
7f6ffef8cf
issue #1399 : Set the flag 'LinkIncremental' value to false.
2012-07-23 11:47:27 +08:00
minggo
ac70f8def5
Merge branch 'gles20-adjust-structure' into merge
2012-07-23 11:36:46 +08:00
minggo
f38629fbfc
Merge pull request #1109 from NatWeiss/addmac4
...
Adding Mac support!
2012-07-22 19:48:52 -07:00
Nat Weiss
fcfea04bbc
iPad detection is now where it belongs in CCApplication.
2012-07-21 11:46:42 -07:00
Nat Weiss
a4760698ca
Determines whether to use iPad graphics statically, so if the window is resized the graphics loaded are consistent.
2012-07-21 11:35:28 -07:00
Nat Weiss
dc7ce1cd0f
Improved mac file utils and event responsiveness.
2012-07-21 02:19:03 -07:00
James Chen
5e5b008742
issue #1399 : Built four android projects(HelloCpp, HelloLua, TestJavascript, TestCpp) successfully on Ubuntu System.
2012-07-21 13:49:20 +08:00
Nat Weiss
d4b6d1262b
Adding Mac support!
2012-07-20 21:23:40 -07:00
James Chen
557f654cf3
Built successfully on android.
2012-07-20 17:06:00 +08:00
James Chen
77f1fba566
issue #1399 : Adjust folder structure, made it built successfully on win32.
2012-07-20 14:05:52 +08:00
minggo
7467d254d4
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399_adjust_structure
2012-07-19 17:26:39 +08:00
minggo
f9c40f7372
issue #1399 : work ok on iOS after adjusting directory structure
2012-07-19 17:22:36 +08:00
Yasith Vidanaarachchi
59a3bd1a9a
Fix the re-assigning of texture rectangle to consider sprite frame's orientation.
...
If the progress sprite is vertical, in the sprite sheet it's rendered incorrectly without this fix.
2012-07-17 15:56:58 -03:00
Walzer
5bec3b3ac3
CCTextureCache.cpp:L532, tex -> texture
2012-07-14 23:44:56 +08:00
Walzer
a46c53421c
consistent the variable name in different functions.
2012-07-14 15:21:42 +08:00
Walzer
e6ae45e1b2
fixed issue #1395 , which was reported at https://github.com/cocos2d/cocos2d-x/issues/1095
2012-07-14 15:06:11 +08:00
Luis Vallejo
c9408b7b75
Fixed Spelling Error CCObject::isSingleRefrence to CCObject::isSingleReference
2012-07-14 09:56:07 +08:00
minggo
fd04f2024b
Merge pull request #1094 from NatWeiss/fixxcode42
...
Fixes a compilation error for Xcode 4.2
2012-07-10 21:08:32 -07:00
Nat Weiss
d77d10a974
Fixes a compilation error for Xcode 4.2 and still maintains compatibility with Xcode 4.5.
2012-07-10 21:01:32 -07:00
mustime
50289655a5
fixed #1381 : fixed different declaration on CCLayerColor::setContentSize
2012-07-10 09:13:49 +08:00
James Chen
502982fda7
Merge pull request #1091 from NatWeiss/fixwin32il
...
fixed #1390 : Fixes Win32 error "The application failed to initalize properly".
2012-07-09 01:37:20 -07:00
Nat Weiss
ee12785c6a
Fixes Win32 error "The application failed to initalize properly 0xc000000d"
2012-07-08 23:54:29 -07:00
mustime
e289ce628c
fixed #1379 : Fixed typing error in CCNode.cpp line74
2012-07-09 14:45:04 +08:00
Nat Weiss
43d40bd5a0
Fixes a few Xcode 4.5-specific error messages.
2012-07-08 22:37:19 -07:00
James Chen
cc718ea406
Merge pull request #1087 from ngocdaothanh/patch-4
...
fixed #1372 : Fix compilation error: platform/android/CCEGLView.h:30.
2012-07-08 18:57:16 -07:00
Ngoc Dao
14a23ced56
Fix compilation error: platform/android/CCEGLView.h:30:39: error: platform/CCPlatFormMacros.h: No such file or directory
2012-07-06 10:32:54 +09:00
simdm
d3d42f12c4
fixed #1081 cocosbuilder , error when loading CCControlButton from ccbi
2012-07-05 00:49:51 +08:00
James Chen
fa1f8fe8f6
fixed #1371 : Particle crashes if setAutoRemoveOnFinish(true).
...
Scheduler: removeUpdateFromHash calls [target release] at the very end to prevent a possible crash.
2012-07-01 21:17:44 +08:00
minggo
7348fa12c3
update CHANGELOG and delete some unneeded files
2012-06-28 11:47:54 +08:00
James Chen
a20a80323b
fixed #1367 : using CCString::createWithContentOfFile in CCBMFontConfiguration::parseConfigFile.
2012-06-27 17:04:54 +08:00
James Chen
bde351dda7
fixed a bug in CCSpriteFrame::getTexture.
...
if( m_strTextureFilename.length() <= 0 ) // logic error, must be > 0
{
return CCTextureCache::sharedTextureCache()->addImage(m_strTextureFilename.c_str());
}
2012-06-27 15:04:42 +08:00
James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
minggo
4f5d1d06e5
modify cocos2d-x version
2012-06-26 15:37:47 +08:00
minggo
16310cb544
fixed #1364:add paused state
2012-06-26 11:02:19 +08:00
James Chen
5274fc378d
fixed a typo in CCScene.h.
2012-06-21 13:48:57 +08:00
Ngoc Dao
28cc77008d
"node" -> "create"
2012-06-21 14:33:27 +09:00
Walzer
9eab0c19f8
add groups to all classes for doxygen
2012-06-20 18:09:11 +08:00
Walzer
d7162fcfc5
Add groups in all classes for doxygen. Upgrade doxygen to 0.8.1
2012-06-20 18:07:27 +08:00
James Chen
f8ebbccb98
fixed #1292 : Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify
2012-06-20 14:38:13 +08:00
James Chen
24e3ec7499
fixed #1336 : Updated comment information for deprecated apis.
2012-06-20 14:31:36 +08:00
James Chen
d3d3288e09
fixed #1336 : Updated CCScene.h.
2012-06-20 12:03:50 +08:00
James Chen
b818c0afa6
fixed #1336 : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces.
2012-06-20 11:48:31 +08:00
James Chen
07b9db8e91
Merge branch 'gles20' into gles20-ccbi
2012-06-19 17:28:31 +08:00
James Chen
c4056b1bb0
fixed #1269 : Updated include search paths for win32 and android.
2012-06-19 17:22:55 +08:00
James Chen
591566b43a
fixed #1335 : Memory leaks in cocos2dx and CCBReader.
2012-06-19 16:31:26 +08:00
minggo
90448ec7d0
issue #1269:fix some compiling error because of including error header files
2012-06-19 16:20:46 +08:00
minggo
2666df9472
issue #1269:mrege latest code and fix conflict
2012-06-19 13:57:33 +08:00
minggo
9ec29d715a
issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx
2012-06-19 13:50:11 +08:00
James Chen
c1883c1237
fixed #1334 : Updated CCScrollView.h
2012-06-19 10:55:52 +08:00
James Chen
da85a36cd1
Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
...
Conflicts:
cocos2dx/extensions/CCScrollView/CCScrollView.h
2012-06-19 10:51:40 +08:00
James Chen
9fa74721a7
fixed #1334 : Add ScrollViewTest to CocosBuilderTest.
2012-06-19 10:34:15 +08:00
Nicolas Gramlich
ac4a56a38c
Fixed CCScrollView (since it was behaving differently compared to the cocos2d-iphone version).
2012-06-18 18:43:53 -07:00
Nicolas Gramlich
6f26ea7a56
Added actual implementation of CCScrollViewLoader. Added ScrollViewTest to CococsBuilderTest.
2012-06-18 13:59:45 -07:00
Nicolas Gramlich
fea4401681
CCBReader: Named a whole bunch of parameters in the CCNodeLoader headers.
2012-06-18 13:41:48 -07:00
Nicolas Gramlich
227683bfa4
Cleaned up CCNodeLoaders by using the Marco instead of having a boilerplate createCCNode method in all the cpp files.
2012-06-18 13:33:19 -07:00
Nicolas Gramlich
aa83408ba7
Addded virtual destructors to all classes in the CCBReader extension. CCBReader: named some parameters in the header.
2012-06-18 12:03:06 -07:00
Nicolas Gramlich
2f3fed2562
CCNodeLoader: Replaced manual deletes with 'safe' Macros.
2012-06-18 11:43:46 -07:00
minggo
6d0608d0f1
fixed #1333 : add CCScrollView for iOS
2012-06-18 19:24:47 +08:00
James Chen
c3653f651a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20-ccbi
2012-06-18 19:02:02 +08:00
James Chen
f346d09449
issue #1333 : Added CCScrollViewLoader. Not implement.
2012-06-18 19:00:26 +08:00
James Chen
579e6a1100
issue #1333 : export CCTouch class.
2012-06-18 18:32:17 +08:00
James Chen
b66be55156
issue #1333 : Use CC_PROPERTY instead of CC_PROPERTY_PASS_BY_REF for m_tContenSize
2012-06-18 18:31:29 +08:00
James Chen
85ff705415
fixed #1333 : added CCScrollView to extension.
2012-06-18 18:30:07 +08:00
minggo
c1f5d173ef
fixed #1332 : add cocos2d version
2012-06-18 16:16:09 +08:00
James Chen
453a7c63d3
issue #1330 : Some memory leaks fixes.
2012-06-16 14:31:57 +08:00
James Chen
ec75695a4f
issue #1330 : Added virtual destructor for interfaces.
2012-06-16 13:04:23 +08:00
James Chen
73c9707d5d
CCBIReader fixes + building and running flawless on iOS and Android.
...
Made it works on win32.
2012-06-16 12:48:20 +08:00
James Chen
ab3dd66167
Merge branch 'gles20-ccbi' of https://github.com/nicolasgramlich/cocos2d-x into gles20-ccbi
2012-06-16 11:05:28 +08:00
Nicolas Gramlich
13bcf2180c
Merge with gles20.
2012-06-15 16:26:10 -07:00
Nicolas Gramlich
54944ab1f9
Fixed a comment.
2012-06-15 16:06:54 -07:00
Nicolas Gramlich
f0c1a4001c
Removed CC_FONT_LABEL_SUPPORT since it wasn't defined anywhere and now custom TTF fonts work.
2012-06-15 14:06:01 -07:00
Nicolas Gramlich
420d9ef41b
Fixed fntFile and fontTTF properties not having the full path prexifed, if they are non system fonts.
2012-06-15 14:01:57 -07:00
folecr
90a6a65404
Modify source.dir to match updated directory name
2012-06-15 09:24:10 -07:00
James Chen
cc572ab8e7
fixed #1329 : Moved all java files part of engine into a certain directory, then all projects refer to them.
2012-06-15 18:15:43 +08:00
James Chen
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
minggo
899022d107
fixed #1292:fix some bugs that caused by modify function name
2012-06-15 17:39:13 +08:00
James Chen
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
James Chen
61719d813e
fixed #1292:make some function names more readable.
2012-06-15 16:47:54 +08:00
James Chen
595a402c83
fixed #1292:make some function names more readable.
2012-06-15 16:47:30 +08:00
James Chen
e7628de857
fixed a warning in CCScale9Sprite::initWithBatchNode.
2012-06-15 15:36:36 +08:00
James Chen
0afdfe33da
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 15:25:37 +08:00
James Chen
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
minggo
266a5e5e66
Merge pull request #1028 from minggo/iss1292_moidify_function_name
...
issue #1292:make some function names more readable
2012-06-15 00:14:13 -07:00
minggo
d0f905992a
issue #1292:make some function names more readable
2012-06-15 15:10:40 +08:00
folecr
6fc2dc5ed9
Use Java code instead of XML to define layout
...
* Android layout for cocos apps are very simple (full screen)
* Avoids creation of R.java for loading the layout
* Can package entire library in jar
* Remove unused layout resource
2012-06-14 19:52:45 -07:00
folecr
4e5a64fd9e
Minimal layout directives in XML
2012-06-14 19:52:45 -07:00
James Chen
3a5ba4a24c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-15 10:52:31 +08:00
James Chen
4c1ca36aa8
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-15 10:51:53 +08:00
minggo
c965c8d770
fixed 1181: synchronize latest codes
2012-06-15 10:27:52 +08:00
folecr
b6164c7590
Create a library named cocos2dandroid
...
* Based on sources from HelloWorld that should be common across all cocos2d-x android projects
* Rename, use prefix cocos2dx_default_ for items in layout
* Project files for android library, targeted to android-8
2012-06-14 19:21:02 -07:00
Nicolas Gramlich
8d7dce0999
Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.
2012-06-14 18:16:54 -07:00
Nicolas Gramlich
a7ad34864f
CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.
2012-06-14 14:23:53 -07:00
Nicolas Gramlich
c7daca43d0
CCNodeLoaderLibrary: Now free from direct std::string usage.
2012-06-14 13:51:32 -07:00
Nicolas Gramlich
2554f25cd8
CCString: Added CCStringCompare operator (can be used i.e. in stl containers).
2012-06-14 13:50:47 -07:00
minggo
221be759c6
issue #1324 : merge James Chen's codes
2012-06-14 18:54:05 +08:00
minggo
9d9e2579e3
issue #1181 : save render texture when comming to background
2012-06-14 18:37:57 +08:00
James Chen
052d8ea931
fixed #1324 : Added some create methods. Compiling successfully on win32 by vs2008.
2012-06-14 18:32:44 +08:00
James Chen
3a410c14a1
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create
...
Conflicts:
cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
cocos2dx/label_nodes/CCLabelBMFont.cpp
cocos2dx/menu_nodes/CCMenuItem.cpp
cocos2dx/menu_nodes/CCMenuItem.h
cocos2dx/misc_nodes/CCRenderTexture.h
cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
tests/tests/LabelTest/LabelTest.cpp
2012-06-14 17:36:31 +08:00
James Chen
740e28dbc1
issue #1324 : Uncommented old interfaces.
2012-06-14 17:29:23 +08:00
James Chen
7fe3f7357e
issue #1324 : Reverted old interfaces.
2012-06-14 17:18:05 +08:00
Nicolas Gramlich
4c6bf89167
Cleaned up public interface of CCNodeLoaderLibrary (now takes either const char * or CCString, instead of std::string).
2012-06-14 01:16:54 -07:00
James Chen
23574172ff
issue #1324 : Added create() for static member functions that new an autorelease object, updated cocoa folder.
2012-06-14 16:05:58 +08:00
James Chen
3f7b44fc23
issue #1324 : Added create() for static member functions that new an autorelease object
2012-06-14 15:13:16 +08:00
Nicolas Gramlich
cdd1fb50ac
Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*
2012-06-14 00:01:01 -07:00
Nicolas Gramlich
8e67d3e2d6
Enhanced CCString with two 'constructors' and a compare function.
2012-06-13 23:56:21 -07:00
minggo
e3a84c70e9
Merge pull request #1020 from minggo/iss1257_CCGrabber
...
fixed #1257 : make CCGrabber the same logic with iphone version
2012-06-13 23:42:37 -07:00
minggo
f742de1de3
fixed #1257 : make CCGrabber the same logic with iphone version
2012-06-14 14:41:02 +08:00
minggo
b3fb5e6d4c
fixed #1293:rename getFrames to getTotalFrames and return correct value
2012-06-14 10:49:53 +08:00
Nicolas Gramlich
0c4a6be8ff
Added missiong cpp files in Android.mk. Android build now successful.
2012-06-13 16:05:31 -07:00
Nicolas Gramlich
d4a19f4296
CCNodeLoader.h: Added parameter names.
2012-06-13 15:57:59 -07:00
Nicolas Gramlich
67ab3a1bcc
CCSpriteLoader: Fixed a bug calling the wrong superclass method.
2012-06-13 15:57:33 -07:00
Nicolas Gramlich
5550d9f2b0
Merge with gles20.
2012-06-13 15:56:52 -07:00
Nicolas Gramlich
3e61e1f014
Updated Android build files to new CCBReader. Fixed a bunch of compiler errors/warnings when building for Android.
2012-06-13 15:25:59 -07:00
Nicolas Gramlich
de95e2c1ed
Applied changes/fixes brough up by minggo.
2012-06-13 14:33:39 -07:00
Nicolas Gramlich
e2a1a246a0
Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files.
2012-06-13 14:26:28 -07:00
Nicolas Gramlich
29b22adccc
Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work.
2012-06-13 14:19:13 -07:00
minggo
9321a8d025
fixed #1322 : vertical alignment works ok on android
2012-06-13 18:33:44 +08:00
minggo
15ad463fbe
issue #1322 : vertical alignment ok on iOS
2012-06-13 16:20:58 +08:00
minggo
2460a9f41e
Merge pull request #1016 from minggo/gles20
...
issue #1310 : modify some format
2012-06-12 20:24:34 -07:00
minggo
ec4a21eaf4
issue #1310 : modify some format
2012-06-13 11:23:43 +08:00
minggo
2f17e131e6
Merge pull request #979 from icewind/gles20
...
Override setOpacity to affect a background sprites
2012-06-12 19:49:40 -07:00
Nicolas Gramlich
895604f42e
Unified Header Guards. Added CCNodeLoaderListener, simulating the didLoadFromCCB selector.
2012-06-12 11:59:49 -07:00
Nicolas Gramlich
26d470f411
CCLabelTTFLoader: Now applying vertical alignment.
2012-06-12 11:30:36 -07:00
James Chen
08fc714a7f
issue #1310 : Reverted floatr to CCTimer.
2012-06-12 17:07:54 +08:00
James Chen
94a389ad06
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-12 14:34:17 +08:00
James Chen
b770010c41
issue #1310 : Updated LabelTest. Added init method for CCLabelBMFont. Fixed a bug in CCLabelAtlas::initWithString.
...
In CCSpriteBatchNode::initWithTexture, when capacity is equal to 0, set it to default value.
2012-06-12 14:33:53 +08:00
minggo
916b276607
issue #1310 : synchronize CCTexturePVR
2012-06-12 12:02:15 +08:00
minggo
36455a90e1
Merge pull request #998 from minggo/gles20
...
set font size when changed
2012-06-11 18:44:20 -07:00
minggo
9c58f13abb
set font size when changed
2012-06-12 09:43:27 +08:00
Nicolas Gramlich
e52d5ae223
CCSpriteFrameCache: Minor optimization.
2012-06-11 18:31:36 -07:00
Nicolas Gramlich
1f2652a8d7
Made CCBIReaderTest finally work completely. =) Also added support for having a root path when loading a ccb-file (i.e. when you have the two directories, one for the ccb files, one for the spritesheets. <- With a common ancestor.)
2012-06-11 18:31:11 -07:00
Nicolas Gramlich
58b53be708
Merge with gles20.
2012-06-11 11:50:32 -07:00
Nicolas Gramlich
9c52fce5d2
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-06-11 10:43:27 -07:00
Nicolas Gramlich
4378731418
Merge with gles20.
2012-06-11 10:43:07 -07:00
James Chen
be362bef9b
issue #1310 : Some typo fixes. Updated CCTexture2D.h/.cpp.
2012-06-11 21:58:04 +08:00
James Chen
62f87c18a2
issue #1310 : Exported CCCatmullRomTo class and ccCardinalSplineAt function.
2012-06-11 20:02:40 +08:00
minggo
ccbfd24c21
issue #1310 : synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest
2012-06-11 18:25:57 +08:00
James Chen
b61ad6cdba
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-11 14:45:09 +08:00
James Chen
2ce7c86c50
fixed #1315 : TileMapTest can't be shown correctly in retina mode.
2012-06-11 14:44:32 +08:00
minggo
55ee220245
Merge pull request #993 from minggo/gles20
...
issue #1310 : synchronize CCLabelTTF
2012-06-10 23:37:31 -07:00
minggo
b4899ae46d
issue #1310 : synchronize CCLabelTTF
2012-06-11 14:36:25 +08:00
James Chen
bd535c3c1c
issue #1310 : Fixed a bug that 3d effect can't be displayed correctly in retina mode.
2012-06-11 11:53:17 +08:00
James Chen
33ea7905a5
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/platform/ios/CCFileUtils.mm
2012-06-11 11:01:36 +08:00
James Chen
c95cbb1774
issue #1310 : Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status.
...
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
2012-06-11 10:59:57 +08:00
minggo
94235d3602
issue #1310 : make tests and HelloWorld work ok
2012-06-11 10:41:52 +08:00
minggo
c8c696a2df
Merge pull request #989 from NatWeiss/gles20
...
Fixed a few release-mode Xcode warnings about unused parameters.
2012-06-09 03:13:22 -07:00
Nat Weiss
70fa2ec3cb
Fixed a few release-mode Xcode warnings about unused parameters.
2012-06-08 13:52:40 -07:00
Nicolas Gramlich
1e9656854b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 10:22:25 -07:00
James Chen
c9dc60b0f7
issue #1310 : fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project.
2012-06-08 17:58:21 +08:00
James Chen
371b3f9938
issue #1310 : Tests project updated!.
2012-06-08 17:34:15 +08:00
James Chen
a40dfa427a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 17:15:32 +08:00
James Chen
9ff7dcd96d
issue #1310 : Removed some functions.
2012-06-08 17:15:00 +08:00
minggo
913707f259
Merge pull request #983 from NatWeiss/gles20
...
Allows Cocos2D-X to be built for iOS including all cpp files
2012-06-08 01:55:19 -07:00
James Chen
12a9d13443
issue #1310 : Synchronize to RC2, HelloWorld works ok on win32.
2012-06-08 16:54:38 +08:00
James Chen
76a560a474
issue #1310 : Made CCFileUtils as a singleton.
2012-06-08 16:22:57 +08:00
James Chen
35e9e44e39
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-08 15:31:23 +08:00
minggo
6b7a59f007
issue #1310:synchronize CCLableAtlas and CCLabelBMFont
2012-06-08 15:29:47 +08:00
James Chen
6cf608effd
issue #1310 : deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h.
2012-06-08 15:17:15 +08:00
James Chen
4a887ac598
issue #1310 : Updated CCScene.h.
2012-06-08 15:03:18 +08:00
Nat Weiss
6ee3db827c
Allows Cocos2D-X to be built for iOS including all cpp files.
2012-06-07 23:52:15 -07:00
James Chen
fd2d9a8aa6
issue #1310 : Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'.
2012-06-08 14:50:41 +08:00
James Chen
c8dfe7f92b
issue #1310 : Finished CCRenderTexture.h(.cpp).
2012-06-08 14:30:55 +08:00
minggo
9a600c6221
issue #1310 : syncronize base_nodes
2012-06-08 14:17:39 +08:00
James Chen
26cf81e42e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/CCScheduler.h
cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen
c5cf23c859
issue #1310 : First commit since sync to rc2.
2012-06-08 14:11:48 +08:00
minggo
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
Nat Weiss
ed43e6a90b
Allows Cocos2D-X to be built for iOS including all cpp files.
2012-06-07 21:16:24 -07:00
icewind
b87e932b9f
Override setOpacity to affect a background sprites
...
Calling button->setOpacity was affecting only to label. Now opacity
value applies also to a background sprites
2012-06-07 13:20:30 +04:00
minggo
2b55a76970
Merge pull request #978 from minggo/iss1202_remove_CCFileData
...
fixed #1202:remove CCFileData
2012-06-06 23:15:05 -07:00
minggo
49d8ac72f6
fixed #1202:remove CCFileData
2012-06-07 14:13:44 +08:00
James Chen
f466b081c9
fixed #1308 : Used std::sort to sort the touchHandler array.
2012-06-07 11:38:59 +08:00
Nicolas Gramlich
45d9fc9686
Making use of the new SEL_CCControlHandler in the CCControlExtension.
2012-06-06 14:32:15 -07:00
Nicolas Gramlich
df571e9cbb
CCControlExtension: Added support for SEL_CCControlHandler (as opposed to SEL_MenuHandler), which also passes the CCControlEvent parameter.
2012-06-06 14:31:14 -07:00
Nicolas Gramlich
aefc1e1370
CCBMemberVariableAssigner and CCBSelectorResolver: now using const char * instead of std::string.
2012-06-06 11:43:33 -07:00
Nicolas Gramlich
671a0ef5b4
Removed zombie file: CCBMemberVariableAssigner.cpp.
2012-06-06 11:06:28 -07:00
James Chen
c64c4a74bf
fixed #1308 : Strange TouchDispatcher behavior.
2012-06-06 22:49:28 +08:00
James Chen
4b7f9f582f
fixed #1297 : fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
2012-06-06 15:56:55 +08:00
James Chen
734ea54aba
fixed #1302 : The parameter of CCMenu::setHandlerPriority should be signed int.
2012-06-06 15:16:02 +08:00
James Chen
2238db301b
fixed #1301 : CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
2012-06-06 14:13:40 +08:00
James Chen
6bb2941ec9
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-06 10:06:51 +08:00
Nicolas Gramlich
bcf53f1453
Added CCNodeLoaderLibrary (more of a factory pattern, compared to adding the CCNodeLoaders directly to the CCBReader. Fixed all TODOs regarding (potential) memory leaks (Thanks to Ricardo Quesada). CCNodeLoaders are now autorelease objects (having a static 'loader()' method to be used).
2012-06-05 17:15:28 -07:00
Nicolas Gramlich
c9db868d93
CCLabelTTF: Now internally using std::string instead of std::string *.
2012-06-05 17:12:41 -07:00
Nicolas Gramlich
2d86a4089c
CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *.
2012-06-05 17:11:50 -07:00
Nicolas Gramlich
0702becaf5
CCAutoreleasepool: Fixed typo.
2012-06-05 16:22:42 -07:00
James Chen
56817244ed
fixed #1297 : Retina mode can't work in 'Projection2D' mode.
2012-06-05 15:27:46 +08:00
minggo
7733607fe2
fixed #1296 : fix logical error of CCTMXTileMap::tilesetForLayer()
2012-06-05 10:51:53 +08:00
Nicolas Gramlich
420a731138
Switched from std::string to const char *.
2012-06-04 17:45:25 -07:00
Nicolas Gramlich
d3e0f8dc92
Added support for resolutionScale.
2012-06-04 16:16:42 -07:00
Nicolas Gramlich
28862c30cf
CCNodeLoader: Fixed small memory leak.
2012-06-04 16:03:45 -07:00
Nicolas Gramlich
5c38dd7193
Added CCBMemberVariableAssigner and CCBSelectorResolver.
2012-06-04 15:52:49 -07:00
Nicolas Gramlich
6c5be5e56e
CCScale9Sprite: Removed debug logging.
2012-06-04 15:30:03 -07:00
James Chen
1b4de48e86
Merge pull request #961 from icewind/gles20
...
fixed #1289 : CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
2012-06-03 19:55:39 -07:00
minggo
ae15525e32
Merge pull request #965 from NatWeiss/gles20
...
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
2012-06-03 07:36:17 -07:00
Nicolas Gramlich
bb49eaebe9
Added CCParticleSystemQuadLoader.
2012-06-01 16:45:30 -07:00
Nicolas Gramlich
8576837e5e
CCParticleSystemQuad: Added CCParticleSystemQuad::node().
2012-06-01 16:38:43 -07:00
Nicolas Gramlich
43682e6857
Added CControlLoader and CCControlButtonLoader.
2012-06-01 15:14:18 -07:00
Nicolas Gramlich
2340c93c17
Fixed CCNodeLoader::parsePropTypeSpriteFrame not trying to load 'null' sprites/spritesheets. Also minor renaming.
2012-06-01 15:13:16 -07:00
Nicolas Gramlich
9951ba8ad2
Minor changes.
2012-06-01 15:12:07 -07:00
Nicolas Gramlich
67d9b8ea25
Minor changes.
2012-06-01 15:11:42 -07:00
Nicolas Gramlich
eee8ba7586
CCLabelTTF: Added getters for fontName and fontSize.
2012-06-01 15:11:16 -07:00
Nicolas Gramlich
9576db1e28
CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9)
2012-06-01 15:10:20 -07:00
Nicolas Gramlich
18fba1664d
CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f)
2012-06-01 12:29:48 -07:00
Nicolas Gramlich
8dbe897755
CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a)
2012-06-01 11:59:10 -07:00
icewind
ac268896f1
CCControlButton update. Added zoomOnTouchDown property and setPreferredSize
...
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
2012-06-01 14:07:45 +04:00
Nat Weiss
0fedc8a84a
Enhances CCTransitionScene to work even if there is no running scene.
2012-06-01 00:54:17 -07:00
James Chen
f6ae01c523
Merge pull request #959 from dumganhar/typo_fix
...
Typo fixed in CCGL.h
2012-05-31 23:50:11 -07:00
James Chen
3959fe8f4d
typo fixed in CCGL.h
2012-06-01 14:48:45 +08:00
minggo
63cf48f548
Merge pull request #958 from NatWeiss/gles20
...
fixed #1286 : Fixes the declaration of tgaLoadRLEImageData()
2012-05-31 23:46:36 -07:00
Nat Weiss
472c98b652
Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful.
2012-05-31 23:20:56 -07:00
James Chen
2b235fd705
Delete libEGL.dll(.lib).
2012-06-01 13:56:22 +08:00
James Chen
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
Nicolas Gramlich
62e0c1cda0
Added CCMenuLoader, CCMenuItemLoader and CCMenuItemImageLoader.
2012-05-31 17:07:02 -07:00
Nicolas Gramlich
40f1ffe5fb
CCMenuItem(Image): Added possibility to init without any image. (Changes according to: 5e8518eaed78a6c589bf73dadf85e2056f834f36, 013b4cec0a9250268b131105795e87d37cba4d52)
2012-05-31 17:04:53 -07:00
Nicolas Gramlich
7cb3be2057
Minor change.
2012-05-31 17:01:01 -07:00
Nicolas Gramlich
b63559d86d
Added CCBFileLoader.cpp. Fixed a bug in CCNodeLoader::onHandlePropTypeSize.
2012-05-31 14:57:13 -07:00
Nicolas Gramlich
39442e9bb6
Merged with gles20.
2012-05-31 13:10:51 -07:00
Nicolas Gramlich
4a027082be
Pulled changes from github.
2012-05-31 13:08:33 -07:00
Nicolas Gramlich
8a01e33491
Added CCScale9SpriteLoader.
2012-05-31 12:38:00 -07:00
Nicolas Gramlich
948fcc3d07
CCScale9Sprite: Moved anchorpoint initialization back to updateWithBatchNode, since this is probably the intended location, but causes problems due to the order properties appear in the CCBI file format.
2012-05-31 12:37:28 -07:00
Nicolas Gramlich
8678a14b6e
CCScale9Sprite: Added initialization of insets. Moved setting the default anchorpoint to its constructor.
2012-05-31 12:03:33 -07:00
Nicolas Gramlich
fe9fb347aa
CCScale9Sprite: Added support for insets by floats and CCRect. Fixed bug for positioning for uneven insets. Changing texture no longer affects the anchor point. Made it possible to set the SpriteFrame. (Changes according to https://github.com/YannickL/CCControlExtension/commits/gles20 : d00c4f90ab53d5295bce03123ddbccc4fa0acf58, ed56cb1558c755748437d152f2f7a4bb5a1455ba, c4bbcb9beb2febfb4b55323709e30082af902c90, 5da062de92d39d91b014f87809fc30ba501538fc)
2012-05-31 11:47:16 -07:00
James Chen
63a6b97bc5
fixed #1280 : Renamed some functions.
2012-05-31 15:32:18 +08:00
James Chen
b39af18a5f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1280_labeltest
2012-05-31 13:08:19 +08:00
James Chen
cec50ae2d8
fixed #1280 : BitmapFontMultiLineAlignment test can't work correctly.
...
We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
2012-05-31 13:07:25 +08:00
minggo
9237804b29
modify engine version
2012-05-31 10:14:00 +08:00
Nicolas Gramlich
b7130c3d63
Added (dysfunctional) CCScale9SpriteLoader.
2012-05-30 16:52:02 -07:00
Nicolas Gramlich
6e9fac0a58
Cleanup.
2012-05-30 16:51:33 -07:00
Nicolas Gramlich
36e6d94d46
Added setter for dimensions of CCLabelTTF (According to: 302dd76b4f87ddb18cc571ebec3be0811ea534ca).
2012-05-30 16:49:51 -07:00
Nicolas Gramlich
d0f101b820
Added missing ASSERT_FAIL_UNEXPECTED_PROPERTY in CCNOdeLoader::onHandlePropTypeSize.
2012-05-30 16:14:02 -07:00
Nicolas Gramlich
6b3fa4abb6
Added CCLabelTTFLoader.
2012-05-30 15:38:20 -07:00
Nicolas Gramlich
5578521a69
Fixed CCLabelBMFontLoader (according to changes in: 827ee160b5
).
2012-05-30 15:37:36 -07:00
Nicolas Gramlich
c754dac31b
Added missing case kCCBPropTypeFontTTF in CCNodeLoader::parseProperties.
2012-05-30 15:36:00 -07:00
Nicolas Gramlich
9ca7fa468a
Added default init method for CCLabelTTF (See: 24125b93aad2d4fc7ebf1bc6e4ef6b8b83ff770d).
2012-05-30 15:34:50 -07:00
Nicolas Gramlich
827ee160b5
Added support for initializing a CCLabelBMFont without a fntfile and a string. (See: ffbdb60a5908f5baef227bb0365a0b2653a3a59a, a6749b38f8085ba81921063328bc50cb7a989613, e6e3917c0c3f2e95e13c3be29584cb9e3781d3a7).
2012-05-30 15:31:08 -07:00
Nicolas Gramlich
a7d4fa619d
Removed CCBReader to avoid conflicts.
2012-05-30 11:30:53 -07:00
Nicolas Gramlich
56ea340314
Current state of the CCB(I)Reader (dysfunctional due to CCLabelBMFont problems).
2012-05-30 11:28:50 -07:00
minggo
5ad2bec3d8
Merge pull request #946 from minggo/gles20
...
fix some bug
2012-05-30 03:33:19 -07:00
minggo
a698f9bf69
fix some bug
2012-05-30 18:31:20 +08:00
James Chen
6be44ad7b0
fixed #1279 : NodeNonOpaqueTest can't be shown correctly.
2012-05-30 18:30:11 +08:00
James Chen
93d1879a56
fixed #1277 : CCToggleVisibility should implement copyWithZone.
2012-05-30 16:34:42 +08:00
James Chen
5b4495d982
Opened assert for CCTexture2D::setTexParameters and generateMipmap.
2012-05-30 16:26:47 +08:00
James Chen
bd248b5ac0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-30 16:09:52 +08:00
James Chen
7115a7f3c9
issue #1275 : Memory leaks in CCBReader and ActionsTest.
2012-05-30 16:09:19 +08:00
minggo
80389d0611
Merge pull request #941 from minggo/gles20
...
fix some bugs
2012-05-30 00:44:22 -07:00
minggo
4428810fd5
fixed some bugs
2012-05-30 15:42:29 +08:00
James Chen
b662784730
Merge pull request #940 from dumganhar/gles20
...
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest.
2012-05-29 23:31:36 -07:00
James Chen
265cb135ad
fixed #1273 : Passed 'this' to unscheduleSelector rather than 'g_sharedTextureCache'.
2012-05-30 14:27:30 +08:00
James Chen
895de701ba
fixed #1273 : Crash appears after clicking closed button in TextureCacheTest. Also fixed a bug about memory leak in CCEGLView.cpp(win32). And updated build-win32.bat.
2012-05-30 14:24:59 +08:00
minggo
07c46bb445
fixed #1266 : use flag O_CREAT when creating named semaphore
2012-05-30 11:21:36 +08:00
James Chen
228bc1e044
fixed #1240 : Updated vs2010 project setting.
2012-05-29 17:50:27 +08:00
James Chen
ad50d6ee57
fixed #1270 : Fixed some warning on win32.
2012-05-29 17:11:33 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
c1cb8b0e24
fixed #1177 : Updated Android.mk.
2012-05-29 15:56:08 +08:00
James Chen
6e2c257e43
fixed #1177 : Updated win32 project configuration.
2012-05-29 15:52:38 +08:00
James Chen
5f5af82254
fixed #1177 : Moved CCStdC.h/.cpp to relevant platform folder.
2012-05-29 15:51:13 +08:00
James Chen
94701d9315
fixed #1268 : Testjs will crash after clicking the close button on win32.
...
Also, fixed a bug in CCTextureCache::~CCTextureCache().
2012-05-29 15:23:16 +08:00
Jeff Reitman
821c3933b4
Merge branch 'gles20' into rw_fixes
2012-05-28 07:27:36 -07:00
Jeff Reitman
6c5f309180
Revert "* add ability to disable denshion in lua mode"
...
This reverts commit b7746882f7
.
2012-05-28 07:24:20 -07:00
James Chen
14a218c8cc
Merge pull request #922 from dumganhar/gles20
...
fixed #1240 : Added static libraries of tiff for android.
2012-05-28 01:07:08 -07:00
James Chen
785c3c5d60
fixed 1240# : Added static libraries of tiff for android.
2012-05-28 16:05:52 +08:00
James Chen
6e59d5eab4
fixed #1264 : CCLabelTTF: wrong string alignment when using utf-8 encoded text.
2012-05-28 14:27:32 +08:00
James Chen
99dcb4de86
issue #1263 : Removed CCFileUtils::ccLoadFileIntoMemory in CCFileUtils.mm. Removed some comments.
2012-05-28 14:14:19 +08:00
James Chen
1b7cc47a34
issue #1263 : Removed unused files. Fixed an issue in uthash.h.
2012-05-28 13:59:18 +08:00
Jeff Reitman
6c6fbeef8d
* fix async texture cache not working on IOS due to sem_open requirement
...
* allow semaphore to be unlinked and close no thread exit
* removed firstTry as it can now use s_pSem which is only set when the semaphore is successfully created. Had to move target->retain() under thread creation so we don't leak memory if semaphore fails.
2012-05-27 11:41:12 -07:00
Jeff Reitman
b7746882f7
* add ability to disable denshion in lua mode
2012-05-27 11:03:45 -07:00
James Chen
330b019361
Added jstest project for vs2008.
2012-05-27 22:53:48 +08:00
James Chen
c902e884f4
fixed #1240 : Moved particle files to Particle folder. Fixed a bug in tiff decoding. Refactored CCTextureCache::adddImage.
2012-05-25 16:52:47 +08:00
James Chen
6477a02022
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1240_tiff
2012-05-25 11:00:20 +08:00
James Chen
0b8a75e982
fixed #1240 : Used dynamic libtiff library for win32. Fixed some warnings. Added tiff test in Texture2dTest.
2012-05-25 10:58:28 +08:00
Walzer
df98ed4792
Merge pull request #914 from walzer/gles20
...
javascript binding!
2012-05-24 03:48:14 -07:00
Walzer
1e732930b7
fixed #1258 , testjs and spidermonkey-ios is merged. But only test_actions.js works.
2012-05-24 17:48:05 +08:00
minggo
c258e1e43a
fixed #1247 : add profile lib
2012-05-24 17:47:46 +08:00
James Chen
e5443d22c1
issue #1240 : Added libtiff for android.
2012-05-24 12:00:06 +08:00
minggo
138de3171f
Merge pull request #912 from minggo/merge_nicolasgramlich
...
Merge pull request by nicolasgramlich
2012-05-23 19:56:05 -07:00
minggo
0ba62c3854
issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp
2012-05-24 10:48:39 +08:00
James Chen
6a37158100
issue #1240 : Used TIFFClientOpen instead of TIFFOpen to decode memory data of tiff format.
2012-05-23 18:20:51 +08:00
James Chen
c2591f1e9e
issue #1240 : Added tiff support, run ok on win32. There is a 'FIXME' needed to be fixed.
2012-05-23 17:26:06 +08:00
James Chen
ea48413d2d
fixed #1253 : Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak.
2012-05-23 12:11:53 +08:00
James Chen
c7359ba1a0
fixed #1252 : Added CCEGLViewProtocol::getFrameSize() method for getting the real screen size of device.
2012-05-23 11:57:43 +08:00
James Chen
d5f52335d5
fixed #1224 : Wrote some comments in CCParticleSystem.
2012-05-23 11:26:21 +08:00
James Chen
f7ffdd757c
fixed #1244 : deleted unused method "release" of CCImage class.
2012-05-23 11:22:17 +08:00
James Chen
d998b54269
fixed #1224 : Memory leak in CCParticleSystem::initWithDictionary()
2012-05-23 11:18:04 +08:00
Nicolas Gramlich
d69bc23894
Initial version of CCBReader reading ccbi format. (Only reads and checks the header so far).
2012-05-22 17:38:33 -07:00
Nicolas Gramlich
15ef23bac8
Removed assert which prevented CCSpriteBatchNode from being used as a root node. (Discussed this with Ricardo Quesada)
2012-05-21 17:38:24 -07:00
Nicolas Gramlich
320b181dbf
CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF.
2012-05-21 17:20:47 -07:00
Walzer
9ee1b32c26
Merge pull request #903 from walzer/gles20
...
add CCBReader_v2.cpp in vcproj & vcxproj
2012-05-21 02:58:59 -07:00
Walzer
9ac0b68981
modify CCBReader.cpp to CCBReader_v2.cpp in vcproj/vcxproj.
2012-05-21 17:56:09 +08:00
minggo
683c91bbfa
fixed #1236 : return empty string when parameter is null
2012-05-16 14:17:37 +08:00
minggo
1d18c6607a
fixed #1237 : correct line number output by CCAssert
2012-05-16 14:10:27 +08:00
Walzer
a3bd26a52b
modify CCBReader.cpp to CCBReader_v2.cpp in cocos2dx/Android.mk
2012-05-11 22:40:31 +08:00
Walzer
d6dde5a5ee
move kBottomLeft series enum from CCNode.h to CCBReader.h
2012-05-11 21:10:02 +08:00
Walzer
dc18dc0942
test ccb v2 format, add relative-position support
2012-05-11 20:53:30 +08:00
Walzer
ae12434128
fixed #1205 , rename CCCustomClass to CCCustomClassProtocol, add windows support.
2012-05-08 11:30:08 +08:00
Walzer
f10b94fd15
issue #1205 , CCBReader works on both iOS & Android now; public APIs of CCBReader are reduced; ccb files in subfolder is supported.
2012-05-07 22:52:58 +08:00
Walzer
a91032ccb5
Merge commit 'e895a2a1e8109381329d7cd8e29c780b73643351' into gles20
2012-05-07 18:15:16 +08:00
Walzer
1a73064055
issue #1205 , refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android
2012-05-07 18:14:15 +08:00
minggo
5388e9c863
fixed #1232 : don't do type cast
2012-05-07 17:15:32 +08:00
Walzer
c76e3c0936
remove CppReflection, add CCBCustomClass and CCBCustomClassFactory to implement reflection, leave some jobs to class HelloCocosBuilder: public CCBCustomClass. The approach is not so tricky, much easier to understand now.
2012-05-07 17:05:17 +08:00
minggo
ff6abd1d8c
fixed #1230 : fix a bug in calculating string width
2012-05-07 10:15:57 +08:00
Walzer
07276c3bba
Merge commit '184b31efa3aaa340621f5aa736d3b16e6ad97327' into gles20
2012-05-05 15:49:11 +08:00
Walzer
184b31efa3
fix compilation warnings on android & ios
2012-05-05 10:44:42 +08:00
Walzer
6b374881f0
Merge branch 'gles20' of http://github.com/cocos2d/cocos2d-x into gles20
2012-05-05 10:07:21 +08:00
Walzer
f70855e959
fixed #1229 , reduce the requirement of gles20 branch from NDK android-10 to android-8 level (official android 2.2 image, the lowest version which supports OpenGL ES 2.0), remove EGL dependency.
2012-05-05 10:06:41 +08:00
Walzer
be2fa353a7
Merge commit '1afd7f2701b5e9fec0d2a4fd514d1d4e069b3830' into gles20
2012-05-05 09:55:06 +08:00
minggo
1afd7f2701
Merge pull request #893 from minggo/iss1217_EaseAction_reverse
...
Iss1217 ease action reverse
2012-05-04 01:26:56 -07:00
minggo
14b923409a
fixed #1217 : implement reverse() for all subclass of CCEaseAction that missing it
2012-05-04 16:22:50 +08:00
James Chen
bf0da624b4
issue #1191 : Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.
2012-05-04 11:16:57 +08:00
James Chen
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
minggo
27b5fb8074
merge commit of issue 1216
2012-05-03 16:30:13 +08:00
Walzer
a584aee897
issue #1205 update license declaration
2012-05-03 15:33:22 +08:00
Walzer
ebaf1da460
issue 1205, CCBReader. Not perfect yet, I will use CCNotificationCenter to improve SET macro/assign var to parent.
2012-05-03 15:29:27 +08:00
James Chen
7cdb11b668
fixed #1215 : fixed a bug in retina support for win32.
2012-05-03 15:05:19 +08:00
Walzer
2fc1322cc8
update copyright and license declaration of CCCBReader relative files
2012-05-03 14:43:27 +08:00
Walzer
5faaab0d16
add CocosBuilderTest into extension test. fix a bug in CCLayerGradient::updateColor
2012-05-03 12:17:28 +08:00
Walzer
160b0aba88
Merge commit 'b7b21f3dc2e2c541a06fdd381b6b43d213a90093' into gles20
2012-05-03 12:02:13 +08:00
Walzer
9e62412ce9
issue #1205 , add CCBReader, CppReflection, CocosBuilderTestCase
2012-05-03 11:58:53 +08:00
James Chen
b6a1e89aa5
fixed #1211 : Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file.
2012-05-03 11:09:27 +08:00
James Chen
82439733c5
fixed #1204 : Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest.
...
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
2012-05-03 10:12:00 +08:00
James Chen
ca5ef69d50
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
2012-05-02 18:44:30 +08:00
minggo
4bcf67078d
fixed #1201 : add prebuilt libs
2012-05-02 18:37:37 +08:00
James Chen
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
James Chen
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
James Chen
5fc72581cb
issue #1204 : Removed CCApplication::initInstance.
2012-05-02 17:50:26 +08:00
minggo
c048fe77c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1201_android_build
2012-05-02 14:41:49 +08:00
James Chen
db92c9c1dc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 14:32:27 +08:00
James Chen
a998062c57
issue #1194 : Updated project configuration for android. Null pointer checking in CCNode::removeFromParentAndCleanup.
2012-05-02 12:04:27 +08:00
minggo
741f219f16
issue 1201: remove module to prebuilt
2012-05-02 10:45:21 +08:00
minggo
57d6884757
rename modules to prebuilt
2012-05-02 10:44:40 +08:00
Walzer
2addd06f21
fixed #1203 , remove CCFileUtils::setResource & SimpleAudioEngine::setResource, these 2 methods were created for wophone.
2012-05-02 10:39:17 +08:00
James Chen
de35aaa101
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1194_tex_wat
2012-05-02 09:49:12 +08:00
minggo
cbfe1e0d0c
optimize CCTextureCache::removeUnusedCache()
2012-04-28 11:34:13 +08:00
James Chen
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
James Chen
c5f7f15090
issue #1194 : Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView.
2012-04-27 18:47:49 +08:00
minggo
a4e8c9ad17
fixed #931 : refactor CCImage and CCTexture2D
2012-04-27 18:37:11 +08:00
minggo
a1570e931f
issue #931:make convert to rgb565 and A8 correct
2012-04-27 15:53:29 +08:00
James Chen
fd08f9852b
issue #1194 : Added some files refer to TextureWatcher.
2012-04-27 12:00:54 +08:00
James Chen
2bffd3a565
issue #931 : dynamically allocate array(row_pointers) in CCImage::_initWithPngData.
2012-04-26 18:17:57 +08:00
minggo
602d34ec78
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-04-26 17:36:59 +08:00
minggo
7ecbd8ea6c
issue #931 : refactor CCImage and CCTexture2D
2012-04-26 17:36:32 +08:00
James Chen
ceb5b122b0
fixed #1190 : closed CC_LUA_ENGINE_DEBUG by default.
2012-04-26 14:37:28 +08:00
James Chen
f5ffe8249e
issue #1190 : Updated ios lua project.
2012-04-26 13:05:05 +08:00
James Chen
8d63e9f1bd
issue #1190 : Updated some files for android port.
2012-04-26 11:52:21 +08:00
James Chen
edfb8c1f9c
issue #1190 : used std::string as key of CCDictionary. Updated CCString.pkg, CCArray.pkg, CCDictionary.pkg.
2012-04-26 11:39:49 +08:00
James Chen
96a177bd37
issue #1190 : updated some pkg files for lua binding.
2012-04-26 09:34:42 +08:00
James Chen
1d94ba05a0
fixed #1189 : updated linebreak and tab(4 space) for all source files.
2012-04-25 18:17:04 +08:00
James Chen
a5f0bc3cbc
fixed #1189 : syn 1.0 branch: CCLabelBMFont updateLabel() optimizations and fixes
2012-04-25 18:08:23 +08:00
James Chen
568bdce6c1
fixed #1188 : Removed some unused files.
2012-04-25 17:46:29 +08:00
James Chen
8e5668472f
issue #1188 : Updated project configuration for ios platform.
2012-04-25 17:33:28 +08:00
James Chen
0f36a89c7e
issue #1188 : Refactor directory. Compile successfully on android and win32(vs2008 debug).
2012-04-25 16:18:04 +08:00
James Chen
e8b826b7a6
fixed #1187 : spanish(Buen día) cannot be shown completely in CCLabelBMFont unicode test.
2012-04-25 10:55:59 +08:00
James Chen
062ae1756d
fixed #1177 : updated project configuration for android and ios platforms.
2012-04-24 17:35:36 +08:00
James Chen
f1c5cfef1e
fixed #1177 : Added CCApplicationProtocol.h.
2012-04-24 17:13:13 +08:00
James Chen
26763c200b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
...
Conflicts:
tests/proj.ios/test.xcodeproj/project.pbxproj
2012-04-24 15:44:53 +08:00
minggo
1e20f2b6db
fixed #1185 : reload image data and recreate buffer of object when backing to foreground
2012-04-24 15:02:18 +08:00
James Chen
5e0682ed77
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
2012-04-23 15:41:01 +08:00
James Chen
af86a52f27
issue #1177:Updated some files for ios port.
2012-04-23 15:40:46 +08:00
James Chen
8fd3518160
issue #1177 : fixed a bug about retina in CCDirector.
2012-04-23 15:38:02 +08:00
James Chen
5b77e6e80e
Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform
...
Conflicts:
cocos2dx/platform/CCEGLViewProtocol.cpp
cocos2dx/platform/CCEGLViewProtocol.h
2012-04-23 14:39:27 +08:00
James Chen
24515f009e
issue #1177 : Updated ios project configuration.
2012-04-23 14:35:41 +08:00
James Chen
521155e9e2
issue #1177 : Added some common methods for CCPoint,CCSize,CCRect. Added MutiTouchTest demo.
2012-04-23 14:30:38 +08:00
James Chen
0c6d21c0f9
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform
2012-04-20 17:34:47 +08:00
James Chen
909a759ff6
issue #1177 : Updated android project configuration.
2012-04-20 17:33:28 +08:00
James Chen
d1d0fd619a
issue #1177 : Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration.
2012-04-20 15:23:00 +08:00
minggo
160c94dd46
fixed #1179 : popup message box when invoking CCAssert on Android
2012-04-20 15:12:20 +08:00
minggo
f3d97bd9b6
fixed #1180 : synchronize CCConfiguration
2012-04-20 11:39:12 +08:00
James Chen
dbeb7423ad
Merge branch 'iss1176_refactor' of https://github.com/dumganhar/cocos2d-x into iss1176_refactor
2012-04-19 17:53:15 +08:00
James Chen
f619c3e006
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor
...
Conflicts:
cocos2dx/misc_nodes/CCRenderTexture.cpp
2012-04-19 17:51:58 +08:00
minggo
4e4a26a2db
Merge pull request #855 from minggo/iss1150_rendertexture_crash
...
use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 02:05:04 -07:00
minggo
92043b4db3
fixed #1150 : use texture format kCCTexture2DPixelFormat_RGBA8888 to save image
2012-04-19 17:01:24 +08:00
James Chen
5b50baffd4
issue #1176 : Updated ios project.
2012-04-19 15:03:41 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
84ffaf130a
delete semicolon after NS_CC_BEGIN and NS_CC_END
2012-04-19 11:56:22 +08:00
James Chen
4068be84e9
Refactored project folders.
2012-04-19 11:46:08 +08:00
James Chen
32b53623c7
Removed some unused folders regard to WOPHONE.
2012-04-19 10:52:53 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
James Chen
a950238d1e
updated some files.
2012-04-18 18:45:21 +08:00
James Chen
7d7baf81a2
refactor updated...
2012-04-18 18:43:45 +08:00
James Chen
e673bfae90
fixed #1114 : Updated SchedulerTest and ShaderTest. Used CCControlSlider instead of UISlider. Added some resources.
2012-04-18 13:58:24 +08:00
James Chen
c501255a7a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1114_CCControlExt
2012-04-18 09:40:08 +08:00
James Chen
f8dfe1fca0
issue #1114 : Updated ShaderTest.Added ShaderBlur.
2012-04-17 18:31:31 +08:00
minggo
4d2e2d7183
fixed #1139 : remove unneeded codes
2012-04-17 18:03:48 +08:00
minggo
7750664f8b
fixed #1139 : re add preprocess macro
2012-04-17 18:01:15 +08:00
minggo
cfdc5edf87
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1139_screen_black
2012-04-17 17:55:59 +08:00
minggo
04c0d794af
fixed #1139 : fix the bug that screen becomes black when backing to foreground on Android
2012-04-17 17:55:26 +08:00
James Chen
75da752aa9
issue #1114 : fixed some memory leaks in CCControlExtension.
2012-04-17 17:14:59 +08:00
James Chen
14c10a470a
Updated project configuration for android platform.
2012-04-17 16:41:07 +08:00
James Chen
a215b037b2
fixed a bug in CCControlSwitch.cpp
2012-04-17 16:39:00 +08:00
James Chen
5ce950b961
fixed a memory leak in CCControl.
2012-04-17 16:37:04 +08:00
James Chen
92e44f1c78
Updated ios project configuration.
2012-04-17 16:14:32 +08:00
James Chen
413bc3c343
Finished CCControlSwitch.Added CCActionTween.
2012-04-17 16:00:18 +08:00
James Chen
d4f1dcfc44
finished CControlColourPickerTest.
...
moved extension resources to 'extensions' folder.
2012-04-17 11:12:05 +08:00
James Chen
044729dab9
Updated CCControlExtension
2012-04-16 23:16:03 +08:00
James Chen
959acd556f
first commit CCControlExtension.
2012-04-16 18:58:43 +08:00
James Chen
77919439bc
fixed #1166 : Added CCArray::arrayWithContentOfFile function.
2012-04-16 15:41:01 +08:00
James Chen
0af443a56f
issue #1166 : Checked whether memory is allocated successfully in CCString::initWithFormatAndValist function.
2012-04-16 14:27:49 +08:00
James Chen
be129913a8
issue #1166 : Updated the project configuration for VS2010, android, ios port.
2012-04-16 13:02:44 +08:00
James Chen
a71e5be0d8
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data
...
Conflicts:
cocos2dx/shaders/CCGLProgram.cpp
2012-04-16 12:45:47 +08:00
James Chen
88951bfeec
fixed #1165 : Close retinaDisplay for HelloWorld by default. Removed ENABLE_ALL_SHADER macro. Fixed some issues in CCSprite.cpp.
2012-04-16 12:00:35 +08:00
James Chen
9ace0d2fdc
Fixed memory leaks in CCString and CCDictionary, Updated CCFileUtils_ios.mm.Remove inline prefix for some member function of CCString, so that make it compiled successfully on android and ios.
2012-04-16 10:57:37 +08:00
Phenix Yu
ebc7106164
Merge branch 'gles20' of https://github.com/jbyu/cocos2d-x into gles20
2012-04-15 15:46:16 +08:00
Phenix Yu
e623cd6357
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/include/CCTexture2D.h
cocos2dx/include/ccMacros.h
cocos2dx/textures/CCTexture2D.cpp
lua/cocos2dx_support/LuaCocos2d.cpp
2012-04-15 15:46:01 +08:00
James Chen
d01f1277af
optimize data struct.
2012-04-14 19:11:57 +08:00
phenix.yu
5d9c44f897
add project for iOS
2012-04-14 18:19:30 +08:00
Phenix Yu
61a7ca71c5
fixed getContentSize pass by reference issue
...
update project setting for release mode
2012-04-14 17:13:38 +08:00
James Chen
b780edde7a
By Default, we enable VAO support for ios and win32 and disable it for other platforms.
2012-04-13 18:18:47 +08:00
James Chen
3c0653ffa7
fixed #1164 : 1. Add the render mode which uses VBO without VAO in CCParticleSystemQuad.
...
2. delete some unused codes for win32 port.
3. Add CC_REBIND_INDICES_BUFFER macro.
2012-04-13 17:24:50 +08:00
minggo
34c805590f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director
2012-04-13 14:11:58 +08:00
minggo
b43d5aa654
fixed #1156 syn CCDirector
2012-04-13 14:11:35 +08:00
James Chen
94e056d964
fixed #1160 : Renamed 'CGFloat' to 'CCFloat'.
2012-04-13 14:09:02 +08:00
minggo
a20f3fe638
remove unneeded codes
2012-04-13 11:57:25 +08:00
minggo
9bbac0d33d
issue #1156 : remove unneeded macros and functions
2012-04-13 11:45:41 +08:00
James Chen
f7a1807865
fixed #1158 : Fixed a bug in CCParticleSystemQuad.
...
We need to check whether need to free quads and delete vbo/vao in the destructor.
CCParticleSystemQuad::~CCParticleSystemQuad()
{
if (NULL == m_pBatchNode) // important
{
CC_SAFE_FREE(m_pQuads);
CC_SAFE_FREE(m_pIndices);
glDeleteBuffers(2, &m_pBuffersVBO[0]);
glDeleteVertexArrays(1, &m_uVAOname);
}
}
2012-04-13 11:40:56 +08:00
minggo
028cf7874e
issue #1156 : remove unneeded macros and functions
2012-04-13 11:22:17 +08:00
Phenix Yu
1ed6df9de8
add pixel format I8
2012-04-12 20:44:50 +08:00
Phenix Yu
247bf08d98
fixed content size issue for retina
2012-04-11 19:27:34 +08:00
Phenix Yu
ab8af9e04c
retina for win32
2012-04-11 16:41:12 +08:00
James Chen
da76def60a
Fixed a heap crash in CCDirector, and reverted CCDirector singleton to global variable rather than a pointer.
2012-04-11 12:03:37 +08:00
Phenix Yu
b8e6d9c589
fixed memory leak from CCGLProgram.cpp
...
enable retina for win32
2012-04-11 11:15:53 +08:00
James Chen
2b5af66974
updated win32 projects configuration release version.
2012-04-10 23:09:58 +08:00
James Chen
6823704a46
fixed #1138 : Fixed a memory leak in CCTextureCache::addPVRImage.
2012-04-10 18:17:08 +08:00
James Chen
2885664c85
fixed #1136 : Fixed some bugs as follows:
...
1. Using std::string parameter as the key of CCDictionary
2. Deep copy for CCDictionary and CCArray, the classes of elements's type must implement copyWithZone.
3. Added toBool() function to CCString.
4. Retina support for all platforms.
5. Include "CCString.h" and "cocoa/CCNS.h" in cocos2d.h.
6. Added a new constructor(CCArray::CCArray(unsigned int capacity)) for CCArray. And fixed a bug in CCArray.
7. Fixed a memory leak in CCLabelBMFont.cpp.
8. Fixed an error in strings.xml.
2012-04-10 17:17:24 +08:00
James Chen
137679d369
Fixed a bug in CCFileUtils::dictionaryWithContentOfFile.
2012-04-10 16:32:53 +08:00
James Chen
8271fdd95b
Initialize m_sString pointer.
2012-04-10 15:24:06 +08:00
James Chen
22052db4bd
Fixed a memory leak in CCLabelBMFont.cpp.
2012-04-10 15:14:55 +08:00
James Chen
5ad6c38500
Fixed two memory leaks in CCArray::copyWithZone and CCDictionary::copyWithZone.
2012-04-10 15:01:29 +08:00
James Chen
6cd69523c8
Merge pull request #829 from dumganhar/iss1094_gles20_particlebat
...
issue #1094 : Make ParticleBatchNode works on win32 and fixed some issues as follows:
1. renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
2.fixed a memory leak in CCParticleSystem.
3.init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
4.Add CCAssert in ccArrayRemoveObjectAtIndex.
5.Use new method to allocate CCDirector.
2012-04-08 19:45:38 -07:00
James Chen
b4d74700e4
Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad
...
Conflicts:
tests/tests/ParticleTest/ParticleTest.cpp
2012-04-09 10:28:21 +08:00
James Chen
3d601048c6
Merge pull request #831 from dumganhar/new_ipad
...
fixed #1095 : IOS screen resolution(iphone, iphone-retina, ipad, ipad-retina) support.
2012-04-08 19:02:16 -07:00
James Chen
baa27540a0
Updated the implementation of ccc4f. Initialize the ccResolutionType resolution variable in CCTextureCache::addImage.
2012-04-09 09:55:06 +08:00
Phenix Yu
a05757f741
update for msvc2010
2012-04-09 00:10:12 +08:00
minggo
4c61035231
return correct content size
2012-04-08 22:37:58 +08:00
minggo
86b13a64c4
CCFileUtils::fullPathFromRelativePath() works correct
2012-04-08 14:52:47 +08:00
minggo
9e62841adb
fixed #1089 : win32 support ipad, new ipad
2012-04-08 14:29:16 +08:00
minggo
29be687f0b
merge commit 0e8a8c04a21b7e96a7386237d0e4e4eef2269c89
2012-04-08 14:28:07 +08:00
minggo
75d6972da8
remove unneeded macros
2012-04-08 14:26:50 +08:00
minggo
355e27dada
merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86
2012-04-08 14:16:29 +08:00
James Chen
4baebb8cab
issue #1094 : renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton.
...
fixed a memory leak in CCParticleSystem.
2012-04-08 12:50:15 +08:00
James Chen
64665fe7c8
issue #1094 : Make ParticleBatchNode works on win32.
2012-04-07 12:02:40 +08:00
Walzer
203f40a00d
add shader files correctly in test.xcodeproj, fix a warning in CCLabelBMFont.cpp,
2012-04-06 23:33:42 +08:00
James Chen
df58a09255
Update:
...
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
2012-04-05 18:53:53 +08:00
James Chen
931c42a621
Updated some files.
2012-04-04 21:58:04 +08:00
James Chen
2b17a7276c
issue #1056 : Updated CCTextureAtlas.cpp
2012-03-29 14:33:50 +08:00
James Chen
d7aed75942
issue #1056 : Removed CCNode::arrayMakeObjectsPerformSelector, instead, we defined two macros (arrayMakeObjectsPerformSelector and arrayMakeObjectsPerformSelectorWithObject) to fit for any classes that inherit from CCNode.
2012-03-29 14:30:13 +08:00
James Chen
a0520d8f27
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 11:25:57 +08:00
James Chen
56d5c496e9
issue #1056 : Refactored two macros -- ccArrayMakeObjectsPerformSelector , ccArrayMakeObjectsPerformSelectorWithObject.
2012-03-29 11:25:08 +08:00
James Chen
c759f29d76
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-29 10:11:42 +08:00
James Chen
c6457dfed8
issue #1056 : Updated ios project configuration.
2012-03-29 10:09:41 +08:00
James Chen
a626271b06
issue #1056 : Made setupVBO as CCTextureAtlas's member function.
2012-03-28 22:01:12 +08:00
James Chen
bb7485621e
issue #1056 : Updated ParticleTest, CCParticleSystem, CCParticleSystemQuad.
2012-03-28 21:44:28 +08:00
James Chen
3d63f9c58e
issue #1056 : Set CC_ENABLE_GL_STATE_CACHE = 1, Updated LavaFlow.plist.
2012-03-28 17:51:26 +08:00
James Chen
c73c84f79b
issue #1056 : Fixed a bug in CCDirector::setProjection.
...
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
2012-03-28 17:02:07 +08:00
James Chen
394bb24cf5
issue #1056 : Reverted opengles emulator version to 2.09, because there are some issues in v2.10.
2012-03-27 14:11:28 +08:00
James Chen
3475108953
issue #1056 : Updated Android.mk, fixed a bug in CCImage.h.
2012-03-27 13:48:14 +08:00
James Chen
cef41dfbc5
issue #1056 : Updated opengles2.0 emulator libraries to newest version 2.10@863987. Deleted some files of opengles1.1.
2012-03-27 13:42:35 +08:00
James Chen
0f1ab7ab37
issue #1056 : Updated SpriteTest, reverted the last parameter of glDrawElement in CCTextureAtlas.cpp and CCParticleSystemQuad.cpp.
2012-03-27 10:55:13 +08:00
James Chen
7d04254855
issue #1056 : Updated some files.
2012-03-26 22:37:09 +08:00
James Chen
0f5efaffd2
issue #1056 : Check bugs of SpriteTest.
2012-03-26 18:44:28 +08:00
James Chen
85c13998ee
issue #1056 : Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest.
2012-03-26 16:46:23 +08:00
James Chen
9c9230a43f
#issue #1056 : Updated SpriteTest.
2012-03-23 17:31:28 +08:00
James Chen
0ef65d1ed5
issue #1056 : Renamed CC_COCOSNODE_RENDER_SUBPIXEL to CC_NODE_RENDER_SUBPIXEL in CCNode.cpp
2012-03-23 10:26:36 +08:00
James Chen
900de7328a
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 18:29:26 +08:00
James Chen
c5d0b1ca6f
issue #1056 : Updated ParticleTest.
2012-03-22 18:29:07 +08:00
minggo
a8eaf85cfb
Merge pull request #804 from minggo/RenderTextureTest
...
Rendertexturetest
2012-03-22 01:37:58 -07:00
minggo
39ba6b4618
issue #1506 : RenderTextureTest
2012-03-22 16:36:03 +08:00
James Chen
b1f293e089
issue #1056 : Updated MenuTest. Added CCArray::arrayWithObject function.
2012-03-22 14:22:06 +08:00
James Chen
fc2fd4d353
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-22 09:46:23 +08:00
James Chen
59393c2fef
issue #1056 : Update CCLabelBMFont.
2012-03-22 09:46:07 +08:00
James Chen
2e8bae8ebf
issue #1056 : Update Android.mk. Make tests project being compiled successfully.
2012-03-21 22:49:58 +08:00
James Chen
35d93328b9
issue #1056 : 1.Fixed a bug of double delete TouchDispatcher.
...
2. Modified the last parameter of glDrawElements. It will cause crash on some devices if the last parameter which means Indices's pointer is zero.
2012-03-21 21:53:03 +08:00
James Chen
6f4a01f454
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-03-21 17:35:39 +08:00
James Chen
f529bcd659
issue #1056 : Move some singletons to CCDirector. It is easily managed by CCDirector.
2012-03-21 17:35:20 +08:00
minggo
6242656049
issue #1506 : fix a confict
2012-03-21 17:23:33 +08:00
minggo
92c30a328e
issue #1506 : implement ShaderTest
2012-03-21 17:02:52 +08:00
James Chen
2ac2da9c97
issue #1056 : 1. Removed ChipmunkTest, added ChipmunkAccelTouchTest.
...
2. Added Box2DTest and Box2DTestBed.
Tested on win32.
2012-03-21 15:43:35 +08:00
James Chen
8ef5e4ae3b
issue #1056 : Update the configuration of ios project.Sort the the project folder.
2012-03-21 11:07:31 +08:00
James Chen
00a81f5bd0
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
2012-03-21 10:43:54 +08:00
James Chen
02ae04c1d6
issue #1056 : Modified the configuration of ios project.
2012-03-21 10:41:21 +08:00
James Chen
bb4d7c2f88
issue #1056 : Updated some files for ios platform. Added some 'TODO'.
2012-03-21 10:36:20 +08:00
James Chen
321771a7ea
issue #1056 : Added gles2.0 support for ios platform.
2012-03-21 10:05:23 +08:00
James Chen
7c0af610ff
issue #1056 : Added CCArray::copyWithZone implementation. CCDictElement bound check.
2012-03-20 23:30:18 +08:00
James Chen
15e03f8b14
issue #1056 : Remove old files(CCMutableArray, CCMutableDictionary) reference in vc2008 project.
...
Update CCDICT_FOREACH implementation.
2012-03-20 21:08:52 +08:00
James Chen
b5fca2f5f3
issue #1056 : Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks.
2012-03-20 21:04:29 +08:00
minggo
382e4e7eb8
issue #1056 : modify code according new code after pull
2012-03-20 17:27:06 +08:00
minggo
7ccb38556e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_gles20
2012-03-20 16:10:53 +08:00
minggo
74aaf4c6ca
issue #1056:gles20 runs ok on android
2012-03-20 16:10:12 +08:00
James Chen
ae2b3307fa
Merge pull request #779 from dumganhar/iss1056_CCDict
...
issue #1056 : Removed CCMutableArray and CCMutableDictionary template, offered CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 00:07:58 -07:00
James Chen
6ce06bd906
issue #1056 : Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost.
2012-03-20 15:04:53 +08:00
minggo
39738e4270
issue #1056 : implement ActionsProgressTest and run ok on win32
2012-03-19 18:20:32 +08:00
James Chen
9203b60fb0
add CCDictionary based on UTHASH, improve the performance.
2012-03-19 14:53:44 +08:00
James Chen
f67ac20639
Merge pull request #775 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 02:59:21 -07:00
James Chen
e021ae9821
#1056 : issue #1056 : synchronise cocos2d-iphone-2.0-rc0a, update some files.
2012-03-16 17:56:19 +08:00
James Chen
86a1acc0d8
Merge pull request #774 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-15 22:45:20 -07:00
James Chen
275891dfb0
issue #1056 : synchronise cocos2d-iphone-2.0-rc0a
2012-03-16 13:42:53 +08:00
James Chen
303818ef6d
issue #1056 : Update CCGLProgram.
2012-03-15 10:54:07 +08:00
James Chen
9e89171557
issue #1056 : Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class.
2012-03-15 10:42:22 +08:00
James Chen
673a1ca238
Merge pull request #771 from dumganhar/gles20-dev
...
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 03:15:38 -07:00
James Chen
8aa3f7f9ae
issue #1056 : TestCases works ok except Box2dTest and ChipmunkTest.
2012-03-14 18:11:25 +08:00
James Chen
b8d760064d
issue #1056 : Add CCVertex.h CCVertex.cpp, implement CCMotionStreak.
2012-03-14 16:10:01 +08:00
James Chen
d0f93d38f4
Merge pull request #769 from dumganhar/gles20-dev
...
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 00:00:57 -07:00
James Chen
aefdb852a2
issue #1056 : synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok.
2012-03-14 14:55:17 +08:00
Paolo Giangrandi
4f2f403827
Fixed a broken call to SetTouchInfo in CCEGLView_linux.cpp
2012-03-12 14:22:48 +01:00
Paolo Giangrandi
7820be7841
Fixed a typo: CCAplication_linux.{cpp,h} renamed in CCApplication_linux.{cpp,h}
2012-03-12 14:22:39 +01:00
James Chen
bd59979495
add gles2.0 libraries for win32.
...
add CCGLProgram, ccGLState, CCShaderCache.
add third library---kazmath
2012-03-12 15:22:03 +08:00
minggo
cc7542a86b
Merge pull request #766 from assoulter/master
...
Fix m_nEntryID typo
2012-03-11 20:06:24 -07:00
minggo
7fc0ffbf26
fixed #737 : remove view id
2012-03-12 11:00:12 +08:00
Anton Rusanov
8e53d9db9f
fix m_nEntryID typo for CC_LUA_ENGINE_DEBUG
2012-03-12 00:59:03 +04:00
Wartortle
7321d33aaf
Added support files for Accelerometer Simulation for iPhone Simulator and
...
Unimotion
Ref: http://code.google.com/p/accelerometer-simulator/wiki/Home
Ref: https://github.com/gmarik/unimotion
2012-03-08 11:23:47 +00:00
minggo
7dfe4224e1
Merge pull request #756 from dualface/fix-lua-engine-bugs
...
fixed #1030 : Improve Lua engine
2012-03-07 21:42:35 -08:00
minggo
e9c1e43e27
Merge pull request #755 from dumganhar/iss1022_string_with_file
...
fixed #1022 : Added a static method named CCString::stringWithContentsOfFile.
2012-03-07 21:39:59 -08:00
minggo
645d561276
fixed #737 : remove view id
2012-03-08 12:40:27 +08:00
Liao YuLei
c6c7fb1be6
Improve Lua engine
...
rename executeFunctionByRefId() to executeFunctionByHandler()
add executeFunctionWithCCObject()
add pushIntegerToLuaStack()
add pushFloatToLuaStack()
add pushBooleanToLuaStack()
add pushCCObjectToLuaStack()
2012-03-07 20:27:26 +08:00
James Chen
c91fd243dc
Update cocos2dx/include/CCString.h
2012-03-07 16:15:26 +08:00
James Chen
2564f39eb8
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1022_string_with_file
2012-03-07 16:13:16 +08:00
James Chen
00745ae172
fixed #1022 : add the comment for CCString::stringWithContentsOfFile.
2012-03-07 16:12:46 +08:00
minggo
a0f0971782
fixed #1017 : improve win32 timing accuracy
2012-03-06 14:12:57 +08:00
James Chen
74b4b14ee3
Merge pull request #730 from moadib/qnx_eventhandler
...
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
2012-03-05 18:07:20 -08:00
minggo
ed68855e19
fixed #1009 : fix a typo error
2012-03-06 09:35:36 +08:00
James Chen
fd9dd6c7fe
add stringWithContentsOfFile static method in CCString class.
2012-03-05 11:13:45 +08:00
James Chen
cb1f94df47
revert CCFileUtils::getFileData method.
2012-03-05 09:55:50 +08:00
James Chen
347a8294ac
fixed #1007 : Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
2012-03-03 12:24:02 +08:00
minggo
796ba89e9d
Merge pull request #742 from minggo/iss762_label_position
...
compute correct text rect and display it on center
2012-03-01 22:24:04 -08:00
minggo
2360a9a04e
fixed #762 : let zfont display on center
2012-03-02 14:22:01 +08:00
minggo
5485eb19d9
fixed #762 : compute correct text rect and display it on center
2012-03-02 14:17:22 +08:00
minggo
79495fd743
Merge pull request #741 from minggo/master
...
remove libiconv.a
2012-03-01 19:28:35 -08:00
minggo
c196f2dff2
issue #983 : remove libiconv.a
2012-03-02 11:25:35 +08:00
minggo
528a769cf6
fixed #762 : make label display on center on iOS
2012-03-02 11:15:44 +08:00
James Chen
dfd5adb3bd
fixed #994 : add support for bbndk2.0 on blackberry platform.
2012-03-01 16:52:17 +08:00
James Chen
6c01009a18
fixed #986 : Add init() member funciton of CCMenu class.
2012-02-29 10:07:18 +08:00
James Chen
05bf647ec3
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib
2012-02-28 15:00:18 +08:00
James Chen
7daeb5cd86
fixed #984 : Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler.
2012-02-28 14:59:46 +08:00
minggo
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
James Chen
2bc48219f8
remove libjpeg, libpng, libz project, use them as sources in cocos2dx project.
2012-02-27 18:18:40 +08:00
minggo
be66bec269
Merge pull request #727 from minggo/iss946_retina
...
fixed #946 : HD image for both retina and normal
2012-02-27 00:10:17 -08:00
moadib
de9f8dc441
Added window group id for qnx-version of CCEGLView
2012-02-24 08:40:35 +04:00
minggo
fd9445f6df
add commet for CCArray
2012-02-23 10:06:36 +08:00
moadib
7fcdb3b114
Added CCEGLView::EventHandler class for qnx-platform
2012-02-22 12:27:13 +04:00
minggo
b0b6b85a79
fixed #946 : HD image for both retina and normal
2012-02-16 10:47:16 +08:00
James Chen
e1413dff5e
update linux project configure
2012-02-15 15:57:09 +08:00
James Chen
a2a5af3348
update bada and qnx project settings
2012-02-15 13:52:41 +08:00
James Chen
2ef7b5d413
refactor folders for qnx
2012-02-15 11:26:28 +08:00
James Chen
abbda72b2f
modify bada 2.0 project setting
2012-02-14 23:31:37 +08:00
James Chen
dac63dd2c2
rename include file name from uppercase to lowercase for linux platform
2012-02-14 22:41:33 +08:00
James Chen
3422696145
1.modify some project setting for bada
...
2.rename some files
2012-02-14 22:35:51 +08:00
James Chen
abefe50ef7
modify marmalade project setting
2012-02-14 18:25:20 +08:00
James Chen
4f523bf986
remove .settings folder
2012-02-14 18:06:29 +08:00
James Chen
f8ff388e8d
rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources.
...
test ok on win32 and android
2012-02-14 18:04:56 +08:00
James Chen
e3e016331c
issue #972 : move extensions folder to cocos2dx
2012-02-14 16:08:12 +08:00
James Chen
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
James Chen
0adca5774c
move CCNotificationCenter to extensions folder
2012-02-14 11:45:59 +08:00
James Chen
65b1b20c8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss972_CCNotificationCenter
...
Conflicts:
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
tests/test.win32/test.win32.vcxproj.filters
2012-02-14 11:43:04 +08:00
minggo
c98dd0cf2d
fixed #948 : remove getIndexOfObject()
2012-02-14 10:49:53 +08:00
minggo
538adcec3e
merge code from duleface
2012-02-10 13:56:20 +08:00
James Chen
4b9ee55145
issue #972 : modify project settings for linux and marmalade.
2012-02-10 13:39:39 +08:00
minggo
8b855a917f
issue #973 : refactor lua support
2012-02-10 12:02:46 +08:00
James Chen
81ec2c8586
issue #972 : add support for CCNotificationCenter, and add the test demo for it.
...
modify the project setting for VS2008 and VS2010
2012-02-10 11:48:33 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
YuLei Liao
1d6d966717
fix CCScriptEngineManager::purgeSharedManager()
2012-02-09 20:07:55 +08:00
minggo
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
YuLei Liao
e74b842a58
update HelloLua
2012-02-09 17:48:15 +08:00
minggo
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
minggo
153d2b8192
issue #971 : build cocos2dx as static lib and remove some unneeded codes
2012-02-09 15:49:14 +08:00
YuLei Liao
6ebdf9cb4b
* add CCScriptSupport
2012-02-09 14:07:11 +08:00
dumganhar
ca94a11190
fixed #951 : removed definition of NSMutableSet.
2012-02-07 15:35:10 +08:00
minggo
29c18c67ca
Merge pull request #712 from minggo/ndk_module
...
Use modules in the Android NDK build
2012-02-06 22:36:45 -08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
YuLei Liao
7a96d13fb6
rename all FuncID to Handler
2012-02-07 11:43:29 +08:00
dumganhar
1e807d00c3
fixed #967 : fixed PVR Textures can not be reloaded after GL context lost on android.
2012-02-07 11:18:39 +08:00
minggo
8770976884
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
2012-02-07 10:48:07 +08:00
Wartortle
aa06de2fb3
Second half of commit for adding Accelerometer simulation to Win32.
2012-02-06 11:38:53 +00:00
Wartortle
ffc4457991
On Win32 platform, there's now support for simulating the Accelerometer
...
using the up/down/left/right/comma/period keys.
2012-02-06 11:29:28 +00:00
minggo
babbd64f0d
Merge pull request #691 from winbinar/master
...
fixed #626 : Fix bug #626
2012-02-05 23:00:31 -08:00
YuLei Liao
4fe0c10e10
merge upstream/master
2012-02-06 10:54:51 +08:00
moadib
f5b8aa79c5
Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 16:49:47 +04:00
YuLei Liao
69a7e2a2e3
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
2012-02-04 11:34:17 +08:00
dumganhar
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
folecr
3eeb0c8687
fix library name - the makefiles expect the full name of the library including the lib prefix
2012-02-02 23:01:50 -08:00
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
folecr
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
dumganhar
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
minggo
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
minggo
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
martinezgerman
c78bf39601
Member variable added to keep the current window active status
2012-01-31 22:55:44 -08:00
martinezgerman
acdd00f03b
Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application
2012-01-31 21:38:44 -08:00
martinezgerman
e8f9c5f675
merging the original update
2012-01-31 20:06:39 -08:00
dumganhar
64c892de79
Merge pull request #697 from dducharme/dalebranch
...
fixed #962 : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
Nicholas Kostelnik
edaf2cf269
fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon
2012-01-31 09:57:58 +00:00
martinezgerman
38cd599bdc
Functionality to detect when the application goes to the background and return from it
2012-01-31 00:25:09 -08:00
minggo
a2efab73a0
fixed #959 : make touch id correct on android
2012-01-31 14:49:02 +08:00
Dale Ducharme
32e4cc1af2
Updating the following:
...
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
dumganhar
a909be3264
remove selector_protocol.h for vs2010 project
2012-01-30 18:27:03 +08:00
dumganhar
c6ec949950
remove some functions in CCObject
2012-01-30 16:07:01 +08:00
dumganhar
6eb65442d4
remove some logs
2012-01-30 15:46:56 +08:00
dumganhar
f44b38eaf8
fixed #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
winbinar
231446a8a5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:49 +02:00
winbinar
910ded54c5
Update cocos2dx/textures/CCTextureCache.cpp
2012-01-30 07:10:19 +02:00
folecr
b0b5790e06
Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7.
...
* Uses NDK modules as the basis of the build system for Android NDK
* Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
* The dependencies of this module are also Android NDK modules
* ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
* Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
2012-01-29 09:52:38 -08:00
folecr
e6fddbc047
Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.
2012-01-29 09:33:17 -08:00
gzito
fe79a2c5d2
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-28 10:54:31 +01:00
dumganhar
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
folecr
a9d7500ae7
Fix whitespace line ending in one single line.
2012-01-25 18:14:29 -08:00
gzito
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
YuLei Liao
f8dafe6712
* add CCNode::getChildrenCount()
2012-01-21 01:29:41 +08:00
YuLei Liao
b79828a697
* merge lua fix
2012-01-21 00:47:51 +08:00
YuLei Liao
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
dumganhar
57eee38f4e
Merge branch 'master' into moveSel2CCObject
2012-01-19 15:46:31 +08:00
dumganhar
a23893507d
fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:43:41 +08:00
dumganhar
543d96a73f
issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:02:39 +08:00
gzito
b400570265
Workaround for issue #635 . Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator
2012-01-17 10:57:31 +01:00
dumganhar
cea250a962
restore original CCCopying as the parent class of CCObject
2012-01-17 10:54:21 +08:00
dumganhar
aa4fae3980
restore original CCCopying as the parent class of CCObject
2012-01-17 10:00:22 +08:00
dumganhar
ea0fb47f98
Merge branch 'master' into moveSel2CCObject
2012-01-17 09:37:31 +08:00
gzito
c87881ff94
Added Marmalade support to TextInputTest and HelloLua samples
2012-01-15 15:57:10 +01:00
dumganhar
d3642be42d
Merge pull request #677 from dumganhar/modify_linux_port
...
modify eclipse project setting for linux port
2012-01-12 04:00:02 -08:00
minggo
bd5ff14e45
Merge branch 'test' of https://github.com/minggo/cocos2d-x into test
2012-01-12 19:30:46 +08:00
dumganhar
3f7ab5a58f
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into modify_linux_port
2012-01-12 19:17:31 +08:00
dumganhar
ef753afb6b
modify eclipse project setting for linux port
2012-01-12 19:15:23 +08:00
minggo
0e03c8ca21
fixed #930 : linux supports jpg format file
2012-01-12 17:46:53 +08:00
minggo
cfe02e39ef
Broken include guard in CCActionEase.h
2012-01-12 17:06:46 +08:00
minggo
75216ac9ca
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 16:54:14 +08:00
minggo
57801eb0a0
modify version
2012-01-11 15:17:16 +08:00
dumganhar
ffeed3827a
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into moveSel2CCObject
...
Conflicts:
cocos2dx/platform/CCPlatformMacros.h
2012-01-09 23:23:45 +08:00
dumganhar
d61f87ba92
modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void)
2012-01-09 23:21:31 +08:00
minggo
0ee582e887
fixed #917 : add header files to resolve compiling errors
2012-01-09 17:36:57 +08:00
minggo
b1aee8f9eb
Merge https://github.com/cocos2d/cocos2d-x into iss917_CCFileUtils
2012-01-09 17:12:46 +08:00
dumganhar
4cc1658d45
fixed #938:Don't use eglGetProcAddress to get extension function on bada1.0 device, otherwise it will cause crash.
2012-01-09 14:15:49 +08:00
dumganhar
259aaf42a6
Fixed: get extension function from eglGetProcAddress on bada platform
2012-01-09 14:15:18 +08:00
dumganhar
30a02030b0
make the property function to virtual
2012-01-09 11:07:45 +08:00
dumganhar
a773e4fb96
move SelectorProtocol to CCObject
2012-01-08 21:03:16 +08:00
dumganhar
2f1c313d12
Merge pull request #658 from gzito/master
...
Added options to compile libFreetype and libXml2 also under Marmalade Mac (x86 version)
2012-01-04 22:09:22 -08:00
gzito
65ddb88000
Added options to compile freetype and libXml under Marmalade MAC (x86 simulator version)
2012-01-04 23:34:48 +01:00
minggo
4bffaaf9cb
fixed #936 : check whether selector is valid
2012-01-04 10:58:20 +08:00
minggo
c6da8d2fbd
call correct java method
2012-01-04 10:14:46 +08:00
gzito
2acea5f7af
libxml2.mkf for both Windows and Mac Marmalade versions
2012-01-03 00:39:31 +01:00
gzito
083d0015a3
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2012-01-02 22:32:29 +01:00
dumganhar
4010733c20
fixed #927 : To use 'std::map::find' instead of 'std::map::[]', because '[]' will create a new element with default value.
2011-12-31 17:44:45 +08:00
minggo
f776ecc7e0
Merge pull request #650 from dumganhar/issue#934_add_isEqual
...
Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-30 18:18:39 -08:00
dumganhar
8c65786dce
fixed #934 : Add 'isEqual' function for CCString, make CCObject::isEqual to virtual function
2011-12-31 10:10:41 +08:00
minggo
53fae04ba8
fixed #752 : make add/remove touch delegate in menu callback function correctly
2011-12-30 15:43:36 +08:00
dumganhar
20b6257198
fixed #928:change 'vt->m_PixelFormat = CCTexture2D::defaultAlphaPixelFormat();' to 'vt->m_PixelFormat = tt->getPixelFormat();'
2011-12-29 16:00:36 +08:00
dumganhar
025258d21d
fixed #928 : save pixelformat for each texture, restore the pixelformat after entering foreground
2011-12-29 15:05:38 +08:00
minggo
fcb2294e20
fixed #926 : subclass should retain/release when dynamic_cast fail.
2011-12-28 14:47:54 +08:00
minggo
37915cfed6
remove unneeded function, and make protocol an abstract class
2011-12-28 14:46:49 +08:00
gzito
28562c3fb9
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
2011-12-27 16:14:19 +01:00
YuLei Liao
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08:00
dumganhar
a09bebb32b
fixed #903 : 1.pass 'id' parameter to setTouchInfo function;
...
2.when double press happens, deal with it as single press.
2011-12-23 20:33:42 +08:00
minggo
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
minggo
12237cf288
fixed #911 : add some comment
2011-12-22 16:29:25 +08:00
minggo
7422a424da
fixed #911 : make CCTextureCache::addUIImage() work ok when key is null
2011-12-22 16:26:56 +08:00
minggo
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
minggo
a0fe048f11
fixed #923 : cache texture with correct image type
2011-12-22 10:48:54 +08:00
minggo
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
minggo
bb4b1d02bb
Merge pull request #608 from GMTDev/patch-2
...
issue #903 : Update CCTouch to include the ID/PID of the touch
2011-12-20 21:48:30 -08:00
GavT
36f8e43dd8
Update cocos2dx/include/CCTouch.h
2011-12-20 20:40:48 -08:00
gzito
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
gzito
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00