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

2759 Commits

Author SHA1 Message Date
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