folecr
063c730726
Take orientation into account when reporting accelerometer sensor readout
2013-08-08 14:40:26 -07:00
godyZ
f648a3f907
modify linux makefile
2013-08-08 17:06:42 +08:00
minggo
bf79a0560b
issue #2462:use cocos2d-x c++ style
2013-08-08 16:31:44 +08:00
godyZ
727ae1bbc2
update s3tc #4 , code standardization
2013-08-08 14:59:46 +08:00
godyZ
46e9eed028
nothing with s3tc
2013-08-08 14:11:22 +08:00
godyZ
cd8430f81a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
cocos2dx/Android.mk
cocos2dx/platform/CCImage.h
cocos2dx/platform/CCImageCommon_cpp.h
cocos2dx/textures/CCTexture2D.h
scripting/javascript/bindings/generated
2013-08-08 10:19:09 +08:00
minggo
552c63d0cf
Merge pull request #3269 from metalbass/patch-4
...
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
2013-08-07 18:45:27 -07:00
carlo morgantini
83b2377a76
some more clean up and removed CCStringTTF
2013-08-07 16:36:04 -07:00
James Chen
87736683c0
Merge pull request #3387 from pyrasis/tizen_2.2
...
[Tizen] Enable LocalStorage
2013-08-07 03:08:38 -07:00
Lee, Jae-Hong
5a8ec8ca5e
[Tizen] Enable LocalStorage
...
- add sqlite3 headers and libraries.
- use sqlite3 library.
2013-08-07 19:01:41 +09:00
Lee, Jae-Hong
b42868fd69
[Tizen] Remove Tizen 2.1 headers and libraries.
2013-08-07 18:52:15 +09:00
godyZ
674fe025b0
update s3tc #3 ,standard of code
2013-08-07 16:39:05 +08:00
minggo
910215fa89
Merge pull request #3377 from boyu0/iss2345_refactor_ccimage
...
issue #2345 refactor CCImage and CCTexture2D
2013-08-06 23:29:38 -07:00
boyu0
684e005ce7
issue #2345 : edit for linux compile error
2013-08-07 14:10:42 +08:00
boyu0
d61d3d1a24
issue #2345 : fix mac crash due to libjpeg
2013-08-07 11:59:52 +08:00
boyu0
a9d26d3fdc
issue #2345 : edit getPixelFormatInfoMap method to return reference.
2013-08-07 11:20:41 +08:00
boyu0
ec6343a9b8
fix js and linux compile error
2013-08-07 10:34:30 +08:00
godyZ
27baf5b961
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-08-07 09:32:42 +08:00
carlo morgantini
ef919aea91
more cleanup
2013-08-06 14:37:19 -07:00
carlo morgantini
fbe615f292
remove classes not used anymore
2013-08-06 13:49:24 -07:00
carlo morgantini
16412fc885
more cleanup
2013-08-06 13:43:29 -07:00
boyu0
eb989db3de
issue #2345 : fix some coding style
2013-08-06 16:14:36 +08:00
godyZ
02419ccb00
update s3tc #3 ,android test
2013-08-06 15:33:38 +08:00
James Chen
b3bfe2401a
Merge pull request #3378 from pyrasis/tizen_2.2
...
[Tizen] fix acceleration wrong coordinates.
2013-08-06 00:17:25 -07:00
Lee, Jae-Hong
5cc906f798
[Tizen] fix acceleration wrong coordinates.
2013-08-06 16:10:13 +09:00
James Chen
a5067f63dd
Merge pull request #3372 from pyrasis/tizen_2.2
...
[Tizen] Fix Debug Settings
2013-08-05 22:51:06 -07:00
boyu0
dc6503f7d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
2013-08-06 13:37:38 +08:00
godyZ
195536097f
update s3tc #2
2013-08-06 11:52:48 +08:00
boyu0
d51db25a6f
issue #2345 : delete the linux png libraries.
2013-08-06 11:41:03 +08:00
boyu0
94f9921d5e
issue #2345 : edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D
2013-08-06 11:34:48 +08:00
godyZ
fd7b00681f
update s3tc#1
2013-08-06 11:19:45 +08:00
carlo morgantini
66c5721fc7
clean up
2013-08-05 18:03:52 -07:00
carlo morgantini
c7c0b0e07a
more cleanup
2013-08-05 17:49:20 -07:00
carlo morgantini
eeffc76bb8
more cleanup
2013-08-05 16:52:24 -07:00
carlo morgantini
a1168512f6
cleanup
2013-08-05 16:41:23 -07:00
carlo morgantini
03b1c0142b
refactoring
2013-08-05 16:35:15 -07:00
carlo morgantini
d1915d47cc
some more refactoring and cleaning up
2013-08-05 15:56:18 -07:00
carlo morgantini
b14f9f83e9
New label stuff cleanup and re factoring
2013-08-05 15:11:07 -07:00
Lee, Jae-Hong
3db495ab0e
[Tizen] Fix Debug Settings.
...
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
folecr
74583d21f3
Android port needs etc headers
2013-08-05 02:05:47 -07:00
folecr
8e386cf0bc
moar checking
2013-08-05 02:05:47 -07:00
folecr
952cefa036
Accelerometer
2013-08-05 02:05:47 -07:00
folecr
b56df6d28c
Separate log macro for logging event processing
2013-08-05 02:05:46 -07:00
folecr
5889cc2218
Shift by correct amount
2013-08-05 02:05:46 -07:00
Rohan Kuruvilla
fa940ec292
Add touch input processing
2013-08-05 02:05:46 -07:00
Rohan Kuruvilla
3c20c6d9a8
Fixing bug where engine wouldn't start animating when coming into foreground
2013-08-05 02:05:46 -07:00
folecr
5737d4cd25
strip out old accelerometer implementation
2013-08-05 02:05:42 -07:00
folecr
a10c9c74a1
Remove Accelerometer and TextEdit implementations.
2013-08-05 02:05:42 -07:00
folecr
4567ab96b8
Helper and LocalStorage now use NativeActivity directly
2013-08-05 02:05:42 -07:00
folecr
9cefb85bea
Use getInstance() instead of various deprecated singleton access methods
2013-08-05 02:05:42 -07:00
folecr
af1e450fe6
Remove spurious LOGI (use appropriate LOG_RENDER_DEBUG in its place.)
2013-08-05 02:05:42 -07:00
folecr
c1e88b79ba
Initialize JniHelper with the Acitivity. Load the native library that is specified in the Activity's meta-data.
2013-08-05 02:05:42 -07:00
folecr
76a684c556
Initialize Cocos2dxHelper from JNI. Call System.loadLibrary() in Java so functions implemented in native code are available from Java.
2013-08-05 02:05:42 -07:00
folecr
2951504b46
Actually obtain a reference to the Java class
2013-08-05 02:05:41 -07:00
folecr
dd79d9bbc2
Use default class loader to obtain the ClassLoader for this NativeActivity
2013-08-05 02:05:41 -07:00
folecr
e67698116c
Cache JNIEnv
2013-08-05 02:05:41 -07:00
folecr
d96f54d4e0
Separate calls to setvm reference and to set classloader
2013-08-05 02:05:41 -07:00
folecr
53b1a92773
Use an obtained class loader instead of the default
2013-08-05 02:05:41 -07:00
folecr
669427363f
Clean up JNIHelper
2013-08-05 02:05:41 -07:00
folecr
dc6b6ecc69
Remove unused Java files for Activity and GLSurfaceView (now in C code.)
2013-08-05 02:05:40 -07:00
folecr
921ed14a87
Use OpenGLES 2.0
2013-08-05 02:05:40 -07:00
folecr
a2a999d505
JNI, Set JavaVM
2013-08-05 02:05:40 -07:00
folecr
4539600ac2
initialize cocos with asset manager interface. separate out cocos init from android view init.
2013-08-05 02:05:40 -07:00
folecr
1fb4387d0a
AssetManager is a private member of FileUtilsAndroid. setter method. Remove old Java/JNI setter.
2013-08-05 02:05:40 -07:00
folecr
68b9e5d608
Move nativeactivity.cpp
2013-08-05 02:05:40 -07:00
folecr
0a9e9571cc
Remove unused declaration
2013-08-05 02:05:40 -07:00
folecr
e1bcbc7859
Remove references to the Java renderer
2013-08-05 02:05:39 -07:00
folecr
f7d5eb198e
ccx : setAnimationInterval() not implemented.
2013-08-05 02:05:39 -07:00
folecr
05daebf65e
ccx : Initialize cocos. Calls cocos_android_app_init() to initialize the Cocos app.
2013-08-05 02:05:39 -07:00
folecr
7add86c751
ccx : Trace accelerometer only when tracing rendering
2013-08-05 02:05:38 -07:00
folecr
58c4037de8
ccx : Trace rendering
2013-08-05 02:05:38 -07:00
folecr
3cc62f9fa8
ccx : remove/comment filesystem access methods from Java
2013-08-05 02:05:38 -07:00
folecr
d9c3089f35
ccx : Cocos2dxActivity extends NativeActivity
2013-08-05 02:05:38 -07:00
folecr
3af519a61a
ccx : Remove Cocos2dxRenderer
2013-08-05 02:05:37 -07:00
folecr
6d990d0570
ccx : Call cocos rendering methods.
...
* switch to .cpp for nativeactivity.
* ccx : update log tags to say .ccp instead of .c
2013-08-05 02:05:37 -07:00
folecr
57cd5eedef
ccx : Change minimum config to RGB565. Add depth buffer and stencil buffer requirements to EGL config.
2013-08-05 02:05:37 -07:00
folecr
f4d21528d5
ccx : Link libraries used by nativeactivity.c
2013-08-05 02:05:36 -07:00
folecr
6ac71f16c1
ccx : add nativeactivity
2013-08-05 02:05:36 -07:00
folecr
12f25a574d
Shared Android makefile uses the platform specific code as a static library
...
* Resolve conflicts with latest cocos2x/Android.mk
* Revert changes to cocos2dx/Android.mk introduced by 9cba2c42c1
* Update files in label_nodes
2013-08-05 02:05:36 -07:00
folecr
588ca7e57b
Android port is a static library
2013-08-05 02:04:25 -07:00
folecr
92c45d85f2
Up refresh interval to 2 secs
2013-08-05 02:04:25 -07:00
James Chen
40332299d1
Merge pull request #3368 from azmeuk/emscripten
...
Multi-resolution emscripten html template.
2013-08-05 01:10:08 -07:00
James Chen
2df0b056ce
closed #2480 : Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad.
2013-08-05 15:42:01 +08:00
Éloi Rivard
9dcb6fb80e
Multi-resolution emscripten html template.
...
Default emscripten html template update.
Minor emscripten warnings.
2013-08-05 09:24:47 +02:00
dotsquid
e92337f82d
Fixed the crash caused by improper deletion of VBOs in ParticleSystemQuad.
2013-08-05 15:23:01 +08:00
James Chen
c61da90441
Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 13:40:59 +08:00
James Chen
ea10032b24
issue #2170 : Adding missing libs for Android.
2013-08-05 11:43:43 +08:00
James Chen
9a9ffaeb4d
issue #2170 : A typo fix.
2013-08-05 11:33:59 +08:00
James Chen
b8a7a4291f
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 11:26:34 +08:00
James Chen
eaabd93051
issue #2170 : Fixing compilaction errors on Emscripten.
2013-08-05 11:10:12 +08:00
James Chen
a2fbf0c2b8
issue #2179 : Fixing compilation errors on Linux.
2013-08-05 10:29:20 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
minggo
1aadf55b59
Merge pull request #3355 from minggo/iss2434-refactor_androidmk
...
closed #2434 : simply Android.mk
2013-08-03 08:33:14 -07:00
carlo morgantini
73286ad76b
some more clean up (code review)
2013-08-02 16:11:20 -07:00
minggo
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
James Chen
0db8b2bbf3
closed #2469:LabelTest and TileMapTest crash on windows.
2013-08-02 17:31:19 +08:00
boyu0
1a878cf795
issue #2345 : Merge branch '2345' into iss2345_refactor_ccimage
2013-08-02 16:19:50 +08:00
boyu0
6afa77ddc3
issue #2345 : update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined.
2013-08-02 16:02:40 +08:00
James Chen
c1d715b778
Adding windows support for New Label.
2013-08-02 15:01:27 +08:00
boyu0
89dd5a19ad
issue #2345 : move g_texturePixelFormatInfoTables into Texture2D
2013-08-02 14:10:23 +08:00
James Chen
67d710a41c
Adding Android support for new label.
2013-08-02 13:46:26 +08:00
minggo
5e03b9b29d
Merge pull request #3347 from timothyqiu/docfix
...
More documentation fixes
2013-08-01 18:22:43 -07:00
carlo morgantini
833a45d1af
Some more clean up
2013-08-01 17:54:08 -07:00
carlo morgantini
08d8179a0e
Clean up (see code review)
2013-08-01 17:49:51 -07:00
carlo morgantini
4904e0f31f
Clean up (as requested by code review)
2013-08-01 17:08:57 -07:00
carlo morgantini
6cac521d1b
fix some more problems with the new label stuff (as for code review)
2013-08-01 16:29:39 -07:00
carlo morgantini
f30ec5f428
(not used) global variables removed form CCFontAtlas.cpp
2013-08-01 15:55:46 -07:00
carlo morgantini
2fb2916bae
some more cleanup
2013-08-01 14:36:34 -07:00
carlo morgantini
972ae78295
Clean up for the new Label stuff
2013-08-01 11:02:32 -07:00
Timothy Qiu
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
Timothy Qiu
bc10c2a01f
Change some doc due to the change of source code.
...
Fixed some incorrect use of doxygen command.
2013-08-01 17:47:37 +08:00
minggo
077acb7814
Merge pull request #3343 from dabingnn/Iss2423-TargetAction-Reverse
...
Iss2423 target action reverse
2013-08-01 02:25:38 -07:00
Timothy Qiu
f0ee1e62c0
Fixes tag typos: deprecatd -> deprecated
2013-08-01 17:09:23 +08:00
Timothy Qiu
88e11cab84
Surround code in document with code/endcode tags.
2013-08-01 16:57:42 +08:00
Timothy Qiu
978fc634be
Use C++ code in C++ comments.
...
Removed Hungarian notation from parts of the code.
2013-08-01 16:40:56 +08:00
boyu0
93aa3c7ada
issue #2345 : refract CCImage and CCTexture2D.
2013-08-01 15:53:52 +08:00
Thomas Perl
6f967fc107
Qt 5: Build fixes for Qt 5 platform
...
Recent changes to the develop branch broke Qt 5 support.
2013-08-01 09:20:17 +02:00
Huabing.Xu
97f6e11f0d
issue #2423 : change TargetedAction::reverse() function from just cloning to reversing the internal action
2013-08-01 10:07:40 +08:00
carlo morgantini
ba4a48ec7a
CCTexture2D interface changed
2013-07-31 13:59:08 -07:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
carlo morgantini
95f8fe7690
fix bugs
2013-07-31 12:11:56 -07:00
James Chen
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
minggo
d887008bb8
Merge pull request #3336 from minggo/simplify-sample-code
...
Simplify sample code
2013-07-31 00:41:20 -07:00
minggo
afc0e4bf8f
make Point -> Size & Size -> Point explicit
2013-07-31 14:36:52 +08:00
minggo
a8f10c480d
Merge pull request #3332 from azmeuk/clang
...
Clang support for Linux
2013-07-30 18:26:12 -07:00
carlo morgantini
ff56ad5435
fix bugs with new Label stuff and add new sample for unicode
2013-07-30 16:41:26 -07:00
Sergey Shambir
d23d486720
Linux: added SDL2 backend as replacement for GLFW.
...
Initially planned as alternative, made replacement after discussion with
minggo.
Summary:
GLFW v.3 released in June. New version breaks API without real need:
http://cocos2d-x.org/boards/6/topics/31277
Meanwhile SDL2 is very stable. SDL2 used in Steam Runtime and will be
part of Ubuntu SDK, it's supported by other distributions.
Completed:
- OpenGL initialization and window handling with SDL
- Keyboard, IME emulation, mouse and touches support with SDL
- Window title now contains app name on Linux
- Backspace correctly handled with new backend
Note:
- SDL on X11 have no proper multitouch, but backend handles multitouch
events to support future Linux graphics.
2013-07-30 23:08:26 +04:00
carlo morgantini
9de1ef3f97
New label TTF. New text alignment sample.
2013-07-30 10:27:22 -07:00
Éloi Rivard
524b6903a5
Added clang support for linux.
2013-07-30 14:49:44 +02:00
minggo
ba4e0d8d39
closed #2438:re-add libwebp.a
2013-07-30 18:06:01 +08:00
minggo
1d2b1c79c2
closed #2438:remove mac 32-bit support
2013-07-30 18:02:35 +08:00
Éloi Rivard
14e200e61a
Added debugging information in emscripten DEBUG mode
2013-07-30 10:11:30 +02:00
James Chen
df33991a38
Merge pull request #3329 from pyrasis/tizen_2.2
...
[Tizen] Fix compile error
2013-07-30 00:34:40 -07:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09:00
boyu0
5225bb2f7f
fix the travis ci compile error
2013-07-30 14:16:23 +08:00
boyu0
c4a1bf8986
fix the travis ci compile error
2013-07-30 14:07:31 +08:00
James Chen
3633ebfe0c
Merge pull request #3224 from azmeuk/emscripten
...
emscripten keyboard support
2013-07-29 22:50:27 -07:00
boyu0
31da5ebeb7
fix some compile error and pass the linux compile
2013-07-30 13:45:50 +08:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
Timothy Qiu
b3da051807
Remove colon after @param @warning @deprecated
...
Added a missing @param.
2013-07-30 10:56:14 +08:00
Timothy Qiu
149a844dbc
Remove unnecessary/wrong use of \a in comment.
...
\a is meant to refer to arguments. Links to class/function names are
automatic generated in doxygen.
2013-07-30 10:56:13 +08:00
boyu0
6b12ac9a5a
edit for linux
2013-07-30 10:25:20 +08:00
carlo morgantini
023b46154f
Fix problems with missing glyphs in .ttf file
2013-07-29 13:43:23 -07:00
Timothy Qiu
07dca78987
Documentation fix: add missing parameter name.
2013-07-29 19:36:47 +08:00
James Chen
2566f74cd7
closed #2440 : Files with Non-ascii path can't be found on Windows.
2013-07-29 18:27:26 +08:00
boyu0
4348e87e31
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
2013-07-29 17:56:36 +08:00
boyu0
894584e5a0
Add texture2D convert test and fix the convert bugs
2013-07-29 17:34:33 +08:00
Éloi Rivard
54423af31d
Re-use SAFE_HEAP option in emscripten.
2013-07-29 10:58:14 +02:00
Éloi Rivard
4b190c3ddf
added emscripten keyboard support
2013-07-29 10:56:09 +02:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
4c32303b2e
Merge pull request #3317 from dumganhar/member-var-init
...
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
2013-07-29 00:29:08 -07:00
James Chen
5aab0cab7b
[Android] Fixing build errors for ndk-r9.
2013-07-29 14:54:00 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
minggo
b8f8ae7437
set _hasPremultipliedAlpha property correctly when it is a pvr texture
2013-07-28 23:38:22 +08:00
James Chen
b7afc9db43
issue #2430 : [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE.
2013-07-27 23:20:00 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
James Chen
e66e429bb2
issue #2430 : Moving enum type to class for CCBReader.
2013-07-27 21:44:49 +08:00
minggo
295a23e535
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 07:57:28 +08:00
carlo morgantini
6e4aafdacf
fix a problem with the new Label and colors
2013-07-26 16:30:36 -07:00
carlo morgantini
23575f0a68
New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment
2013-07-26 16:04:21 -07:00
carlo morgantini
8416e7cf6d
Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-26 15:54:50 -07:00
Sergii Rudchenko
3ea77ec933
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 01:17:13 +03:00
Grzegorz Kościółek
2083ab0454
Fix for #2892 .
...
3. Fixed registerScriptObserver method.
2013-07-26 22:42:00 +02:00
Grzegorz Kościółek
3a1d4e7e28
Fix for #2892 .
...
1. Updatet the API documentation and parameter name from "object" to "sender" to reflect it's true purpose.
2. Fixed addObserver and observerExisted because it didn't allowed to add observers to notifications that only differs by sender
2013-07-26 22:20:19 +02:00
carlo morgantini
be47a6da52
Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq
...
Conflicts:
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-26 11:58:18 -07:00
carlo morgantini
e34a0affa8
more cleaning
2013-07-26 10:43:17 -07:00
carlo morgantini
76ebeb0676
some more clean up for CCLabel
2013-07-26 10:29:29 -07:00
James Chen
825dd5927f
issue #2430 : Fixing conflicts.
2013-07-27 01:11:21 +08:00
James Chen
feadd2b2dd
issue #2430 : Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
...
Also added more deprecated constants.
2013-07-27 00:55:41 +08:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
James Chen
0dce6d9cf3
Merge pull request #3227 from azmeuk/file-utils
...
Added some guards in file utils
2013-07-26 05:31:02 -07:00
James Chen
c9def73930
Application::Platform::OS_MACOS --> Application::Platform::OS_MAC.
2013-07-26 20:24:33 +08:00
Éloi Rivard
95b826d82a
Fixed a bug in emscripten file utils.
2013-07-26 14:19:47 +02:00
Éloi Rivard
3ffc026c6c
Added some guards in file utils.
2013-07-26 14:19:20 +02:00
James Chen
9b6d3e6090
ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT
2013-07-26 20:07:41 +08:00
James Chen
3bc45e665c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 19:56:04 +08:00
James Chen
7d9d799194
issue #2430 : Fixing a typo.
2013-07-26 19:54:44 +08:00
James Chen
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
James Chen
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +08:00
James Chen
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
James Chen
54ab99bf74
enum class for ProgressTimer::type
2013-07-26 17:28:18 +08:00
Thomas Perl
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +08:00
metalbass
5183803784
Removed delete from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SAFE macros
...
This implements this issue: https://github.com/cocos2d/cocos2d-x/issues/3099
I've also change all pointer assignments to 0 to assignments to nullptr on the CC_SAFE macros.
Also aligned them for better readability :)
2013-07-26 09:33:40 +02:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
samuele3hu
6b9c7d4ade
issue #2404:modify a function name to isSwallowsTouches()
2013-07-26 15:21:19 +08:00
samuele3hu
fae8e253c0
issue #2404:Modify tab to spaces
2013-07-26 15:06:35 +08:00
samuele3hu
273bdc8fbd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 14:35:40 +08:00
James Chen
7839f769f2
Merge pull request #3265 from dumganhar/constants_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
2013-07-25 23:21:29 -07:00
James Chen
6c00a51517
RELATIVE was defined on windows, un-define it.
2013-07-26 14:16:12 +08:00
James Chen
2abd61b967
Warning fix in CCRenderTexture.h.
2013-07-26 14:15:19 +08:00
James Chen
9ae7bd33e2
typedef enum Director::Projection ccDirectorProjection; can't work on Windows, since Director::Projection is already a type, no need to add enum.
2013-07-26 14:14:55 +08:00
James Chen
5dca03c061
Fixing compilation errors in CCImageCommon_cpp.h.
2013-07-26 13:59:27 +08:00
James Chen
df8273d960
Fixing an issue that wrong implementation in 'ccGLDeleteTextureN'.
2013-07-26 13:58:59 +08:00
samuele3hu
2288280b2d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprectedOperator
2013-07-26 13:57:11 +08:00
James Chen
8459376f3d
More deprecated definitions.
2013-07-26 13:49:49 +08:00
James Chen
4f9d0672aa
Fixing errors when disabling VAO.
2013-07-26 13:49:24 +08:00
James Chen
37f6685894
MODE_GRAVITY --> Mode::GRAVITY, POSITION_TYPE_XXX --> PositionType::XXX
2013-07-26 13:48:32 +08:00
samuele3hu
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
Timothy Qiu
d1e46940ab
Documentation fix: use \p to reference a parameter
...
The orginal @param is meant to describe a parameter, resulting in a
strange doc output.
2013-07-26 12:04:03 +08:00
minggo
f94a02ac01
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-26 11:25:18 +08:00
Ricardo Quesada
4772674ff4
Removes Layer::TouchesDispatchMode...
...
...since it is declared in Touch::DispatchMode
2013-07-25 19:06:32 -07:00
Ricardo Quesada
8bf24f0475
ccGLXXX -> GL::xxx
...
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`
Also, converts the class `DrawPrimitives` into a namespace
2013-07-25 18:42:53 -07:00
carlo morgantini
7d141a3f57
the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore)
2013-07-25 17:58:13 -07:00
Ricardo Quesada
191aaebe2a
More const fixes
...
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
2013-07-25 17:47:42 -07:00
Ricardo Quesada
07c6c904cc
Removes more Hungarian notation and more
...
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
2013-07-25 16:27:24 -07:00
Ricardo Quesada
058935aa8d
Removes Hungarian notation
...
Removes Hungarian notation from the code.
2013-07-25 15:53:24 -07:00
Ricardo Quesada
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
minggo
4caea01021
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-25 23:09:56 +08:00
minggo
b36a4f1df0
issue #2430:use upper letters for enum item in Image
2013-07-25 23:09:18 +08:00
James Chen
fd9e2235be
Delete CC_DLL.
2013-07-25 22:43:12 +08:00
James Chen
f7c0ad8151
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-25 22:39:14 +08:00
James Chen
a1c3631962
issue #2404 : DrawPrimitives deprecated.
2013-07-25 22:38:55 +08:00
minggo
323af3c889
issue #2430:use upper letters for enum item in AssetsManager and WebSocket
2013-07-25 22:29:12 +08:00
minggo
4ef197b579
Merge pull request #13 from dumganhar/iss2430-modify_enum
...
issue #2430 : Fixing compilation errors for Mac and JSB projects.
2013-07-25 07:02:57 -07:00
James Chen
3f36e8300e
issue #2430 : Fixing compilation errors for Mac and JSB projects.
2013-07-25 21:59:47 +08:00
minggo
17946c084a
issue #2430:fix android compiling error
2013-07-25 21:59:37 +08:00
minggo
4d7ac6c800
issue #2430:fix conflict
2013-07-25 21:37:12 +08:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
e95c3b9150
issue #2430:make functions really deprecated
2013-07-25 21:15:24 +08:00
minggo
f5b116095c
issue #2430:make functions really deprecated
2013-07-25 21:09:44 +08:00
minggo
8b748e2992
issue #2430:use const member variable instead of macro
2013-07-25 21:04:32 +08:00
minggo
051caf5e54
issue #2430:move TransitionScene enum into class
2013-07-25 20:50:39 +08:00
minggo
df48f52aa3
issue #2430:use Image::Format instead of tImageFormat
2013-07-25 20:38:15 +08:00
minggo
2bb577be8b
issue #2430:change Image enum item to upper letter
2013-07-25 20:29:53 +08:00
minggo
18a19d5168
issue #2430:move Layer enum into class
2013-07-25 20:12:55 +08:00
minggo
beb192ecaa
issue #2430:move Menu enum into class
2013-07-25 20:04:24 +08:00
samuele3hu
11d7c9c653
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
2013-07-25 19:58:59 +08:00
minggo
77afae124b
issue #2430:move Texture2D enum into class
2013-07-25 19:52:44 +08:00
minggo
2293630335
issue #2430:move enum in ccTypes.h class
2013-07-25 18:46:43 +08:00
minggo
acdd1cfe9d
issue #2430:move GLProgram enum into class
2013-07-25 17:48:22 +08:00
James Chen
90fbcec9c5
issue #2404 : Reverting cocos2dx/proj.linux/cocos2dx.mk, ignoring deprecated methods since linux build will treat warning as errors.
2013-07-25 15:32:46 +08:00
minggo
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
James Chen
6a0a4ed0f9
#issue #2404 : Using Texture2D::getDefaultAlphaPixelFormat instead of Texture2D::defaultAlphaPixelFormat in TextureCache.
2013-07-25 15:05:56 +08:00
James Chen
f8392adce2
issue #2404 : Open deprecated warning for Android and Linux.
2013-07-25 15:05:56 +08:00
James Chen
387ea1899c
issue #2404 : Disabling warning of invoking deprecated methods in engine. Rename CCCallFuncND to __CCCallFuncND, and add deprecated typedef CCCallFuncND.
...
Only disable warning for CCActionInstant.cpp and CCMenuItem.cpp
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (push)
#pragma warning (disable: 4996)
#endif
#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)))
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
#elif _MSC_VER >= 1400 //vs 2005 or higher
#pragma warning (pop)
#endif
2013-07-25 15:05:56 +08:00
minggo
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +08:00
minggo
08b13e9867
issue #2430:move Configuration enum into class
2013-07-25 14:47:12 +08:00
minggo
8dab462f6f
issue #2430:move Director enum into class
2013-07-25 14:39:32 +08:00
minggo
edcea3eb8d
issue #2430:move more Particle enum into class
2013-07-25 14:27:46 +08:00
minggo
4519a09ce4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
2013-07-25 13:54:55 +08:00
minggo
4bfe6c2439
issue #2430:move Particle enum into class
2013-07-25 13:54:32 +08:00
James Chen
6c3878fc45
issue #2404 : Fixing a warning in ccTypes.h.
2013-07-25 13:45:41 +08:00
James Chen
af3b8a0390
issue #2404 : Rename CallFuncND/CallFuncO to CCCallFuncND/CCCallFuncO and mark them as deprecated classes. In v3.0, we could use CallFuncN instead.
2013-07-25 13:45:02 +08:00
James Chen
306587167d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated
...
Conflicts:
AUTHORS
2013-07-25 11:28:48 +08:00
minggo
a13a46e54f
Merge pull request #3243 from azmeuk/emscripten-package
...
Use of a single emscripten HTML template file
2013-07-24 18:36:28 -07:00
Ricardo Quesada
a7760d117d
Adds more tests
2013-07-24 17:21:51 -07:00
Ricardo Quesada
e0523b3438
Merge branch 'developNewLabelForRiq' into label_merge
...
Conflicts:
cocos2dx/textures/CCTexture2D.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-24 15:15:08 -07:00
Ricardo Quesada
943b805bc8
Fixes some warnings
...
... and updates the version to pre-alpha0
2013-07-24 14:02:36 -07:00
Thomas Perl
6e1c9b24f3
Qt 5: Add support for changing animation interval at runtime
2013-07-24 20:23:10 +02:00
Thomas Perl
97c4e4898a
Qt 5: Fix language mapping in CCApplication
...
Reorder language mappings as listed in the enum
definition and remove comment after checking all
available languages are added to the mapping.
2013-07-24 20:23:09 +02:00
Thomas Perl
539f71c814
Qt 5: Implement input method showing/hiding
...
[nemo] Integration of QInputMethod
2013-07-24 20:23:09 +02:00
Thomas Perl
bcee05d471
Qt 5: Add CCAccelerometer implementation
...
[nemo] Add QtSensors-based Accelerometer implementation
2013-07-24 20:23:08 +02:00
Thomas Perl
6f4f8c0e38
Qt 5: System-wide installation of targets
2013-07-24 20:23:08 +02:00
Thomas Perl
366dbeda31
Qt 5: Build test application (Cpp/TestCpp)
2013-07-24 20:23:07 +02:00
Thomas Perl
8044c52d6d
Qt 5: Add support for building libextension
2013-07-24 20:23:07 +02:00
Thomas Perl
db230a3d2b
Do not include Qt headers in CCApplication.h
...
This avoids name collisions with the extensions sub-project
where "slots" is used as attribute of a class ("slots" is
redefined in Qt headers).
2013-07-24 20:23:07 +02:00
Thomas Perl
4b52754dd3
CocosDenshion build setup for Qt 5 (no-op implementation)
...
Right now, all operations are implemented as no-op, but
libcocosdenshion can now be built as shared library and used.
2013-07-24 20:19:50 +02:00
Thomas Perl
e1baba5407
Build SimpleGame example
2013-07-24 20:19:20 +02:00
Thomas Perl
b64c0a0e87
Platform abstraction implementation with Qt 5
...
Based partially on the Linux platform abstraction, therefore
this right now works only with Qt 5 on Linux.
2013-07-24 20:18:43 +02:00
Thomas Perl
4860e3551c
Add new platform: CC_PLATFORM_QT5
2013-07-24 20:18:43 +02:00
Thomas Perl
62958c8321
Qt5 build support (initial work)
2013-07-24 20:18:42 +02:00
carlo morgantini
97363c9382
some more cleanup and refactory for the new Label stuff
2013-07-24 10:22:46 -07:00
Éloi Rivard
682a1238fa
Use of a single emscripten HTML template file.
2013-07-24 17:59:21 +02:00
James Chen
e5c2ad0cb8
issue #2404 : Mark Texture2D::setTexParameters(const ccTexParams* texParams) as deprecated.
2013-07-24 17:54:17 +08:00
James Chen
d42ff355b6
issue #2404 : Mark RenderTexture:: newCCImage as deprecated.
2013-07-24 17:53:34 +08:00
James Chen
7fd0a923e9
issue #2404 : Updating CCDeprecated.h, CC_DEPRECATED_ATTRIBUTE typedef Component CCComponent;
2013-07-24 17:52:00 +08:00
James Chen
44a338f63c
issue #2404 : Re-add CallFuncND and CallFuncO and mark them as deprecated class.
2013-07-24 16:45:11 +08:00
minggo
aac1a4c78a
Merge pull request #3214 from bmanGH/develop
...
修复CCTexturePVR创建GLTexture时没有使用GLStateCache
2013-07-23 20:02:56 -07:00
James Chen
35dec5d71e
More CCLog --> log.
2013-07-24 10:46:13 +08:00
James Chen
e5b0bc1fc7
Put the deprecated method 'CCLog' to 'CCDeprecated.h'.
2013-07-24 10:26:36 +08:00
James Chen
7bc6abfac7
Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it.
2013-07-24 10:14:42 +08:00
Ricardo Quesada
1f37d4d00a
More best practices fixes and other bug fixes
...
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
2013-07-23 15:20:22 -07:00
James Chen
c7cf577b1a
issue #2378 : Deprecating some getters. Getter function needs to have 'get' prefix.
2013-07-23 22:07:33 +08:00
James Chen
8ad6fbd415
issue #2378 : Mark getStoringCharacters as deprecated function.
2013-07-23 21:56:01 +08:00
James Chen
baed1c5b48
issue #2378 : More override functions.
2013-07-23 21:51:19 +08:00
James Chen
a88d173d68
issue #2378 : Compilation error fixes.
2013-07-23 21:37:30 +08:00
James Chen
ab7d57feb7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2378-remove-CC_PROPERTY
2013-07-23 20:47:39 +08:00
James Chen
9c859d5f9d
issue #2378 : Mark ParticleSystem::getOpacityModifyRGB as deprecated.
2013-07-23 20:44:42 +08:00
James Chen
d942de1ae1
issue #2378 : Variables to protected for Texture2D.
2013-07-23 20:42:43 +08:00
James Chen
a0851cb5e0
issue #2378 : Minor fix in CCParticleSystem.
2013-07-23 20:39:54 +08:00
James Chen
a6b880a124
issue #2378 : Reverting CCPlatformMacros.h
2013-07-23 20:38:35 +08:00
James Chen
4110b95e96
issue #2378 : inline function are in header files now.
2013-07-23 20:36:41 +08:00
James Chen
a1c4c73c1c
issue #2378 : More setter/Getter, removing CC_PROPERTY_XXX macros.
2013-07-23 18:26:26 +08:00
James Chen
ed5bd2309e
issue #2378 : Setter/Getter for AtlasNode, removing CC_PROPERTY_XXX macros.
2013-07-23 15:19:49 +08:00
James Chen
50ba072bac
issue #2378 : Setter/Getter for Director, removing CC_PROPERTY_XXX macros.
2013-07-23 15:19:26 +08:00
James Chen
d6f15bc79f
issue #2378 : Setter/Getter for TextureAtlas, removing CC_PROPERTY_XXX macros.
2013-07-23 14:18:35 +08:00
minggo
8af95adbdf
Merge pull request #3220 from minggo/develop
...
closed #2393:fix a bug caused by marking functions as deprecated
2013-07-22 23:17:03 -07:00
minggo
b416511e6b
closed #2393:fix a bug caused by marking functions as deprecated
2013-07-23 14:13:44 +08:00
James Chen
75a0cb6a29
issue #2378 : Setter/Getter for CCTexture2D, removing CC_PROPERTY_XXX macros.
2013-07-23 14:05:05 +08:00
minggo
f840564c05
issue #2412:remove platform.h/.cpp from vs project
2013-07-23 11:45:20 +08:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
carlo morgantini
98bb0c26f3
working on the new label stuff
2013-07-22 14:43:45 -07:00
carlo morgantini
98c52cd98d
new FontCache
2013-07-22 13:08:37 -07:00
carlo morgantini
5668607e0e
merging with Ricardo stuff and fixin the new Label
2013-07-22 11:40:39 -07:00
bmanGH
b983830bec
修复CCTexturePVR创建GLTexture时没有使用GLStateCache导致下一个Sprite::draw的时候可能会使用不正确的纹理
2013-07-23 02:23:40 +08:00
Éloi Rivard
cca57e39de
fixed a bug in emscripten makefile
2013-07-22 16:56:02 +02:00
James Chen
2aa1fae266
closed #2418 : Unused spriteframes also need to be removed when purgeCachedData.
2013-07-22 18:13:13 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
0164946779
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance.
2013-07-22 17:19:31 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
James Chen
a188fd4261
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 14:45:38 +08:00
James Chen
f32f1dff33
Cast fix: GLbyte --> GLubyte.
2013-07-22 14:45:01 +08:00
James Chen
b58d18e20a
More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.
2013-07-22 14:28:19 +08:00
James Chen
50c280fb9d
Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.
2013-07-21 19:10:22 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
Ricardo Quesada
2219bde542
bmfont sample working
...
...still TTF working OK
2013-07-19 16:49:51 -07:00
Ricardo Quesada
88928fff99
Merge branch 'developNewLabelMerge' into merge_new_label
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/textures/CCTexture2D.h
samples/Javascript/Shared
2013-07-19 16:04:23 -07:00
Ricardo Quesada
1f0dac4ed0
Removes CC_PROPERTY / CC_SYNTHESIZE from some parts of the code
...
As agreed previously, CC_PROPERTY_XXX and CC_SYNTHESIZE_XXX should
not be used in the code.
This patch removes some of them. There are still many more to remove
2013-07-19 13:16:38 -07:00
carlo morgantini
c977e6c3fa
Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge
...
Conflicts:
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontDefinition.h
cocos2dx/label_nodes/CCStringTTF.cpp
cocos2dx/label_nodes/CCStringTTF.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-19 12:24:25 -07:00
carlo morgantini
9f629835de
some more cleanup
2013-07-19 11:19:35 -07:00
carlo morgantini
5068622c04
working on the new atlas stuff
2013-07-19 10:33:26 -07:00
James Chen
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
boyu0
ebafab4583
delete the file added by misstake.
2013-07-19 16:19:19 +08:00
boyu0
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
James Chen
7356e7c4c0
issue #2407 : Minor fix in CCTMXLayer.h
2013-07-19 15:03:28 +08:00
James Chen
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
Lee, Jae-Hong
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
minggo
7704ab9161
issue #2412:remove platform.cpp/.h
2013-07-19 13:42:45 +08:00
James Chen
2dc6a58d2c
Merge branch 'more_more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_more_best_practices_fixes
2013-07-19 11:59:24 +08:00
James Chen
9270a28275
issue #2404 : return nullptr in Clonable::copy().
2013-07-19 11:56:01 +08:00
James Chen
6ffac07a81
More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize
2013-07-19 11:08:47 +08:00
Ricardo Quesada
ba6ab126c6
More best practices fixes
...
- class order fixes
- static methods (creators) at the beginning
- then constructors / destructors
- then init
- more `const` fixes
- adds some const getters
- some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
2013-07-18 16:30:19 -07:00
carlo morgantini
31b40263a7
render and font IOS are no more
2013-07-18 14:14:09 -07:00
carlo morgantini
9c53da22fa
some more cleanup
2013-07-18 14:11:12 -07:00
carlo morgantini
5480810a9c
clean up and now using FreeType for rendering fonts
2013-07-18 13:13:41 -07:00
James Chen
7de69edad8
Merge pull request #3187 from dumganhar/ricardoquesada-more_best_practices_fixes
...
Merge https://github.com/cocos2d/cocos2d-x/pull/3183
2013-07-18 08:52:15 -07:00
minggo
208c1312f4
Merge pull request #3171 from samuele3hu/ScriptHandler
...
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGL,ScrollView handlers operation
2013-07-18 02:48:37 -07:00
boyu0
76e05ee802
Merge https://github.com/cocos2d/cocos2d-x into 2345
2013-07-18 17:47:43 +08:00
James Chen
a425dd3dc0
Merge branch 'more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_best_practices_fixes
...
Conflicts:
cocos2dx/actions/CCActionTiledGrid.h
2013-07-18 15:46:14 +08:00
James Chen
bf45fa86fe
Merge pull request #3176 from dumganhar/iss2413-overload-virtual
...
closed 2413: Warning fixes for overload virtual functions.
2013-07-18 00:33:53 -07:00
James Chen
6277ae191b
issue #2404 : Removing duplicated codes in platform/mac/CCImage.mm.
2013-07-18 13:40:32 +08:00
James Chen
469e13607a
issue #2404 : Marking CC prefix class as deprecated.
2013-07-18 13:38:23 +08:00
carlo morgantini
80247d409b
rendering using free type. This commit is a work in progress and should NOT be used
2013-07-17 17:31:28 -07:00
Ricardo Quesada
6e25301b43
more best practices fixes
...
- Adds more `const` in getters
- Overriden methods have the `override` keyword
- Reorganizes the structure of the class:
# creators first, then constructor, destructors, init
# then overridden methods
# variables at the end
- removes Hungarian notation from parts of the code
2013-07-17 16:56:19 -07:00
boyu0
70140bb4cb
refactor CCImage and CCTexture2D
2013-07-17 17:12:04 +08:00
James Chen
d6f713a31b
Merge branch 'sanityzing_code' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-sanityzing_code
...
Conflicts:
samples/Cpp/TestCpp/Classes/Box2DTest/Box2dTest.h
2013-07-17 17:06:47 +08:00
James Chen
f4edc7a922
closed #2413 : Warning fixes for overload virtual functions.
2013-07-17 16:25:13 +08:00
samuele3hu
847b87b297
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-17 14:45:02 +08:00