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 |