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

1523 Commits

Author SHA1 Message Date
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
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 2160e56cb1 [Win32] fix CCFileUtils:fullPathFromRelativePath() check m_isWorkingDirectory 2012-09-04 02:41:16 +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 03374fa83b add CCApplicationProtocol:setStartupScriptFilename(), getStartupScriptFilename() 
CCFileUtils:setResourceDirectory() add isWorkdingDir argument
 2012-09-03 18:05:59 +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
YuLei 748d64ecc0 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-31 09:47:03 +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 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
YuLei 02e77faf51 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-08-28 12:22:57 +08: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
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 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 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
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
minggo fa0dbb7c65 Merge pull request #1226 from Squallium/gles20 
Wrong access to CCApplication::sharedApplication() pointer
 2012-08-23 19:11:07 -07: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 37cb691600 fix some bugs while testing 2012-08-23 18:01:28 +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 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
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
James Chen bcbd161398 issue #1429: First commit CCEditBox for android port. 2012-08-22 09:47:04 +08: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 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
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 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
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 48fa8a4e88 fixed #1419: Update eclipse project configurations for linux port. 2012-08-16 18:09:01 +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 e964e861f2 Merge pull request #1162 from tongpengfei/gles20 
fixed linux FontTest vertical alignment
 2012-08-11 07:32:32 -07: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 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 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
James Chen e9aa3743fa issue #1405: muti-resolution works ok on linux. 2012-08-03 13:56:18 +08:00
pengfei tong a37fd743e0 [FIX] testjs 2012-08-02 16:23:31 +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 dc37896ed9 change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs 2012-08-01 13:24:23 +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 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
minggo ac70f8def5 Merge branch 'gles20-adjust-structure' into merge 2012-07-23 11:36:46 +08: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
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 f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +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
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
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen f8ebbccb98 fixed #1292: Renamed CCFileUtils::popupNotify to CCFileUtils::setPopupNotify 2012-06-20 14:38:13 +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 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +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 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
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 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
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
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
minggo 9d9e2579e3 issue #1181: save render texture when comming to background 2012-06-14 18:37:57 +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 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
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 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
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07: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
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
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 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +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
Nat Weiss ed43e6a90b Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 21:16:24 -07:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +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
James Chen 3959fe8f4d typo fixed in CCGL.h 2012-06-01 14:48:45 +08: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
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
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 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
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 5f5af82254 fixed #1177: Moved CCStdC.h/.cpp to relevant platform folder. 2012-05-29 15:51:13 +08: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 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
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 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 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
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
minggo ff6abd1d8c fixed #1230: fix a bug in calculating string width 2012-05-07 10:15:57 +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
minggo 27b5fb8074 merge commit of issue 1216 2012-05-03 16:30:13 +08:00
James Chen 7cdb11b668 fixed #1215: fixed a bug in retina support for win32. 2012-05-03 15:05:19 +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
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
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 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 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 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 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 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 7d7baf81a2 refactor updated... 2012-04-18 18:43:45 +08:00
James Chen 77919439bc fixed #1166: Added CCArray::arrayWithContentOfFile function. 2012-04-16 15:41:01 +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
James Chen d01f1277af optimize data struct. 2012-04-14 19:11:57 +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 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
James Chen 137679d369 Fixed a bug in CCFileUtils::dictionaryWithContentOfFile. 2012-04-10 16:32:53 +08: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
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 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +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 c6457dfed8 issue #1056: Updated ios project configuration. 2012-03-29 10:09:41 +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 85c13998ee issue #1056: Added CCTransitionProgress class, Updated Texture2dTest, TileMapTest, TransitionsTest. 2012-03-26 16:46:23 +08:00
minggo 39ba6b4618 issue #1506: RenderTextureTest 2012-03-22 16:36:03 +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 f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
James Chen 321771a7ea issue #1056: Added gles2.0 support for ios platform. 2012-03-21 10:05:23 +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
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 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 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 7fc0ffbf26 fixed #737: remove view id 2012-03-12 11:00:12 +08: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 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +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
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 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 2bc48219f8 remove libjpeg, libpng, libz project, use them as sources in cocos2dx project. 2012-02-27 18:18:40 +08:00
moadib de9f8dc441 Added window group id for qnx-version of CCEGLView 2012-02-24 08:40:35 +04: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 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
minggo 5ce4968524 merge from cocos2d-x master 2012-02-10 10:46:58 +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
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
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
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
folecr cab83bb4a6 Fix header file location to match convention in include directives in the cocos source 2012-02-02 20:07:37 -08:00
YuLei Liao 47d88bfbba * add macro defines for Lua engine 2012-02-02 10:37:21 +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
martinezgerman 38cd599bdc Functionality to detect when the application goes to the background and return from it 2012-01-31 00:25:09 -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
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 f40d3d3db8 Changed use of animation interval in game loop 2012-01-24 23:27:03 +01: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
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01: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 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 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 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
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
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 a96285b617 fixed #923: init iamge type and refactor a little codes 2011-12-22 15:38:31 +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
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
gzito 298f12e7a3 Removed libxml2 (precompiled version) 2011-12-20 22:05:01 +01:00
minggo 28d0737bf3 fixed #917: implement CCFileUtils::getFileDataFromZip() on iOS 2011-12-20 14:18:53 +08:00
gzito 59bccb6bf8 Added last loaded font caching & minor fixes 2011-12-19 23:08:35 +01:00
gzito e3c5d6886e Added authors info 2011-12-19 22:57:04 +01:00
gzito e389ae5469 Optimized CCImage and fixed alpha value 2011-12-19 22:56:44 +01:00
dumganhar af221f8710 fixed #918: modify filter of airplay to marmalade. 2011-12-16 11:08:37 +08:00
dumganhar 8298e0b6ff Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611 
Conflicts:
	tests/test.marmalade/test.mkb
 2011-12-15 13:03:07 +08:00
dumganhar f3b7b519fc Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619 2011-12-15 11:38:15 +08:00
minggo 8813d94257 Merge pull request #617 from minggo/issue906 
remove unneeded code in CCImage_android.cpp
 2011-12-14 18:08:24 -08:00
Didiet Noor 8c69c70fc3 Fixed Path Issues on QNX, CocosDenshion Test back to original 2011-12-15 00:31:17 +08:00
dumganhar 625d299717 Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade 2011-12-13 10:01:29 +08:00
gzito d4ea6d4ef5 Rollback changes about CCDirector::sharedInstance as pointer 
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
 2011-12-12 14:50:35 +01:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
minggo ba462e99a6 fixed #906: remove unneeded code in CCImage_android.cpp 2011-12-12 17:02:21 +08:00
dumganhar baf3755142 remove some '__QNX__' macros 2011-12-12 16:14:12 +08:00
dumganhar dea2713f51 fixed #907: add blackberry port 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry

Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-12 11:49:49 +08:00
minggo 8c5c3300aa Merge pull request #612 from dumganhar/issue904 
Issue904
 2011-12-11 19:33:07 -08:00
styck b1cdb6543d Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language 
Added tests for Marmalade and enabled language and font testing
 2011-12-11 17:18:01 -08:00