minggo
|
4bff6927b8
|
issue #1470:re-publish ccb
|
2012-09-19 17:43:11 +08:00 |
minggo
|
9db2df3f7b
|
issue #1470:modify resources path
|
2012-09-19 09:40:02 +08:00 |
minggo
|
4bc5e9e415
|
issue #1470:fix more logical errors
|
2012-09-18 17:55:03 +08:00 |
minggo
|
8832b8e78d
|
issue #1470:set correct call back function for Funky animation
|
2012-09-18 17:13:31 +08:00 |
minggo
|
a0feb5f289
|
issue #1470:fix some logical errors
|
2012-09-18 17:04:10 +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 |
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 |
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 |
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 |
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 |
ivzave
|
cf67922ee0
|
remove delete this from init methods
|
2012-09-05 22:30:44 +04: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 |
minggo
|
ecc4e769dc
|
Merge pull request #1285 from ThePickleMan/gles20
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCCon...
|
2012-09-04 22:46:06 -07: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
|
d53c65e27b
|
Merge pull request #1279 from ThePickleMan/gles20
min/max allowed value for CCControlSlider
|
2012-09-04 19:17:36 -07:00 |
ThePickleMan
|
0a96915da2
|
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
Removed meaningless setter...the macro already makes one...
|
2012-09-04 20:54:34 -05:00 |
ThePickleMan
|
423abc6f10
|
Update extensions/GUI/CCControlExtension/CCControlSlider.h
Removed meaningless setter...the macro already makes one...
|
2012-09-04 20:54:17 -05:00 |
ThePickleMan
|
f6f370ffea
|
Update extensions/GUI/CCControlExtension/CCControlSlider.h
changed CC_SYNTHESIZE_READONLY to CC_SYNTHESIZE
|
2012-09-04 20:48:04 -05:00 |
trentm
|
856763e1d6
|
Change 2012 solution version number.
|
2012-09-04 10:55:00 -06:00 |
yodesoft
|
95f204cd17
|
Add font table to handler font info, eg. family_name, style_name, filename
|
2012-09-04 10:48:02 +08:00 |
James Chen
|
45f95da30d
|
Merge pull request #1277 from trentmillar/gles20
fixed #1457: Adding VC2012 sln file and VS2012 changes to build-win32.bat & install-templates.msvc.bat
|
2012-09-03 19:23:49 -07:00 |
Trent Millar
|
f67839705f
|
Had wrong version in 2012 sln file. Adding clean /m to build
|
2012-09-03 13:22:52 -06:00 |
ThePickleMan
|
a4d2d317b5
|
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
|
2012-09-03 09:46:55 -05:00 |
minggo
|
3ba5f16088
|
Merge pull request #1281 from minggo/merge_texparams
Merge pull request
|
2012-09-03 01:49:19 -07:00 |
minggo
|
56c329cf0e
|
reset texture parameter when coming to foreground on android
|
2012-09-03 16:47:18 +08:00 |
minggo
|
1a2dd6ae35
|
Merge branch 'gles20' of https://github.com/MartinSherburn/cocos2d-x into merge_texparams
|
2012-09-03 16:04:41 +08:00 |
yodesoft
|
b0d7ecec42
|
Supported display Unicode chars.
|
2012-09-03 12:38:29 +08:00 |
ThePickleMan
|
da819e1109
|
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
Added default values for max/min allowed values
|
2012-09-02 16:31:12 -05:00 |
ThePickleMan
|
e07320f6a8
|
Update extensions/GUI/CCControlExtension/CCControlSlider.cpp
Added minimum/maximum allowed values
|
2012-09-02 16:10:25 -05:00 |