Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,140 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5140 Commits

Author SHA1 Message Date
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 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 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
ThePickleMan 82ea6fbb99 Update extensions/GUI/CCControlExtension/CCControlSlider.h 
Added fields and methods for setting the maximum allowed value.
 2012-09-02 16:08:13 -05:00
trentmillar 1d2b7c5b33 Comment in VS2012 sln file. changed to 2012 2012-09-02 13:23:50 -06:00
James Chen f11c849cfe Merge pull request #1278 from edbartley/gles20 
fixed #1456: Remove code signing from MAC TestCpp project.
 2012-09-02 07:49:12 -07:00
fish 8c29e9b1e2 Remove code signing from MAC TestCpp project. 2012-09-01 18:06:30 -04:00
Trent Millar a12054c00f Adding the VC++2012 template to install-templates-msvc.bat 
Tested against VS2012 RTM.

Note, the .sln location is incorect on all the templates. It needs to
move up relative to the cocos2d-x  folder.
I can look at fixing this later but for now I guess it must have been
left to the user to manually move it.
 2012-09-01 14:32:46 -06:00
trentmillar a42533ebd9 adding VC2012 sln. Also to build-win32.bat 
I changed the ordering in the bat file to process newer VC versions
before older ones. This was an issue for me running multiple versions of
VS on my box
 2012-09-01 11:42:59 -06:00
James Chen 35f6f937c9 Merge pull request #1271 from mustime/testlua 
issue #1425: add NodeTest to TestLua.
 2012-09-01 01:52:42 -07:00
James Chen 45a712e932 Merge pull request #1276 from dumganhar/gles20 
fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla.
 2012-08-31 19:51:43 -07:00
James Chen 382b08a947 fixed #1455: Adding xcode template for cocos2dx-js. Thank rohankuruvilla . 2012-09-01 10:49:15 +08:00
Rohan Kuruvilla 374232ac88 Adding xcode template for cocos2dx-js 2012-08-31 12:07:58 -07:00
James Chen 1deabca65b Merge pull request #1274 from dumganhar/iss1454_javascript 
issue #1454: fixed bugs in test-particles.js.
 2012-08-31 08:30:46 -07:00
James Chen 8e290cad6e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript 2012-08-31 23:29:02 +08:00
James Chen 94a1aa6123 issue #1454: fixed bugs in test-particles.js. 2012-08-31 23:28:43 +08:00
minggo 362cba4e79 Merge pull request #1273 from minggo/iss1454_javascript 
issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh
 2012-08-31 08:17:56 -07:00
minggo dacf1704fc issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh 2012-08-31 23:16:36 +08:00
James Chen ef272e8ac6 Merge pull request #1272 from dumganhar/iss1454_javascript 
issue #1454: Removed COCOS2D_JAVASCRIPT macro.
 2012-08-31 07:35:02 -07:00