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
Ricardo Quesada
e40adb7ae7
EaseActions and more
...
Added more reverse() const
2013-06-15 12:38:32 -07: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
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
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
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
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
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
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
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
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
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
flaming0
68ac1684a8
Fix windows build (nullptr instead of NULL when assigning to std::function)
2013-06-07 00:08:59 +04: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
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
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
Ricardo Quesada
d27da88c06
Adds setObject to CCConfiguration
...
also adds the test
Conflicts:
scripting/javascript/bindings/generated
2013-06-05 09:46:56 +08:00