James Chen
3d4005ebbc
issue #2129 : Bug fix in "Color4B::Color4B(const Color4F &color4F)".
2013-07-08 14:53:47 +08:00
James Chen
1eacab0278
Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix
2013-07-08 10:51:07 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
Ricardo Quesada
c65b6f1417
Adds const to more getters
...
adds `const` to more getters.
2013-07-06 22:01:21 -07: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
dfde41b932
issue #2129:fix conflicts
2013-07-05 17:32:50 +08:00
minggo
04465622b7
issue #2129:remove prefix of types in ccTypes.h
2013-07-05 16:49:22 +08:00
minggo
7e56bb57c8
Merge pull request #3076 from samuele3hu/execDev
...
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-05 01:32:06 -07:00
James Chen
268245635d
issue #2373 : Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned.
2013-07-05 15:08:52 +08:00
James Chen
ec902c3550
issue #2373 : Adding missing overload const getter functions.
2013-07-05 15:08:52 +08:00
James Chen
d2746bbe90
issue #2373 : Removing inline for virtual function. Adding more const getter functions.
2013-07-05 15:08:52 +08:00
samuele3hu
9eb31df9f3
issue #2244:Replace the tab with space
2013-07-05 11:29:21 +08:00
samuele3hu
2aef49f251
issue #2244:Replace the tab with space
2013-07-05 11:24:28 +08:00
James Chen
267823d473
Merge pull request #3077 from dumganhar/iss2371-template
...
Updating multi-platform-template for iOS and Mac, and deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-04 20:01:33 -07:00
James Chen
a25dce5b2d
issue #2371 : Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
2013-07-05 10:52:46 +08:00
samuele3hu
bb244edae6
issue #2244:Modify a function name to createCCBReader
2013-07-05 10:25:37 +08:00
samuele3hu
c0e89a4ee9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-05 09:49:01 +08:00
minggo
7bcafb46a4
Merge pull request #3051 from samuele3hu/execDev
...
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
2013-07-04 03:33:12 -07:00
samuele3hu
b0e4757c24
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
2013-07-04 17:54:02 +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
samuele3hu
570f2663f4
issue #2244:Modify ScriptData struct and functions related with sendEvent
2013-07-04 15:44:42 +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
4880543305
Merge pull request #3073 from xxuejie/add-namespace-to-macro
...
Add namespace prefix to selector macros
2013-07-03 23:28:16 -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
Xuejie Xiao
a1fbee0bdf
Merge remote-tracking branch 'upstream/develop' into add-namespace-to-macro
...
Conflicts:
cocos2dx/cocoa/CCObject.h
2013-07-04 13:59:36 +08:00
Xuejie Xiao
3401c909d8
Add namespace prefix to selector macros
2013-07-04 13:35:11 +08:00
minggo
c327bc7906
issue #2373:add const in pkg files
2013-07-04 12:50:17 +08:00
samuele3hu
c5e5c49332
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-04 09:52:28 +08:00
Ricardo Quesada
1d011510af
setTexParams() is passed as a const reference
...
All structs (PODs), should be passed as const reference.
eg: Size, Point, ccTexParams, etc... should be passed as const reference.
2013-07-03 17:59:22 -07:00
Ricardo Quesada
216c6eada5
Adds more const in getters
...
In Sprite and Texture2D
2013-07-03 17:44:41 -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
James Chen
3fa5c776b8
issue #2359 : Using PositionColor shader when texture is NULL in Sprite.
...
TODO: PostionTextureColor shader should support empty texture.
2013-07-03 23:34:45 +08:00
Rene Klacan
294f9f34f7
KEYBOARD_SUPPORT renamed to CC_KEYBOARD_SUPPORT
2013-07-03 15:51:24 +02:00
James Chen
7892f1ac9d
Merge pull request #3053 from dumganhar/iss2285-js-motionstreak
...
Adding MotionStreak test for TestJavascript.
2013-07-03 01:36:07 -07: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
James Chen
501afdd2e3
closed #2359 : Sprite will become white block when using CCControlSwitch.
...
setShaderProgram should not be in Sprite::setTexture since setTexture is not related to shader.
2013-07-03 16:16:30 +08:00
James Chen
331c688f6f
Merge pull request #3063 from dumganhar/DarraghCoy-selector_cast_safety
...
Merge PR#3058: Adding extra safety to selector casting macros
2013-07-03 01:09:09 -07:00
minggo
bf47cf55c7
Merge pull request #3059 from jotel/shadow-fix
...
Text Shadows fix
2013-07-03 01:00:03 -07:00
minggo
2f88109a96
Merge pull request #3055 from DarraghCoy/add_rect_union_with_rect
...
Add Rect::unionWithRect
2013-07-03 00:42:55 -07:00
minggo
de15064317
Merge pull request #3062 from minggo/iss2346-opengl-error
...
Fixed a bug in CCTMXLayer when set uniform
2013-07-03 00:31:10 -07:00
minggo
f089e62e8f
closed #2361:fix a crsash caused by Set::removeAllObjects
2013-07-03 15:26:58 +08:00
minggo
1bd5398f91
Merge branch 'cc_draw_solid_circle' of https://github.com/DarraghCoy/cocos2d-x into cc_draw_solid_circle
2013-07-03 14:45:36 +08:00
samuele3hu
5a64c9e1b3
issue #2244:Add some constructor
2013-07-03 14:19:00 +08:00
James Chen
661a934e82
Merge branch 'selector_cast_safety' of https://github.com/DarraghCoy/cocos2d-x into DarraghCoy-selector_cast_safety
2013-07-03 14:06:53 +08:00
samuele3hu
82ba8b0198
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-03 11:20:17 +08: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
Darragh Coy
abbbc3191e
Add extra safety to selector casting macros
...
Use static_cast<> instead of C-Style casts in the callfunc0_selector() etc. series of macros as this will allow the compiler to perform more stringent error checking and catch out cases where incompatible function signatures are being casted. This helps prevent very subtle and difficult to track down bugs where the signature of the function being casted is not what Cocos2dx expect - which can cause strange things to happen and corrupt the current stack frame.
2013-07-02 14:36:09 -07:00
Darragh Coy
e6270e64de
Bugfixes to the Set class.
...
1: If adding an object to the container then only retain the object again provided it's not already been added. The underlying std::set does not support duplicate entries. (see: www.cocos2d-x.org/boards/6/topics/10876)
2: When removing an object only CC_SAFE_RELEASE it if it was actually contained in the set. (see: http://www.cocos2d-x.org/boards/6/topics/10876 )
3: Fix a bug in 'removeAllObjects' where the underlying std::set container was not being cleared. (see: https://github.com/cocos2d/cocos2d-x/issues/2283 )
2013-07-02 14:24:14 -07:00
Darragh Coy
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
Darragh Coy
da58f035c5
Add CCRect::unionWithRect
...
Add a new CCRect utility function called 'unionWithRect' which computes the minimum rectangle that contains the current rectangle and another given rectangle, similar to to the following .NET function: http://msdn.microsoft.com/en-us/library/ms521839.aspx
2013-07-02 11:39:49 -07:00
James Chen
ed1fa76fd6
issue #2285 : ccColor3B --> const ccColor3B& for MotionStreak::create.
2013-07-02 17:46:45 +08:00
Rene Klacan
fc8b60a2cf
fixed issues on win32 and mac keyboard
2013-07-02 11:39:18 +02:00
minggo
55202b978a
Merge pull request #3048 from dabingnn/iss2328-refractor-etc
...
Iss2328 refractor etc
2013-07-02 01:37:55 -07:00
Huabing.Xu
5929c7662c
issue #2328 refractor etc support:
...
1. GL_ETC1_RGB8_OES not defined will return not support hardware etc
2. remove some space and comments
2013-07-02 15:36:47 +08:00
samuele3hu
ec801ae89d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev
2013-07-02 15:29:19 +08:00
samuele3hu
9b08cee01f
issue #22434:make some execute funs into one funs in ScriptEngineProtocol
2013-07-02 15:23:51 +08:00
James Chen
b843d3cd88
LayerColor::initWithColor should return false when Layer::init() returns false.
2013-07-02 14:45:06 +08:00
Huabing.Xu
5aa0299160
adjust cocos2d.vcxproj.filters
2013-07-02 14:09:01 +08:00
Huabing.Xu
041bef148a
Merge branch 'origin/develop'
...
Conflicts:
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d.vcxproj.filters
2013-07-02 13:47:02 +08:00
James Chen
4e5ee103ec
Fixing errors on windows.
2013-07-01 18:22:09 +08:00
Huabing.Xu
9642930779
give Texture2D::_pixelFormat a default value in construction
2013-07-01 18:16:56 +08:00
Huabing.Xu
4e9e893c8e
1. Add C++ code to decode ETC file
...
2. Configuration and function supportsETC()
2013-07-01 17:40:57 +08:00
James Chen
c2ce65a32b
issue #2347 : Compiled ok for android, marmalade and nacl, windows needs to be tested too.
2013-07-01 17:35:51 +08:00
James Chen
1ae41d07aa
closed #2347 : Keyboard is supported from cocos2d-x 3.0.
2013-07-01 17:15:49 +08: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
minggo
ce3cea2fdb
closed #2346 : use shader program to set uniform
2013-07-01 16:02:46 +08:00
samuele3hu
fe8e30c3e0
issue #2243:Add a uniform fund in ScriptEngineProtocol
2013-07-01 15:04:14 +08:00
Squallium
c770a4bdc8
Added ccFPSImages entity as linked resource
2013-06-30 22:00:29 +02: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
b76798505c
closed #2342 : Fixing indention.
2013-06-29 15:04:43 +08:00
James Chen
bb2f19535b
closed #2342 : Fixing compilation errors when CC_ENABLE_CACHE_TEXTURE_DATA is enabled.
2013-06-29 15:01:50 +08:00
Justin Hawkwood
37ca32e75c
Corrected code to use textDefinition properties
2013-06-29 15:00:17 +08:00
James Chen
e2b9863bf7
issue #2325 : [Linux] KEYBOARD_SUPPORT --> CC_KEYBOARD_SUPPORT.
2013-06-29 11:44:14 +08:00
Ricardo Quesada
b846a3060e
cocos2d-x in Mac:
...
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
2013-06-28 19:02:10 -07:00
Rene Klacan
444a6e689e
added windows keyboard support
2013-06-29 01:46:39 +02:00
Ricardo Quesada
b0de6d0e8c
Project fixes
...
In debug: optimization is NONE, and other small fixes for Mac
2013-06-27 18:14:24 -07:00
minggo
4dd2b07a32
Merge pull request #3019 from Squallium/develop
...
removed libxml2 dependence from libcocos2d
2013-06-27 00:13:48 -07:00
Squallium
f53e4f692f
removed libxml2 dependence from libcocos2d
2013-06-27 08:30:55 +02:00
boyu0
9d227f6f1f
Fixed Bug#2327:CCNode::isScheduled() is not implemented
...
Add CCScheduler::isScheduledForTarget() method
2013-06-27 12:05:47 +08:00
minggo
8938268183
issue #2329 : remove unneeded codes
2013-06-26 16:42:11 +08:00
minggo
ca2966745e
closed #2305 : fix a running time error
2013-06-26 15:11:13 +08:00
minggo
9d44b52ebf
issue #2305:use c++11 thread correctly
2013-06-26 14:48:19 +08:00
James Chen
10f4446596
Merge pull request #2998 from sbc100/emscripten_linux
...
closed #2333 : 1) Share top level Makefile between emscripten, linux and nacl.
2) Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 22:43:16 -07:00
James Chen
ad7d606b48
Merge pull request #2703 from sergey-shambir/linux_qmake
...
close #2332 : [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
James Chen
229e181625
issue #2305 : [Win32] Removing the third party library pthreadVCE2.
2013-06-26 12:52:38 +08:00
Sam Clegg
f9ae701a4b
Fix emscripten build on linux
...
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder). On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
2013-06-25 11:47:52 -07:00
minggo
8d782133b8
Merge pull request #2983 from folecr/ccx_filesystem
...
Improve Android file system read performance
2013-06-25 02:05:37 -07:00
James Chen
38d597b308
Merge pull request #2985 from ricardoquesada/mac_workspace
...
issue #2325 : Adds mac workspace. Not finished.
2013-06-24 19:56:25 -07:00
Ricardo Quesada
ef6f67902f
Adds mac workspace
...
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
folecr
ee5f319a77
Fix include path
2013-06-24 17:29:24 -07: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
be6633b560
Add -landroid to LOCAL_LDLIBS and LOCAL_EXPORT_LDLIBS
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
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
James Chen
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08: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
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
James Chen
1b3d0c39ad
issue #2322 : Action now is inherited from Object and Clonable now.
2013-06-23 17:22:23 +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
aaeb4e13b0
issue #2322 : Adding Property Sheet cocos2dx.props for sharing project configuration. Now it's only for linking libraries.
2013-06-23 17:20:12 +08:00
Ricardo Quesada
64d7cd404e
Removes copy from Point.
...
Adds clone instead
2013-06-21 15:13:52 -07:00
Ricardo Quesada
6c0c48a3a9
Removes CallFuncO and CallFuncND
...
...which can be simualted with CallFunc and CallFuncN.
Adds std::function() support to CallFuncN.
Adds more samples
2013-06-21 14:58:52 -07: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
b434190a70
issue #2305 : tab -> 4 spaces
2013-06-21 15:49:45 +08:00
minggo
ef7fd16f76
issue #2305 : tab -> 4 spaces
2013-06-21 15:43:17 +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
56f8ab2675
Typo fixes in CCNode.h.
2013-06-21 13:47:29 +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
b74db627af
Don't make Action be inherited from Clonable. Why?? Please refer to https://groups.google.com/forum/?hl=en#!topic/cocos2d-js-devel/dGJYz9wIb4Q , but we need to find out the real reason why VS compiler generate linking errors.
2013-06-21 11:19:17 +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
04d7d5a061
[NaCl] Add support for building using glibc toolchain.
...
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/14694016
2013-06-20 12:56:14 -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
5c4545de3c
[NaCl] Remove use of -lnosys
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
James Chen
8b9090eb55
fixed #2315 : [JSB] Iterating through cc.Node children causes crash.
2013-06-20 22:51:54 +08:00
James Chen
2ceec2f65d
Merge pull request #2947 from pyrasis/tizen_2.1
...
[Tizen] Fix compile error
2013-06-20 04:58:21 -07:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
8b2b95ab4d
[WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object
2013-06-20 18:02:37 +08:00
James Chen
6ce5064f32
[WIN32] NULL --> nullptr for CCLayer.cpp.
2013-06-20 18:01:53 +08:00
James Chen
a90f51d03a
Merge branch 'develop' of z:/Project/cocos2d-x into develop
2013-06-20 17:38:23 +08:00
James Chen
d79ecd038c
Merge pull request #2942 from dumganhar/iss2129-format-codes3
...
closed #2129 : Removing CC prefix to make cocos2d-x more CPP friendly.
2013-06-20 01:19:49 -07:00
minggo
9caa40590a
Merge pull request #2941 from minggo/iss2304-refator-cclayer
...
fix a crash on android
2013-06-20 00:06:55 -07:00
minggo
e39df16d49
use correct pointer to be closed
2013-06-20 15:03:51 +08:00
James Chen
93b6328303
issue #2129 : Removing CC prefix for cocos2dx module.
2013-06-20 14:13:12 +08:00
James Chen
136a9743d4
issue #2129 : [Removing CC Prefix] Removing backward compatible macros, since they are conflict with no CC Prefix ones.
2013-06-20 12:56:51 +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
James Chen
663673b683
Adding missing include in ZipUtils.h.
2013-06-19 16:11:16 +08:00
minggo
ccbd0a831d
issue #2304:use function to simplify acceremeter call back
2013-06-19 16:10:53 +08:00
James Chen
016d34d889
Compilation errors fix after merging https://github.com/cocos2d/cocos2d-x/pull/2919
2013-06-19 15:08:09 +08:00
James Chen
86f7fd4988
Merge pull request #2925 from dumganhar/musikov-develop
...
fixed #2303 : Missing precision when getting strokeColor and fontFillColor
2013-06-18 23:27:57 -07:00
James Chen
e6c14edf18
Merge pull request #2907 from waiter/master
...
fixed #2306 : update “solve android crash with CCLabelTTF setString function”
2013-06-18 23:22:54 -07:00
James Chen
b7a33afc71
fixed #2303 : float assignment fix.
2013-06-19 14:09:23 +08:00
James Chen
f007819f74
Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop
...
Conflicts:
cocos2dx/textures/CCTexture2D.cpp
2013-06-19 14:05:55 +08:00
James Chen
b91e432258
Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate
...
fixed #2301 : Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
2013-06-18 22:56:02 -07:00
minggo
ef254fe6b0
Merge pull request #2918 from superrad/patch-1
...
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as P...
2013-06-18 22:53:29 -07:00
James Chen
8f33bf7e05
issue #2301 : _pTextures --> _textures.
2013-06-19 13:40:21 +08:00
James Chen
fa6a0d4051
issue #2301 : m_pTextures --> _pTextures.
2013-06-19 13:15:03 +08:00
James Chen
1eadcd8b38
fixed #2301 : Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate
...
Conflicts:
cocos2dx/proj.emscripten/cocos2dx.mk
2013-06-19 13:03:51 +08:00
James Chen
c4386b9b15
Merge branch 'clone_reverse_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-clone_reverse_fixes
2013-06-19 10:50:27 +08:00
Lee, Jae-Hong
b546fc3214
Implement Accelerometer.
2013-06-19 09:31:34 +09:00
Ricardo Quesada
159ef1ec68
clone() doesn't use copy constructor
...
... and other bug fixes
2013-06-18 15:06:53 -07:00
Ricardo Quesada
d35cc3b0fa
Merge branch 'develop' into clone_reverse_fixes
...
Conflicts:
cocos2dx/actions/CCAction.cpp
cocos2dx/actions/CCActionEase.cpp
cocos2dx/actions/CCActionGrid.cpp
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/actions/CCActionInterval.cpp
scripting/javascript/bindings/generated
2013-06-18 09:59:34 -07:00
Andrew Glass
9df6d1271b
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2
...
When loading a PVRv3 the _format variable would not be set, always being the default value.
2013-06-18 16:16:17 +02:00
minggo
e9d8595617
fixed #2124 : make CCImage::initWithIamgeFileThreadSafe() thread safe
2013-06-18 17:10:54 +08:00
James Gregory
ad90fe88a8
Merge remote-tracking branch 'origin/master' into emscriptenate
2013-06-17 20:30:36 -07:00
waiter
ecebf31287
solve android crash with CCLabelTTF setString function
...
solve android crash with CCLabelTTF setString function
2013-06-18 10:08:34 +08:00
James Gregory
5095b03f9c
Get async image loading building with -O2 and asm.js
2013-06-17 17:10:41 -07:00
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
8fb40eaee2
android target 17 --> 8.
2013-06-17 15:55:09 +08:00
James Chen
12d83f543b
Merge pull request #2900 from dumganhar/flaming0-develop
...
merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
2013-06-15 20:22:28 -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
Ricardo Quesada
a0cbef1005
Adds missing methods: clone() and reverse()
2013-06-15 19:44:39 -07:00
Lee, Jae-Hong
8c1953eed9
Add armv7l webp library.
2013-06-16 11:07:55 +09:00
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