James Chen
c5b5b978fa
issue #1555 : Made win32 works ok.
2012-11-16 17:08:34 +08:00
minggo
b497143f93
issue #1555:menu can receive touch event now
2012-11-16 14:51:48 +08:00
minggo
cb2bc37513
issue #1555 : make tests work
2012-11-15 18:34:23 +08:00
James Chen
833b5b1be8
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
...
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
2012-11-12 10:20:04 +08:00
minggo
ad64beb769
invoke base class's onExit() to avoid memory leak
2012-10-31 11:33:53 +08:00
Mat Hopwood
2b265929e2
Marmalade Sample data removed and merged changes
...
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
2012-10-25 21:40:37 +01:00
James Chen
e07ca43c3d
fixes a compilation error in TestCpp.
2012-10-24 16:28:54 +08:00
Mat Hopwood
6074dea6cc
Marmalade fixes and optimisation of TestCpp assets
...
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
2012-10-24 01:03:06 +01:00
James Chen
62f7b25df2
issue #1521 : Using relative coordinates in TestCpp.
2012-10-23 17:48:50 +08:00
wenbin1989
4a50d6903c
add Korean Language Type in CurrentLanguageTest
...
I have tested the Korean Language Type of CurrentLanguageTest in ios,
android, mac. Works fine.
2012-10-19 09:41:46 +08:00
minggo
501ceb21eb
fixed #1466:restore shader when comming to background
2012-10-18 11:00:44 +08:00
minggo
b6426f01ff
fixed #1466:restore shader when comming to background
2012-10-18 10:39:56 +08:00
minggo
bfa7991a94
fixed #1466:restore shader when comming to background
2012-10-18 10:15:46 +08:00
minggo
2ded8ea034
Merge pull request #1442 from dumganhar/iss1486-multi-res
...
Multiresolution support
2012-10-15 02:15:21 -07:00
minggo
93d702e3cc
fixed #1491:remove dependency of FontLabel lib
2012-10-15 12:03:15 +08:00
James Chen
39a4af57cc
issue #1486 : Using relative position for ActionsTest and Box2dView.
2012-10-14 22:21:57 +08:00
James Chen
32a9d51618
issue #1486 : Commented some unused codes.
2012-10-12 17:37:49 +08:00
James Chen
36600d95b1
issue #1486 : Calculate content scale factor by screen height.
2012-10-12 17:37:26 +08:00
Walzer
f1d9629404
Merge pull request #1361 from ncrothe/gles20
...
add the capability to set custom http header to HttpClient
2012-10-08 01:06:39 -07:00
James Chen
f7229f74d8
issue #1483 : Synchronizing CCControlExtension to latest version.
2012-09-25 16:57:51 +08:00
ncrothe
e0fe233752
Update samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
...
Added test to show use of HttpRequest::setHeaders
2012-09-24 12:15:53 +03:00
minggo
f17545a1ae
fix a compile error
2012-09-24 15:26:18 +08:00
James Chen
9fabf3a45b
fixed #1470 : Made CCBReader support cocosbuilder v2.1-beta0.
2012-09-19 18:41:50 +08:00
minggo
4bff6927b8
issue #1470:re-publish ccb
2012-09-19 17:43:11 +08:00
minggo
4b969e35c8
issue #1470:implement animation
2012-09-17 18:49:05 +08:00
minggo
0c4b5dd3e9
issue #1470:fix some crashes
2012-09-17 15:31:07 +08:00
minggo
0845e08fd3
issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0
2012-09-17 14:27:17 +08:00
James Chen
1460f4e42f
issue #1458 : Updated project configuration for all platforms.
...
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
James Chen
d9cc8fa346
issue #1458 : Adding CCTableView support. Updated win32 project configuration.
2012-09-09 22:34:32 +08:00
ThePickleMan
469584e8b8
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
2012-09-04 23:53:17 -05:00
ThePickleMan
ea87d6304d
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
...
Made the lower slider's value display too.
2012-09-04 23:52:18 -05:00
ThePickleMan
5cf699f668
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
...
Added a test for the restricted slider
2012-09-04 22:32:29 -05: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
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