YuLei
|
8fa431fe0a
|
[Mac] remove CCEGLView::purgeSharedOpenGLView()
|
2012-09-10 16:50:45 +08:00 |
James Chen
|
130f055e5c
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-10 16:16:37 +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 |
James Chen
|
c9ca584726
|
Merge pull request #1297 from dumganhar/tableview-win32
fixed #1458: Adding CCTableView support.
|
2012-09-09 23:52:18 -07:00 |
James Chen
|
c9e1aa7adc
|
fixed #1458: Updated TestCpp Makefile for linux port.
|
2012-09-10 14:50:19 +08:00 |
James Chen
|
a6acd90c29
|
fixed #1458: Updated copyright information for some files which are relative to CCTableView.
|
2012-09-10 14:13:55 +08:00 |
James Chen
|
6f3ee0299a
|
issue #1458: Updated vs2010 project configuration.
|
2012-09-10 14:05:44 +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 |
YuLei
|
1254d08d5c
|
[Lua] fix: HelloLua
|
2012-09-10 12:23:45 +08:00 |
YuLei
|
d4128975f6
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-10 11:42:56 +08:00 |
Walzer
|
f924e36216
|
Merge pull request #1296 from walzer/Cocos2dSimpleGame
Cocos2dSimpleGame is back
|
2012-09-09 19:24:33 -07:00 |
James Chen
|
554b1709c3
|
issue #1458: Adding CCScrollView::updateInset.
|
2012-09-09 22:46:31 +08:00 |
James Chen
|
bf45edeed5
|
Reverted one line code.
|
2012-09-09 22:37:32 +08:00 |
James Chen
|
6719841b13
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into tableview-gles20
|
2012-09-09 22:34:53 +08:00 |
James Chen
|
d9cc8fa346
|
issue #1458: Adding CCTableView support. Updated win32 project configuration.
|
2012-09-09 22:34:32 +08:00 |
Walzer
|
11b5ae5cef
|
add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize
|
2012-09-09 21:41:48 +08:00 |
Walzer
|
7e4615cd7b
|
upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder
|
2012-09-09 20:20:29 +08:00 |
Walzer
|
5a687f5273
|
Merge pull request #1295 from walzer/gles20
Gles20
|
2012-09-09 03:26:35 -07:00 |
Walzer
|
816c1b4362
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-09 18:25:36 +08:00 |
Walzer
|
7c4ad685e5
|
add comment for a potential bug in HttpClient.cpp
|
2012-09-09 18:25:02 +08:00 |
minggo
|
cc1d030794
|
Merge pull request #1294 from trentmillar/gles20
Change 2012 solution version number.
|
2012-09-09 00:56:29 -07:00 |
Nicolas Gramlich
|
4c7705171a
|
Android JAVA refactoring. Android JNI Cleanup.
|
2012-09-07 17:23:04 -07:00 |
ebartley
|
f027c4a9f7
|
Merge branch 'gles20' of https://github.com/FlowerpotGames/cocos2d-x into gles20
|
2012-09-07 15:01:52 -04:00 |
ebartley
|
5deeb3f8fa
|
Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.
|
2012-09-07 15:00:21 -04:00 |
Ed Bartley
|
a392b17182
|
MAC project is missing the header search path to /include
|
2012-09-07 13:14:22 -04:00 |
YuLei
|
58ea948cc8
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-07 19:21:15 +08:00 |
YuLei
|
a22122d0ed
|
[Lua] fix: CCCallFunc : public CCActionInstant declare typo error
|
2012-09-07 19:19:50 +08:00 |
minggo
|
23e5c69616
|
Merge pull request #1280 from Yodesoft/gles20
Supported display Unicode chars.
|
2012-09-07 01:12:05 -07:00 |
minggo
|
af32d42eb7
|
Merge pull request #1286 from moadib/gles20
Fixed crash with CCLabelBMFont
|
2012-09-06 22:51:00 -07: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 |
moadib
|
eeb89d2404
|
Merge remote-tracking branch 'upstream/gles20' into gles20
|
2012-09-06 12:45:07 +04:00 |
James Chen
|
8bd11f9420
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-09-06 15:24:57 +08:00 |
moadib
|
a574d17bed
|
Added comment as minggo requested
|
2012-09-06 10:09:29 +04:00 |
minggo
|
10069f8b99
|
Merge pull request #1287 from ivzave/gles20
remove delete this from init methods
|
2012-09-05 19:16:15 -07: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 |
Ed Bartley
|
591d15c2a1
|
CCscrollView screenPos also needs to be adjusted by the scale in order to be used with Retina display.
|
2012-09-05 15:12:03 -04:00 |
ivzave
|
cf67922ee0
|
remove delete this from init methods
|
2012-09-05 22:30:44 +04:00 |
YuLei
|
a5e34ee754
|
[Mac] add CCApplication:setResourceRootPath(), CCApplication:setStartupScriptFilename()
|
2012-09-05 16:15:09 +08:00 |
moadib
|
1b51b709ee
|
Fixed crash with CCLabelBMFont when center- or right-aligned text have line breaks each other
|
2012-09-05 11:36:34 +04:00 |
YuLei
|
9d2b0b04f2
|
[Lua] update luabinding for CCPoint, CCSize, CCRect
|
2012-09-05 14:49:26 +08:00 |
dualface
|
affcb70ecc
|
add CCApplication::setResourceRootPath()
add CCApplication::setStartupScriptFilename()
|
2012-09-05 14:38:39 +08:00 |
minggo
|
ecc4e769dc
|
Merge pull request #1285 from ThePickleMan/gles20
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCCon...
|
2012-09-04 22:46:06 -07:00 |
YuLei
|
6115769044
|
restore CCApplicationProtocol.h and CCFileUtils.h
|
2012-09-05 13:36:27 +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 |