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

3851 Commits

Author SHA1 Message Date
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration 
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
 2013-06-06 12:23:44 -07:00
James Chen ab3f42bb5f Merge pull request #2784 from dumganhar/some-fixes-marmalade-master 
[master] Some fixes:
Adding libwebsockets license in WebSocket.h/.cpp.
Log error instead of triggering an assert for shadow and stroke.
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade
Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite
[Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x.
Removing unreadable print in CCBReaderLoad.lua.
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
Marmalade projects fix.
 2013-06-05 23:47:01 -07:00
James Chen 3b9f669b51 Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it. 2013-06-06 14:41:22 +08:00
James Chen b462c9de82 Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite. 2013-06-06 14:22:09 +08:00
James Chen 0248c23b20 [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp. 2013-06-06 14:19:59 +08:00
James Chen 359225806b Log error instead of triggering an assert for shadow and stroke. 2013-06-06 14:19:16 +08:00
minggo a8fe210c7e fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing 2013-06-06 12:50:42 +08:00
minggo 3713ff5b71 Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder 
add cocosbuilder lua test sample
 2013-06-05 01:38:57 -07:00
samuele3hu 8e97c69b2f issue #2103 add cocosbuilder lua test sample 2013-06-05 16:25:23 +08:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
samuele3hu c2e2be1b1b issue #2103 add cocosbuilder lua test sample 2013-06-05 15:51:29 +08:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
chengstory ca3dc682ea 1. change “bool isEnabled()” to "bool isEnabled() const". 
2.  dolete license.
 2013-06-05 15:05:49 +08:00
minggo d71e07db4e fixed conflict 2013-06-05 13:48:31 +08:00
James Chen 2a16a6b17f Merge branch 'configuration_set_value' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-configuration_set_value 2013-06-05 09:36:53 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
minggo c21812b270 Merge pull request #2729 from ricardoquesada/timeval_64bit_fix 
cc_timeval works on 64bit machines, like OS X
 2013-06-03 22:47:45 -07:00
xyhl515 69ccb9b724 A problem of CCDrawNode::drawPolygon outline 2013-06-04 13:22:06 +08:00
minggo 5f8e9afec6 change version 2013-06-04 11:52:35 +08:00
Ricardo Quesada 7e7e943699 compiles on linux and other machines without C99 support 2013-06-03 20:45:06 -07:00
minggo 74b86021e6 Merge pull request #2624 from benjamesward/master 
Fixed linebreaks on Mac OSX
 2013-06-03 19:40:34 -07:00
minggo f9de0d2fbe Merge pull request #2714 from samuele3hu/bind_cocosbuilder 
add cocosbuilder lua_binding
 2013-06-03 19:33:19 -07:00
Ricardo Quesada c6d00a3ccb cc_timeval works on 64bit machines, like OS X 2013-06-03 17:31:59 -07:00
Ricardo Quesada 69e8628626 Adds setObject to CCConfiguration 
also adds the test
 2013-06-03 13:49:06 -07:00
Rodrigo Goncalves de Oliveira 78967b7c8e Removing unused variable 
These variables are just used on CCAssert comparisons, and result on a
compilation error on Linux (-Werror=unused-variable).

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
 2013-06-03 09:17:03 -04:00
samuele3hu af0737ce87 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bind_cocosbuilder 2013-06-03 13:48:12 +08:00
samuele3hu afa6b81ba7 issue #2103 add cocosbuilder lua bind and add a simple sample 2013-06-03 13:47:12 +08:00
James Chen cedb427a6e fixed #1647: Adding WebSocket support for Cpp and JSB. 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-02 18:55:57 +08:00
James Chen 0ff1ef6f84 Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x 2013-06-01 23:20:11 +08:00
Ricardo Quesada bf08b6040a uses the cocos2d.x namespace for "cocos2d x" configuration values 2013-05-30 16:29:36 -07:00
Ricardo Quesada f6665d492b CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-30 16:10:31 -07:00
minggo 809b020de5 Merge pull request #2652 from liuyq/memcpy 
CCTextureAtlas::updateQuad modify for the memcpy hot spot
 2013-05-29 22:58:17 -07:00
Yongqin Liu 1091e71bda Revert the CCSprite.cpp and CCSprite.h to first merge other changes 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 10:21:48 +08:00
Yongqin Liu d0f75ba92a Fix the bug for the bound check 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 09:54:09 +08:00
Ricardo Quesada 827fa638ca Adds support for "CCString" types for boolean and integers 2013-05-29 15:49:34 -07:00
Ben Ward d166de4684 Fixed tabbing. 2013-05-29 15:40:19 +01:00
Lee, Jae-Hong ae78bb9b47 Modify space character check. 2013-05-29 23:14:52 +09:00
Lee, Jae-Hong ccd20af8f9 Implement setIMEKeyboardState function for Tizen. 2013-05-29 22:46:52 +09:00
Yongqin Liu aea9e04fbf Add out of bound check for the index before do the update 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-29 19:18:46 +08:00
Yongqin Liu f6b5208be5 CCLabelAtlas.cpp: add check for n when call setDirty 
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
 2013-05-29 10:45:47 +08:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00
Ricardo Quesada ebb392ca8e CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-28 18:15:16 -07:00
Lee, Jae-Hong c20e4f3700 Keep a previous text on Tizen CCEditBox. 2013-05-28 20:43:47 +09:00
Lee, Jae-Hong 5031aa1fd3 Encoding UTF-8 on Tizen CCEditBox and check empty string. 2013-05-28 20:04:37 +09:00
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08:00
minggo 5f37e854c4 issue #2161: resolve conflict 2013-05-28 11:50:14 +08:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00