minggo
b9c85d87ae
Merge pull request #2896 from dumganhar/iss2129-format-codes
...
issue #2129 : New naming of member varibles, renaming m_iVar to _var.
2013-06-17 03:27:01 -07:00
James Chen
4c6043c9d2
Merge pull request #2898 from pyrasis/tizen_2.1
...
[Tizen] Add armv7l webp library.
2013-06-15 20:03:37 -07:00
Lee, Jae-Hong
8c1953eed9
Add armv7l webp library.
2013-06-16 11:07:55 +09:00
James Chen
c0d44cb2e4
fixed #2129 : Rename m_iVar to _var, remove CC prefixes.
2013-06-15 14:03:30 +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
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08: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
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
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
Lee, Jae-Hong
1bd3f10601
Support Tizen device.
2013-06-12 10:20:18 +09: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
f31a258c01
Merge pull request from cocos2d/develop
2013-06-11 01:06:12 +02: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
2b3f3b6744
fixed #2161 : fixed crash of loading ETC file
2013-06-08 16:58:18 +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
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
minggo
206502dccb
fixed #2161 : don't close AssetManager
2013-06-08 10:57:19 +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
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
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
Rene Klacan
8b16178f9f
Merge pull request from cocos2d/develop
2013-06-06 09:42:18 +02: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
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
0248c23b20
[Mamarlade] Fixing a compilation error in cocos2dx/platform/marmalade/CCImage.cpp.
2013-06-06 14:19:59 +08:00
minggo
a8fe210c7e
fixed #2260 : make CCDictionary::createWithContentsOfFile() return NULL when the file is missing
2013-06-06 12:50:42 +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
609801e900
compiles on linux and other machines without C99 support
2013-06-05 09:29:27 +08:00
Ricardo Quesada
9b305a60d1
cc_timeval works on 64bit machines, like OS X
2013-06-05 09:29:12 +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
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