carlo morgantini
ea72e046c6
Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
2013-07-11 17:38:07 -07:00
Ricardo Quesada
2d0aed4f0e
libfreetype for iOS and Mac
...
libfreetype for iOS and Mac
2013-07-11 17:20:10 -07:00
carlo morgantini
1caa6dfbd7
start integrating FreeType for font rendering
2013-07-11 15:43:45 -07:00
minggo
e5a80eed91
fixed conflict
2013-07-09 10:39:16 +08:00
James Chen
db0a15b02f
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
2013-07-06 15:19:09 +08:00
James Chen
43260a2bf1
[Windows] Fixing complication errors for WINDOWS.
2013-07-06 10:49:13 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
James Chen
a67ac821f7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-04 17:15:09 +08:00
James Chen
84ce80dcd2
issue #2371 : [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL .
2013-07-04 16:31:50 +08:00
James Chen
50a8067b74
issue #2371 : std::vector<std::string>::iterator --> auto in CCFileUtils.cpp.
2013-07-04 16:30:35 +08:00
minggo
ddf54a4f49
Merge pull request #3054 from simpliplant/windows_keyboard_support
...
Hardware keyboard support (Windows support + Mac fix)
2013-07-03 23:37:13 -07:00
minggo
f019700b91
Merge pull request #3072 from minggo/const_love
...
Fix compiling errors of #3070
2013-07-03 23:19:14 -07:00
Ricardo Quesada
adaa72fbb4
Adds const to getters
...
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
2013-07-03 17:22:15 -07:00
Ricardo Quesada
77dbe995d4
Merge branch 'develop' into ios_mac_one_project
2013-07-03 11:39:00 -07:00
Rene Klacan
294f9f34f7
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
2013-07-03 15:51:24 +02:00
Rene Klacan
92c382be04
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into windows_keyboard_support
2013-07-03 10:19:35 +02:00
Ricardo Quesada
2b73d0cb5f
ios and mac projects unified in one simple xcode project
...
Not finished yet:
- iOS only includes Test Cpp (Simple Game not working yet on iOS)
It is easier to maintain and add more targets, files, etc.
2013-07-02 18:20:38 -07:00
Jaroslaw Lewandowski
d26fa847d8
- Fixing shadows for text with stroke in iOS
...
- Improved text shadows in Android (they look the same as in iOS)
2013-07-02 22:45:07 +01:00
Rene Klacan
fc8b60a2cf
fixed issues on win32 and mac keyboard
2013-07-02 11:39:18 +02:00
James Chen
0d040bae76
closed #2347 : Macros like CC_KEYBOARD_SUPPORT should not be in header file.
2013-07-01 16:48:42 +08:00
Sergey Shambir
1c52517770
CocosDenshion: added effects customization for 7 platforms.
...
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.
Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
2013-06-29 13:44:16 +04:00
James Chen
e2b9863bf7
issue #2325 : [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.
2013-06-29 11:44:14 +08:00
Rene Klacan
444a6e689e
added windows keyboard support
2013-06-29 01:46:39 +02:00
minggo
8938268183
issue #2329 : remove unneeded codes
2013-06-26 16:42:11 +08:00
James Chen
229e181625
issue #2305 : [Win32] Removing the third party library pthreadVCE2.
2013-06-26 12:52:38 +08:00
folecr
295f9e0fec
Do nothing in the case of forAsync
2013-06-24 16:42:56 -07:00
folecr
2e0804ae29
Remove references to zip file
2013-06-24 15:15:25 -07:00
folecr
21405531aa
getFileData()
...
* The async case is NYI
* include stdlib for abort() when forAsync is true
2013-06-24 15:14:15 -07:00
folecr
7090d8daad
isFileExist()
2013-06-24 15:14:15 -07:00
folecr
0422953bbe
Native Asset Manager
2013-06-24 15:14:14 -07:00
folecr
e916cef32b
#define LOGD
2013-06-24 15:14:14 -07:00
folecr
6708983de2
Update target to android-10 for NDK code
2013-06-24 15:14:14 -07:00
folecr
7d4ce91b6b
Up the minSdkVersion to 9
2013-06-24 15:14:14 -07:00
James Chen
62902ad212
Fixing compilation errors for Emscripten port.
2013-06-24 10:21:36 +08:00
James Chen
80cb06d3f7
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-24 10:01:57 +08:00
James Chen
195605c85d
issue #2322 : Macro CC_DLL take no effect now since we are using static library.
2013-06-23 17:21:13 +08:00
James Chen
4a8eabd97f
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-21 17:01:22 +08:00
minggo
68559dfa00
issue #2305 : use c++11 thread instead of pthread in CCTextureCache
2013-06-21 15:29:21 +08:00
James Chen
e7ee2f2151
[Win32] undef MessageBox since it will be conflicted with cocos2d::MessageBox.
2013-06-21 11:57:14 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
James Chen
2a715ec3cf
Merge pull request #2956 from ricardoquesada/cc_namespace_obj
...
issue #2129 : Re-adds 'CC' prefix to objective-c classes.
2013-06-20 19:10:01 -07:00
Ricardo Quesada
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
Sam Clegg
b5a509e65e
[NaCl] Don't cache font size
...
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.
Review URL: https://codereview.chromium.org/14308007
2013-06-20 12:56:13 -07:00
Sam Clegg
47878c1855
[NaCl] Remove legacy nacl_mounts usage.
...
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
2013-06-20 12:56:12 -07:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
minggo
227e95d429
Merge pull request #2936 from minggo/iss2304-refator-cclayer
...
issue #2304:accelerometer fix of mac
2013-06-19 19:58:15 -07:00
minggo
924ba1bdca
issue #2304:accelerometer fix of mac
2013-06-20 10:56:13 +08:00
minggo
8d4f715008
Merge pull request #2929 from minggo/iss2304-refator-cclayer
...
issue #2304:use function to simplify acceremeter call back
2013-06-19 01:43:18 -07:00