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

11722 Commits

Author SHA1 Message Date
samuele3hu 39686ea503 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-20 13:46:26 +08:00
samuele3hu 7a9f1d6804 issue #2433:Modify TestLua samples and some .ini files 2013-08-20 13:44:37 +08:00
minggo 0ec5d6f029 Merge pull request #3439 from folecr/android_rendering_bugfix 
Let CCDirector set all GL state in the Android port
 2013-08-19 19:08:47 -07:00
James Chen 0d5042948c Update AUTHORS 2013-08-20 10:04:46 +08:00
James Chen 7e3d3b3d3e Merge pull request #2950 from zcgit/develop 
a potential bug in Layer.
 2013-08-19 19:02:53 -07:00
Ricardo Quesada 6c2c5f727f small fix to make it compile with std::vector too 2013-08-19 17:33:23 -07:00
Ricardo Quesada 6c02102b17 Fixes crash when reordering 2013-08-19 17:27:31 -07:00
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray 
Compiles both with std::vector or ccCArray
 2013-08-19 17:09:28 -07:00
folecr 9d8e2d991b Let CCDirector set all GL state 2013-08-19 15:58:05 -07:00
James Chen 175316f2c6 Merge pull request #3404 from timothyqiu/docfix 
Documentation fix: broken links and wrong encoding in the doc...
 2013-08-18 19:35:47 -07:00
shinriyo a188d87142 language option is invalid print mesage 
If we input invalid mistook language option
 2013-08-18 10:13:50 +09:00
minggo 61e8b14601 Merge pull request #3420 from boyu0/tilemap_plain_xml_format_support 
Support for loading tilemaps with plain XML layer format
 2013-08-17 01:13:41 -07:00
minggo 3ca26e1aa6 Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto 
closed #2517: Update all test cases use auto for local variables
 2013-08-17 01:12:48 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array 
add iterator for Array and make Array can be used in range-based loop
 2013-08-17 00:42:42 -07:00
minggo 06aea85f2e Merge pull request #3432 from folecr/travisci_android_arm_only 
Keep TravisCI happy : build Android TestCpp for ARM architecture only.
 2013-08-17 00:42:21 -07:00
folecr aff86b1b52 Keep TravisCI happy : build Android TestCpp for ARM architecture only. 2013-08-16 16:19:34 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
James Chen 31b06c9331 Merge pull request #3429 from godyZ/Atitc_decode 
issue 2533: [cocos2d's code style] add space before backslash and return bef...
 2013-08-16 01:43:27 -07:00
godyZ f0dbc22c16 updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
boyu0 6779f494f3 issue #2517: Restore TestCpp proj.android that edited by mistake. 2013-08-16 16:09:46 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
minggo e2ae7db4ef Merge pull request #3428 from godyZ/Atitc_decode 
issue #2533:add ATITC comressed texture (*.ktx file) support
 2013-08-16 00:44:05 -07:00
boyu0 0823bb144f issue #2517: add the LocalVarToAuto.py script 2013-08-16 15:35:27 +08:00
godyZ 28656598ef closed #2533:updating new file copyrights 2013-08-16 15:01:22 +08:00
godyZ b5af9eb4c8 closed #2533:fix some wrong indent 2013-08-16 14:36:35 +08:00
godyZ 8c0f2dfed1 issue #2533: resolve some conflicts 2013-08-16 14:27:13 +08:00
godyZ 9e07ac967f issue #2533: updating some GL macro definition 2013-08-16 14:03:30 +08:00
minggo 77f89956a3 Merge pull request #3414 from boyu0/iss2522_unpackccz 
closed #2522: Let Image::initWithImageData() support the packed data.
 2013-08-15 21:44:43 -07:00
minggo 3cec90b376 Merge pull request #3427 from natural-law/develop 
Optimize the ant configuration for plugins
 2013-08-15 21:43:46 -07:00
zhangbin b0cfe202fc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-16 11:51:07 +08:00
zhangbin ca594eedac Optimize the ant configuration for plugins 2013-08-16 11:44:17 +08:00
James Chen 310cf70114 Update AUTHORS [ci skip] 2013-08-16 11:31:26 +08:00
James Chen 041b14f3ff Merge pull request #3411 from maciekczwa/master 
fixed stroke font color with channel color values other than 255
 2013-08-15 20:28:49 -07:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support 
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
 2013-08-16 11:02:44 +08:00
samuele3hu c8b75a1080 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 2013-08-16 10:13:38 +08:00
samuele3hu de3335a4a9 issue #2433:Update lua manual binding and modify some samples 2013-08-16 10:12:46 +08:00
James Chen 4473e9391c Merge pull request #3426 from CocosRobot/updategeneratedsubmodule_1376576630 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-08-15 07:28:36 -07:00
CocosRobot 1107974892 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-08-15 14:23:52 +00:00
James Chen 9ab671fb03 Merge pull request #3425 from dumganhar/iss2488-new-label-sample 
Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422
 2013-08-15 07:16:48 -07:00
James Chen 4b0d0225b7 issue #2488: Updating makefile for linux and emscripten. 2013-08-15 21:44:51 +08:00
James Chen 0b306cd510 Removing unused file: cocos2dx/platform/blackberry/CCImage.cpp. 2013-08-15 21:44:51 +08:00
James Chen 409e345522 issue #2488: Updating VS project configuration. 2013-08-15 21:40:11 +08:00
James Chen 56cd039b32 issue #2488: Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'"; 2013-08-15 21:39:47 +08:00
James Chen c97e2d3562 issue #2488: Fixing a warning in CCFontFreeType.cpp. 2013-08-15 21:39:03 +08:00
James Chen c29a8bb2a0 issue #2488: The declare fix: class FontLetterDefinition; --> struct FontLetterDefinition; 2013-08-15 21:38:27 +08:00
James Chen c84162505e issue #2488: Updating project configurations for new Label classes. 2013-08-15 21:01:45 +08:00
James Chen 9d226aa746 issue #2488: Removing unused 'include'. 2013-08-15 21:00:44 +08:00
James Chen 4c698a60a9 issue #2488: Adding 'override' keyword for new Label classes. 2013-08-15 21:00:06 +08:00
James Chen 5b227743ee issue #2488: Fixing typo: #include "CCFontFreeType.cpp" --> "CCFontFreeType.h". 2013-08-15 20:59:05 +08:00