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 |