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

4650 Commits

Author SHA1 Message Date
Huabing.Xu 205f6765e8 issue #2460: add glfw include and library file to Xcode 2013-08-16 15:43:25 +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
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
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 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 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
James Chen 9dbd74d2a8 Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner 
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
 2013-08-15 04:19:17 -07:00
carlo morgantini afd0e88284 Clean up as for code review 2013-08-14 12:37:59 -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
boyu0 2c3fd7ebae issue #2522: fix some wrong indent. 2013-08-13 10:11:28 +08: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 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
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
godyZ 9dde196140 update s3tc#8,resolve CCConfiguration conflict 2013-08-09 15:47:20 +08:00
godyZ e507bb0deb update s3tc #7 2013-08-09 15:00:26 +08:00
godyZ 9bdb8a43d7 update s3tc #6 2013-08-09 14:37:47 +08:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
folecr 063c730726 Take orientation into account when reporting accelerometer sensor readout 2013-08-08 14:40:26 -07:00
godyZ f648a3f907 modify linux makefile 2013-08-08 17:06:42 +08:00
minggo bf79a0560b issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
godyZ 727ae1bbc2 update s3tc #4 , code standardization 2013-08-08 14:59:46 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
minggo 552c63d0cf Merge pull request #3269 from metalbass/patch-4 
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
 2013-08-07 18:45:27 -07:00
carlo morgantini 83b2377a76 some more clean up and removed CCStringTTF 2013-08-07 16:36:04 -07:00
James Chen 87736683c0 Merge pull request #3387 from pyrasis/tizen_2.2 
[Tizen] Enable LocalStorage
 2013-08-07 03:08:38 -07:00
Lee, Jae-Hong 5a8ec8ca5e [Tizen] Enable LocalStorage 
- add sqlite3 headers and libraries.
- use sqlite3 library.
 2013-08-07 19:01:41 +09:00
Lee, Jae-Hong b42868fd69 [Tizen] Remove Tizen 2.1 headers and libraries. 2013-08-07 18:52:15 +09:00
godyZ 674fe025b0 update s3tc #3 ,standard of code 2013-08-07 16:39:05 +08:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
boyu0 684e005ce7 issue #2345: edit for linux compile error 2013-08-07 14:10:42 +08:00