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

11616 Commits

Author SHA1 Message Date
samuele3hu 7f8099ce69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	tools/bindings-generator
 2013-08-15 16:21:32 +08:00
samuele3hu 2d5482a0ab issue #2433:Modify cocos2d.ini 2013-08-15 16:14:14 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
carlo morgantini afd0e88284 Clean up as for code review 2013-08-14 12:37:59 -07:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
minggo 954ba8755e Merge pull request #3416 from folecr/android_gdb_script_for_testcpp 
Android gdb script for TestCpp
 2013-08-13 18:50:04 -07:00
folecr b4edb14d33 Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging. 2013-08-13 15:50:58 -07:00
folecr 4d34cfc28f Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore 2013-08-13 11:29:53 -07:00
folecr 84054a237c Android platform version used matches all other sample projects 2013-08-13 11:28:56 -07:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-08-13 11:28:54 -07:00
carlo morgantini 15ec303278 more clean ups on tests for label 2013-08-13 10:12:02 -07:00
folecr b61ce3c79d ndkgdb.sh for TestCpp 2013-08-13 08:47:48 -07:00
folecr 17c7b7cbcf APP_OPTIM is debug 2013-08-13 08:47:48 -07:00
folecr 652920eaac set android:debuggable property to true 2013-08-13 08:47:48 -07:00
folecr 75f7af00a6 TestCpp builds both ARM and x86 versions 2013-08-13 08:47:48 -07:00
folecr cd0f1beaf4 fix evaluation of properties array read from local.properties 2013-08-13 08:47:48 -07:00
folecr ef7c3b2b09 Remove unused option in build script 2013-08-13 08:47:48 -07:00
boyu0 f9181d3265 Merge branch 'tilemap_plain_xml_format_support' of https://github.com/simpliplant/cocos2d-x into tilemap_plain_xml_format_support and add extra control to parse the tmx file for load the xml format tiles. 2013-08-13 18:32:50 +08:00
zhangbin bab0589a98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-13 15:13:01 +08:00
zhangbin 505f156972 Update the SDK of plugin qh360 2013-08-13 15:12:38 +08:00
boyu0 2c3fd7ebae issue #2522: fix some wrong indent. 2013-08-13 10:11:28 +08:00
minggo a9a9c29e4a Merge pull request #3417 from folecr/cleanup 
Minor code cleanup
 2013-08-12 18:40:42 -07:00
carlo morgantini 026b3e90b8 clean up 2013-08-12 16:16:34 -07:00
carlo morgantini 35b5e30190 alignment added to new label creation 2013-08-12 15:41:29 -07:00
carlo morgantini d15d84c05f samples cleaned up 2013-08-12 15:09:28 -07:00
folecr 934ea7510f Use explicit boolean compare instead of implicit float -> boolean conversion 2013-08-12 14:21:58 -07:00
carlo morgantini 097a5c488a New Label tests plus bug fixing 2013-08-12 13:29:54 -07:00
boyu0 fc923aac93 closed #2522: Fix compile error. 2013-08-12 18:18:09 +08:00
boyu0 1f87fa37f4 closed #2522: Fix some coding style. 2013-08-12 17:05:19 +08:00
James Chen db00378ead Merge pull request #3415 from godyZ/develop 
modify the Win32 vcxproj file , resolve complier error
 2013-08-12 00:57:20 -07:00
godyZ 963eb5c191 modify the Win32 vcxproj file , resolve complier error 2013-08-12 15:54:05 +08:00
boyu0 cde4a7945c closed #2522: Let Image::initWithImageData() support the packed data. 2013-08-12 11:54:54 +08:00
James Chen 9cf3bf64d5 issue #2521: Updating JS-Test. 2013-08-12 11:31:54 +08:00
James Chen 05534e87f4 closed #2521: Updating jsb_cocosbuilder.js, it supports CCControl now. 2013-08-12 11:27:09 +08:00
James Chen 1af0db12f6 issue #2521: Reporting an error when the callback function is undefined in 'js_cocos2dx_setCallback'. 2013-08-12 11:24:08 +08:00
James Chen 7d3edde8f1 issue #2521: Updating tojs/cocos2dx_extension.ini, bind more CCControls. 2013-08-12 11:23:16 +08:00
James Chen f0e0b7600b issue #2521: Adding 'cc.convertColor3BtoHexString' in jsb_cocos2d.js. 2013-08-12 11:22:15 +08:00
James Chen 12ffdfc4fd issue #2521: TestJavascript needs ccbreader support. 2013-08-12 11:21:31 +08:00
James Chen 86fef75963 issue #2521: Removing an unused method ControlStepper::setValue(double value, bool send); since it's not implemented and there is an similar method 'setValueWithSendingEvent' could replace it. 2013-08-12 11:20:48 +08:00
James Chen a34c70d253 issue #2521: Fixing a logical error in CCBReader::addOwnerOutletNode. 'NULL != node' --> 'NULL == node'. 2013-08-12 11:19:21 +08:00
James Chen 331f0ef7b0 issue #2521: Capture event of ControlButton in CCB for JSB. 2013-08-12 11:18:07 +08:00
James Chen dbd58b6aa7 issue #2521: Updating comments where searchs full path. 2013-08-12 11:06:51 +08:00
Maciej Czerniak 86b2ce33af fixed stroke font color with channel color values other than 255 2013-08-11 11:38:38 +02:00
James Chen 2ff3655fff Merge pull request #3408 from pyrasis/tizen_2.2 
[Tizen] Update project files
 2013-08-10 07:23:13 -07:00
Lee, Jae-Hong 66593ae4bf [Tizen] Update project files 
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
 2013-08-10 23:11:31 +09:00
minggo d2b96be1e6 Merge pull request #3401 from folecr/accel 
Take orientation into account when reporting accelerometer sensor readout
 2013-08-10 05:46:42 -07:00
James Chen 22cdfee84e Merge pull request #3407 from dumganhar/iss2521-js-ccb-owner 
closed 2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set.
 2013-08-09 23:45:34 -07:00
James Chen fb6f97de95 closed #2521:[JSB] CCBReader can't set properties to owner if 'owner var' is set. 2013-08-10 14:43:55 +08:00
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
minggo 8f30c81ac7 Merge pull request #3397 from godyZ/develop 
S3tc compressed texture support
 2013-08-09 01:09:40 -07:00