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