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

159 Commits

Author SHA1 Message Date
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
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
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
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -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
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 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
minggo 56ce6869d6 Merge pull request #1227 from donaldalanmorrison/gles20 
Gles20
 2012-08-23 18:32:39 -07: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
minggo d83cdbda09 fixed #1441: put hd and ipad resources into separate directory 2012-08-23 14:20: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 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
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 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
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
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 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
James Chen ba78ac7d6d issue #1405: Remove unused method 'CCEGLView::getFrameSize' for ios port. 2012-08-09 18:28:49 +08:00
minggo c31415b7bd issue #1405:resolution supports on mac 2012-08-09 14:34:20 +08:00
minggo cc39dc55f4 issue #1405:remove unneeded functions of CCFileUtils 2012-08-08 18:39:33 +08:00
minggo 3853611e62 issue #1405:support loading resources from directory defined by developer 2012-08-08 17:42:04 +08:00
minggo 5d8f909af4 issue #1405:multi resolution works ok 2012-08-07 14:29:46 +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
minggo 0a2570fec7 fixed #1383:save UserDefault.xml to Library/caches 2012-07-24 11:34:20 +08: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
Nat Weiss 43d40bd5a0 Fixes a few Xcode 4.5-specific error messages. 2012-07-08 22:37:19 -07:00
James Chen f8ebbccb98 fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify 2012-06-20 14:38:13 +08:00
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen 591566b43a fixed #1335: Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
Nicolas Gramlich 13bcf2180c Merge with gles20. 2012-06-15 16:26:10 -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
minggo 899022d107 fixed #1292:fix some bugs that caused by modify function name 2012-06-15 17:39:13 +08:00
James Chen 61719d813e fixed #1292:make some function names more readable. 2012-06-15 16:47:54 +08:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -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 15ad463fbe issue #1322: vertical alignment ok on iOS 2012-06-13 16:20:58 +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 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