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

4079 Commits

Author SHA1 Message Date
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet. 
Many methods not implemented yet.
 2013-06-15 18:54:34 -07:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Ricardo Quesada e40adb7ae7 EaseActions and more 
Added more reverse() const
 2013-06-15 12:38:32 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 1cfca9bc60 Updating property in CCDictionary. 2013-06-15 13:42:05 +08:00
James Chen 7295551f0f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-15 11:15:28 +08:00
minggo 5e83f36433 issue #2284: not treat using deprecated functions as error 2013-06-14 17:32:07 +08:00
minggo 47f4aee3cc issue #2284: use GLuint to fix compiling error 2013-06-14 16:48:18 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo ab8448e96b issue #2284: enable c++11 for emscripten port 2013-06-14 15:27:11 +08:00
minggo 400642baa8 issue #2284: initialize parameter as declared 2013-06-14 15:18:35 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
James Chen e56c63b03d Merge pull request #2884 from ricardoquesada/actions_clone_pattern 
issue #2289: Actions with clone() pattern 1/3
 2013-06-13 23:19:04 -07:00
Ricardo Quesada 8a6d33a212 Adds CC prefix to CALLBACK() 
Now it is called: CC_CALLBACK()
 2013-06-13 20:36:43 -07:00
Ricardo Quesada e2e68aa36d Removes "calling explicit constructor" 2013-06-13 20:08:56 -07:00
Ricardo Quesada 98190a21c0 Actions with clone() pattern 1/3 
This is the 1st patch of 3.

1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
 2013-06-13 17:25:14 -07:00
Mykyta Usikov 28e8899089 fixed strokeColor and fontFillColor of CCLabelTTF 2013-06-13 14:16:33 +03:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
minggo 5996e99b74 Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks 
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
 2013-06-12 22:51:21 -07:00
Ricardo Quesada c1d519aac2 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-13 10:46:28 +08:00
minggo 92ce25371a Merge pull request #2874 from ricardoquesada/labelttf_mac_fix 
LabelTTF vertical alignment fixed on OS X
 2013-06-12 19:45:31 -07:00
Ricardo Quesada 1780643c63 merge pull reqeust fixing for iOS7 and Xcode5 into master 2013-06-13 10:43:41 +08:00
James Gregory 872be8e964 Initial commit of browser accelerated async image-loading code for Emscripten. 2013-06-12 14:46:32 -07:00
James Gregory cdb63898d9 Simplify AsyncStruct slightly -- make it a class, add a constructor. 2013-06-12 10:03:12 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada 83b43ab93e Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 
Handy macros for callbacks.
Instead of:
	std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
	CALLBACK_1(func_ptr, instance)

And also removes more warnings from the tests
 2013-06-11 16:30:05 -07:00
Ricardo Quesada 75b9913c92 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-11 14:59:40 -07:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
Maciej Czerniak dddb487639 fix formatting 2013-06-11 16:43:35 +02:00
Maciej Czerniak c9b88e1c0c add missing Norwegian language for marmelade platform 2013-06-11 16:41:54 +02:00
Maciej Czerniak eb79c01003 add missing Norwegian language for linux platform 2013-06-11 16:39:33 +02:00
Rene Klacan 44851e36e9 removed forgotten debug printf 2013-06-11 15:37:51 +02:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
minggo 29607bd741 fixed #2259:add description of path that custom font can put in 2013-06-10 23:01:48 +08:00
James Chen 5da7a7692e Fixing a logic error in CCDirector.cpp. 2013-06-10 21:19:22 +08:00
Rene Klacan 83be06bafb check if delegate is not null when dispatching keyboard event 2013-06-10 00:54:31 +02:00
minggo c84a071ae5 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:08:26 +08:00
minggo ec7bf7a9d6 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:03:38 +08:00
James Chen 4edd35e2b1 Merge pull request #2829 from dumganhar/nacl-fix 
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
 2013-06-08 03:00:04 -07:00
minggo 6eaa1f97ec Merge pull request #2828 from minggo/develop 
fixed #2161: fixed crash of loading ETC file
 2013-06-08 02:02:52 -07:00
minggo d5bfe10379 fixed #2161: fixed crash of loading ETC file 2013-06-08 17:01:45 +08:00
minggo 2e9c4c55de Merge pull request #2827 from minggo/master 
fixed crash of loading ETC file
 2013-06-08 02:00:19 -07:00
