minggo
|
0e81fd0568
|
fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
|
2012-08-27 16:11:07 +08:00 |
minggo
|
c7d365ca1c
|
Merge pull request #1231 from donaldalanmorrison/gles20
Gles20
|
2012-08-26 20:17:40 -07:00 |
minggo
|
a80c282844
|
add NULL as the last parameter to prevent crashing when creating CCSequence
|
2012-08-27 10:47:32 +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
|
3eb3ebc67a
|
Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or
'false' (performance warning).
|
2012-08-24 11:20:23 -07:00 |
Donald Alan Morrison
|
3c7846e32f
|
Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch
|
2012-08-23 23:35:25 -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
|
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
|
d83cdbda09
|
fixed #1441: put hd and ipad resources into separate directory
|
2012-08-23 14:20:32 +08:00 |
James Chen
|
bcbd161398
|
issue #1429: First commit CCEditBox for android port.
|
2012-08-22 09:47:04 +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 |
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 |
James Chen
|
0fce637ec7
|
issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
|
2012-08-15 14:33:56 +08:00 |
James Chen
|
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
|
3ff21fe275
|
fixed #1424: http wrapper compiled ok on win32.
|
2012-08-09 17:04:55 +08:00 |
minggo
|
c31415b7bd
|
issue #1405:resolution supports on mac
|
2012-08-09 14:34:20 +08:00 |
Walzer
|
08198c082e
|
issue #1424, http wrapper has been tested on iOS, mac, android port.
|
2012-08-09 10:45:11 +08:00 |
Walzer
|
9ee50bb59a
|
issue #1424, add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website.
|
2012-08-08 12:05:02 +08:00 |
Walzer
|
b094f70ab3
|
issue #1424, http-get works ok. Tomorrow I will focus on post.
|
2012-08-07 18:28:07 +08:00 |
Walzer
|
39e45da8d9
|
Merge branch 'gles20' of https://github.com/greathqy/cocos2d-x into network
|
2012-08-06 15:36:13 +08:00 |
qingyun
|
054fe4993c
|
fix CCLog stack overflow
|
2012-08-06 14:47:23 +08:00 |
qingyun
|
24136dc575
|
add CCHttpRequest and related tests to repository
|
2012-08-04 18:27:27 +08:00 |
qingyun
|
dc35596ce9
|
add greathqy to AUTHORS
|
2012-08-04 18:12:39 +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
|
b93d0b5ebf
|
[LOG] add linux port
|
2012-08-02 13:02:59 +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
|
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 |
James Chen
|
fda669510a
|
fixed #1385: Logic error in BitmapFontMultiLineAlignment.
|
2012-07-24 11:32:02 +08:00 |
James Chen
|
e7d7ff99c7
|
fixed #1386: PauseResumeActionsTest crashes.
|
2012-07-24 11:21:08 +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
|
77f1fba566
|
issue #1399: Adjust folder structure, made it built successfully on win32.
|
2012-07-20 14:05:52 +08:00 |