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

1292 Commits

Author SHA1 Message Date
James Chen c9ce1892af Merge branch 'gles20' into iss1024-bb-ttf 2012-10-19 16:18:30 +08:00
minggo f40b6ac4eb fixed #1515: implement zoom function on mac os 2012-10-19 11:33:06 +08:00
John Garrison f4d68a707f More BB Font fixes 2012-10-18 13:43:31 -04:00
wenbin1989 62351462a8 Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage() 2012-10-18 17:17:11 +08:00
minggo 986a0a34c0 Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale 2012-10-18 17:01:27 +08:00
minggo fa044d3cee Merge pull request #1472 from wenbin1989/gles20 
Fix stack overflow in CCLog
 2012-10-18 01:57:27 -07:00
James Chen 549dd92d8e fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions. 2012-10-18 15:53:08 +08:00
wenbin1989 29a63a3b0f Fix stack overflow in CCLog 2012-10-18 14:39:56 +08:00
James Chen a5639281ec Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20 2012-10-18 12:01:55 +08:00
James Chen a5e260dbdb issue #1515: Refactored some codes for win32 port. 2012-10-18 12:01:30 +08:00
James Chen 41c784ec61 issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 11:51:02 +08:00
James Chen 0b101bedd0 issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop. 2012-10-18 10:54:19 +08:00
James Chen c1ab8a6ead fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'. 2012-10-18 09:54:24 +08:00
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 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
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 e1c0ea761b issue #1486: Removed some unused codes, made it works on WINDOWS. 2012-10-12 09:58:42 +08: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
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 719cb7b7a6 fixed #1496: An error of comparing font's face name in CCImage of win32 port. 2012-10-08 14:52:08 +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
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
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 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
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
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
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 37f508b415 Merge pull request #1327 from Weeds/gles20 
[linux] font rendering enhancements
 2012-09-23 19:58:48 -07: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
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
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
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
Byung Choi 4a4ef87163 Fixes #1317 by http://gcc.gnu.org/wiki/Visibility 2012-09-19 04:59:33 +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 ded6e3edcf Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-17 17:55:41 +08: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
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
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07: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
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
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
James Chen b6e4c98334 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua 2012-09-11 14:03:33 +08:00
moadib 97a11c0e06 Handle window close event on Linux platform 2012-09-10 17:53:33 +04: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
Nicolas Gramlich 4c7705171a Android JAVA refactoring. Android JNI Cleanup. 2012-09-07 17:23:04 -07:00
YuLei 58ea948cc8 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-07 19:21:15 +08: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
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
YuLei a5e34ee754 [Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename() 2012-09-05 16:15:09 +08: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