minggo 2b3f3b6744 fixed #2161: fixed crash of loading ETC file 2013-06-08 16:58:18 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
James Chen 51aa2433fc Updating makefile for native client. 2013-06-08 15:35:45 +08:00
minggo 52f55802b7 Merge pull request #2826 from minggo/develop 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:44:01 -07:00
minggo f56c20657b fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:42:52 +08:00
minggo ababa5e885 Merge pull request #2825 from minggo/master 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:41:54 -07:00
minggo 6d3615157a fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:40:03 +08:00
minggo f2be4c62ee Merge pull request #2820 from minggo/develop 
fixed #2161: don't close AssetManager
 2013-06-07 20:24:27 -07:00
minggo b023158c85 fixed #2161: don't close AssetManager 2013-06-08 11:23:13 +08:00
James Chen 2fae3db792 Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it. 2013-06-08 11:10:39 +08:00
carlo morgantini 494ec43fe8 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-08 10:59:07 +08:00
minggo cdf24ceba1 Merge pull request #2815 from minggo/master 
fix a bug of Cocos2dxETCLoader.java
 2013-06-07 19:58:47 -07:00
minggo 206502dccb fixed #2161: don't close AssetManager 2013-06-08 10:57:19 +08:00
carlo morgantini b7ffb5b810 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-07 16:33:01 -07:00
Michael Chinen 9471c51201 set up keyboard handling for mac 2013-06-07 20:29:02 +09:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
James Chen 8cfe969137 Fixing compilation errors for win32. 2013-06-07 14:31:15 +08:00
James Chen ec8ab8bd8b Updating multi-platform-xxx template for win32. 2013-06-07 12:57:28 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
flaming0 68ac1684a8 Fix windows build (nullptr instead of NULL when assigning to std::function) 2013-06-07 00:08:59 +04: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 5832934e41 Reverting target to android-8. 2013-06-06 16:20:22 +08:00
James Chen deceba3fd2 Merge branch 'menuitem_toggle_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_toggle_fixes 2013-06-06 15:52:33 +08:00
Rene Klacan 8b16178f9f Merge pull request from cocos2d/develop 2013-06-06 09:42:18 +02:00
James Chen 1a5e9f3717 Fixing a bug that display is wrong when setting setTexture(NULL) for CCSprite. 2013-06-06 15:02:57 +08:00
James Chen 5c592943db [Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp. 2013-06-06 15:02:57 +08:00
James Chen cb08479b7e Log error instead of triggering an assert for shadow and stroke. 2013-06-06 15:02:57 +08: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
James Chen a8ed579f9e Merge pull request #2778 from ricardoquesada/dealloc_log_fixed 
on dealloc, log "this" with %p, not %x.
 2013-06-05 22:00:16 -07:00
minggo a8fe210c7e fixed #2260: make CCDictionary::createWithContentsOfFile() return NULL when the file is missing 2013-06-06 12:50:42 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
 2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
James Chen 3c69a17752 [Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey. 2013-06-06 10:12:44 +08:00
Ricardo Quesada 479062fdb7 on dealloc, log "this" with %p, not %x. 
Also adds %p where it was missing.
And make a few fixes on the iOS project
 2013-06-05 18:21:05 -07:00
Ricardo Quesada 3441ca5563 MenuItemToggle is fixed 
Supports callbacks now.
Updated MenuTest to supports the new API.
Updated CHANGELOG and version
Updatged Xcode project for Mac
 2013-06-05 17:51:40 -07:00
James Chen a5263673fb Fixing compilation errors on Android. 2013-06-05 19:56:23 +08:00
James Chen 2d81a66444 [Linux] Don't treat the warning of deprecated-declarations as error. 2013-06-05 17:48:04 +08:00
James Chen cda02af1e7 Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically. 2013-06-05 17:35:19 +08:00
James Chen dc8cfeb648 Merge branch 'menuitem_function_callback' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-menuitem_function_callback 2013-06-05 16:40:25 +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
Ricardo Quesada d27da88c06 Adds setObject to CCConfiguration 
also adds the test

Conflicts:
	scripting/javascript/bindings/generated
 2013-06-05 09:46:56 +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
Ricardo Quesada 609801e900 compiles on linux and other machines without C99 support 2013-06-05 09:29:27 +08:00
Ricardo Quesada 4b37ec252a Adds C++11 std::function<> support to MenuItem 
Updates some of the tests
 2013-06-04 18:29:26 -07:00
Ricardo Quesada 9b305a60d1 cc_timeval works on 64bit machines, like OS X 2013-06-05 09:29:12 +08:00
James Chen bb635c280c Updating multi-platform-xxx template for iOS and Android after enabling c++ 11. 2013-06-04 20:52:29 +08:00
Sergey Shambir f5b9b4580c Enabled c++0x flag, use OpenAL audio backend by default. 2013-06-04 14:29:29 +04:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
René Klačan f66e12f414 Merge pull request #4 from cocos2d/develop 
pull request from main repo
 2013-06-04 02:05:36 -07: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
James Chen 932d6dfb85 Merge pull request #2726 from xyhl515/develop 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:15:13 -07:00
minggo 1c700157b3 declare _functions as it is initialized 2013-06-04 11:57:32 +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
Ben Ward 0f8fa2e5a4 Fixed tabbing. 2013-06-04 10:45:20 +08:00
Ben Ward 73b8050fa1 Fixed linebreaks on Mac OSX 2013-06-04 10:45:07 +08: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
Ricardo Quesada 39928d6a80 Adds std::function support in CCCallFunc 
And fixes some minor issues on the iOS and OS X projects
 2013-06-03 12:13:24 -07:00
xyhl515 26e356c33c A problem of CCDrawNode::drawPolygon outline 2013-06-03 22:19:37 +08:00
Rene Klacan c4ec15752a simplified CCKeyboardDispatcher and CCLayer does not inherit from CCKeyboardDelegate 2013-06-03 16:06:33 +02: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
René Klačan 9e4c5bbca3 Merge pull request #3 from cocos2d/develop 
pull request from main repo
 2013-06-03 04:07:43 -07:00
James Chen 5386dfcbfd Enabling c++ 11 support for iOS. cocos2dx/proj.ios/cocos2dx.xcodeproj also needs to be updated. 2013-06-03 16:34:41 +08:00
minggo 5c1a408797 issue #2242:use -std=gnu++0x for linux and native client project 2013-06-03 13:50:19 +08: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
minggo 0a64e7a041 enable c++11 for linux and natvie client projects 2013-06-03 11:02:54 +08:00
minggo 236286829b enable c++11 2013-06-03 11:02:35 +08:00
Rene Klacan c4d231aef4 comments fixed 2013-06-02 13:37:13 +02:00
Rene Klacan 0489ba51fd deleted defines in proj.linux's Makefile 2013-06-02 13:18:06 +02: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
Sergey Shambir 984ed75b9a Linux: added project part for QtCreator. 
Allows easily setup cocos2d on Linux in QtCreator IDE.
 2013-06-02 10:15:14 +04:00
Rene Klacan c8b4291731 keyboard support throught compiler directive 2013-06-02 04:11:43 +02:00
James Chen 0ff1ef6f84 Merge branch 'tizen_2.1' of https://github.com/pyrasis/cocos2d-x 2013-06-01 23:20:11 +08:00
Rene 61ec83b742 Merge pull request #1 from cocos2d/develop 
Develop
 2013-05-31 16:27:23 -07:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
Rene Klacan 50ad3e1c80 KeyboardDispatcher + tests for it on linux 2013-05-31 14:29:32 +02:00
minggo 57600783c4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-05-31 10:29:39 +08:00
Ricardo Quesada 3cbb6c4abb uses the cocos2d.x namespace for "cocos2d x" configuration values 2013-05-31 10:25:55 +08:00
Ricardo Quesada 3383fc5f04 CCConfiguration supports default values in the query 
Adds tests for the new API as well
 2013-05-31 10:25:34 +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 08b80bfbc9 Merge pull request #2675 from j4m3z0r/emscriptenate 
Emscripten: Fix calculation of offsets in font rendering so that we don't scribble a...
 2013-05-29 23:05:05 -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
James Gregory 8b4f5b5853 Fix calculation of offsets in font rendering so that we don't scribble all over memory! 2013-05-29 21:25:32 -07:00
minggo 1ff88de561 Merge pull request #2666 from jotel/ccdata-in-userdefault 
Ability to save/retrieve CCData into/from CCUserDefault
 2013-05-29 19:40:23 -07:00
minggo b6ddd86ecf Merge pull request #2673 from j4m3z0r/emscriptenate 
Add destructor to CCGLBufferedNode
 2013-05-29 19:33:44 -07:00
Ricardo Quesada d61bfda440 Adds support for "CCString" types for boolean and integers 2013-05-30 10:21:49 +08:00