godyZ
27baf5b961
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-08-07 09:32:42 +08:00
James Chen
989f350e39
Resetting JS-Test, It was modified in https://github.com/cocos2d/cocos2d-x/pull/3357 .
2013-08-06 16:27:40 +08:00
godyZ
02419ccb00
update s3tc #3 ,android test
2013-08-06 15:33:38 +08: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
Lee, Jae-Hong
1acfca45b2
[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1
2013-08-06 14:42:53 +09: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
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
folecr
1721e90e3d
Update TestLua
2013-08-05 16:41:34 -07:00
folecr
07917429a0
Update HelloLua
2013-08-05 16:41:30 -07:00
Lee, Jae-Hong
3db495ab0e
[Tizen] Fix Debug Settings.
...
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
folecr
bf6b57fe19
Changes to match reverting of namespace simplegame for this sample
2013-08-05 02:05:48 -07:00
folecr
fe01166e92
Revert "namespace simplegame for game code"
...
This reverts commit f35ebf6c494b68e6b3938a8ad1781d0d0684bb45.
2013-08-05 02:05:47 -07:00
folecr
7510a55c6a
Update TestJavaScript
2013-08-05 02:05:47 -07:00
folecr
5531272979
Update a bunch of JS projects for android
2013-08-05 02:05:47 -07:00
folecr
23061fb312
AssetsManagerTest
2013-08-05 02:05:47 -07:00
folecr
ff079791e5
TestCpp
2013-08-05 02:05:47 -07:00
folecr
d3476bec17
HelloCpp
2013-08-05 02:05:46 -07:00
folecr
81318d72ed
Update target sdk version to 13 so that the game can handle all configuration changes
2013-08-05 02:05:46 -07:00
Rohan Kuruvilla
388edc144b
Adding additional android:configChanges parameters to AndroidManifest
2013-08-05 02:05:46 -07:00
folecr
325892eb82
Remove dependency on cocos extensions
2013-08-05 02:05:43 -07:00
folecr
9da4b9798f
Use android.appNativeActivity directly
2013-08-05 02:05:40 -07:00
folecr
1deb291026
Helper script to run the app
2013-08-05 02:05:40 -07:00
folecr
d271d02004
namespace simplegame for game code
2013-08-05 02:05:39 -07:00
folecr
ebd68c8feb
Force enable debug
...
* APP_OPTIM in Application.mk
* android:debuggable="true" in AndroidManifest.xml
* NDK_DEBUG=1 in build_native.sh
2013-08-05 02:05:39 -07:00
folecr
b87c29d50b
simplegame : logging of entry points into app
2013-08-05 02:05:39 -07:00
folecr
21165cd285
simplegame : provide cocos_android_app_init() to initialize the Application.
2013-08-05 02:05:39 -07:00
folecr
a5f9b19c30
simplegame : add option to build script to build in debug mode
2013-08-05 02:05:38 -07:00
folecr
2e81871497
simplegame : Fix build script to process input elements as an array
2013-08-05 02:05:38 -07:00
folecr
c91d004fdc
simplegame : NDK GDB debugging script
2013-08-05 02:05:38 -07:00
folecr
e5377e2ddc
simplegame : Use Cocos2dxActivity (which is also a NativeActivity.)
2013-08-05 02:05:38 -07:00
folecr
fc3cd0c68c
simplegame : Use cocos2dxandroid static library
2013-08-05 02:05:37 -07:00
folecr
ccfdbe42bc
simplegame : Use nativeactivity
2013-08-05 02:05:37 -07:00
folecr
816b77e7c0
simplegame : enable building native library for x86
2013-08-05 02:05:37 -07:00
folecr
26c5e1e180
simplegame : no java, Create empty src/ directory with a nojava.txt file
2013-08-05 02:05:37 -07: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
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
minggo
456b5af872
closed #2434:fixed path
2013-08-03 23:12:10 +08:00
minggo
9cba2c42c1
closed #2434 : simply Android.mk
2013-08-02 17:33:27 +08:00
carlo morgantini
4904e0f31f
Clean up (as requested by code review)
2013-08-01 17:08:57 -07:00
carlo morgantini
2fb2916bae
some more cleanup
2013-08-01 14:36:34 -07:00
boyu0
93aa3c7ada
issue #2345 : refract CCImage and CCTexture2D.
2013-08-01 15:53:52 +08:00
Huabing.Xu
9a9d0b9def
closed #2423 : add ActionTargetedReverse test case
2013-08-01 10:28:18 +08: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
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
e412fe5a31
use Point::+ to simplify HelloWorld sample
2013-07-31 14:38:50 +08:00
minggo
0241470ff9
Merge pull request #3330 from dabingnn/Iss2447-ClippingNodeTestCrash-bug
...
closed #2447 : Fix clippingNodeTest RawStencilBufferTest6 crash bug
2013-07-30 18:42:46 -07: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
carlo morgantini
9de1ef3f97
New label TTF. New text alignment sample.
2013-07-30 10:27:22 -07:00
minggo
1d2b1c79c2
closed #2438:remove mac 32-bit support
2013-07-30 18:02:35 +08:00
Huabing.Xu
6a1938056c
closed #2447 : Fix clippingNodeTest RawStencilBufferTest6 crash bug
2013-07-30 16:27:13 +08:00
Éloi Rivard
14e200e61a
Added debugging information in emscripten DEBUG mode
2013-07-30 10:11:30 +02:00
Lee, Jae-Hong
4beeda2294
[Tizen] Fix compile error.
2013-07-30 15:43:05 +09: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
carlo morgantini
023b46154f
Fix problems with missing glyphs in .ttf file
2013-07-29 13:43:23 -07:00
boyu0
894584e5a0
Add texture2D convert test and fix the convert bugs
2013-07-29 17:34:33 +08:00
minggo
0b0c223d33
Merge pull request #3318 from dabingnn/Iss2437-RenderTextureStencilTest-Bug
...
Iss2437 render texture stencil test bug
2013-07-29 01:25:14 -07: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
Huabing.Xu
0dcf9e88c3
close #2437 : replace stencil mechanism with a new approach by removing glColorMask call
2013-07-29 14:13:36 +08:00
Huabing.Xu
4ebfc1c6e4
issue #2437 : Fix Bug RenderTextureTestDepthStencil not clipped by stencil
2013-07-29 14:11:21 +08:00
James Chen
b1a0393191
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into member-var-init
2013-07-29 14:11:13 +08:00
James Chen
1c298cf5a1
Updating JS-Test, fixing CrystalCraze crash on android and windows.
2013-07-29 14:10:42 +08:00
samuele3hu
cff6fd13b1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop
2013-07-29 11:47:42 +08:00
samuele3hu
a6d2ab40f0
Modify ActionTest sample of lua to add draw functions
2013-07-29 11:44:56 +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
James Chen
f5d9bf9465
Updating JS-Test.
2013-07-29 10:17:31 +08:00
minggo
bc4845b856
fixed a link error of HelloLua Mac 32 bit
2013-07-29 09:30:42 +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
92f9ed743a
use correct type to initialize an array
2013-07-28 23:23:35 +08:00
samuele3hu
cc95fcaa69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-28 14:35:38 +08:00
samuele3hu
3aeefb51b3
Modify deprecated CCPhysicsDebugNode typedef and some test bug
2013-07-28 14:33:02 +08:00
minggo
e97b2504ea
fix a logical error
2013-07-28 10:22:12 +08:00
James Chen
6176076bce
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants
2013-07-27 22:36:14 +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
samuele3hu
af9f6fbe3a
issue #2404:Add more deprecated function and modify some test sample
2013-07-27 17:20:22 +08:00
James Chen
324607c32c
More warning fixes.
2013-07-27 15:15:54 +08:00
James Chen
9a56cd80bf
Updating JS-Tests. Fixed a bug of PerformanceSpriteTest that mgr is undefined when it runs on the JSB.
2013-07-27 14:02:23 +08:00
James Chen
32b823f301
Merge pull request #3291 from dumganhar/develop
...
Updating JS-Test to the latest version.
2013-07-26 21:17:01 -07:00
James Chen
83afffe5b1
Updating JS-Test to the latest version.
2013-07-27 11:37:07 +08:00
samuele3hu
f12db807a0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-27 11:04:36 +08:00
samuele3hu
faa0b46f57
issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample
2013-07-27 10:42:22 +08:00
James Chen
ea9988fde6
[Mac] Adding resources for SimpleGame.
2013-07-27 10:28:40 +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
Ricardo Quesada
0da367e05e
fixes warnigns when using HttpRequest
...
fixes warnigns when using HttpRequest
2013-07-26 14:34:17 -07: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
76ebeb0676
some more clean up for CCLabel
2013-07-26 10:29:29 -07:00
samuele3hu
a6e514f3d5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
2013-07-27 00:36:20 +08:00
samuele3hu
016593bd0e
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-27 00:28:06 +08:00
James Chen
b313ec43fc
Merge pull request #3239 from samuele3hu/TestSample
...
issue #2429:LuaWebSocket supports sending binary string passed by lua
2013-07-26 08:00:52 -07:00
James Chen
58a3560bca
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
2013-07-26 22:55:41 +08:00
samuele3hu
bc83304e23
issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function
2013-07-26 22:50:45 +08:00
samuele3hu
70fcf47a3e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-26 21:39:34 +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
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
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
minggo
a7c1904eb8
issue #2430:move EditBox enum into class
2013-07-26 17:45:01 +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
0b3ed85914
issue #2430:fix some compiling error
2013-07-26 16:43:40 +08:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
minggo
f55d73194e
issue 2430:use enum class for Control enum values
2013-07-26 14:37:26 +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
d345ac7f3f
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
2013-07-26 14:00:10 +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
b57d48b0d2
ParticleSystem::MODE_RADIUS --> ParticleSystem::Mode::RADIUS
2013-07-26 13:47:30 +08:00
samuele3hu
f49277d367
issue #2404:replace deprecated functions in testlua and hellolua sample
2013-07-26 13:43:28 +08:00
minggo
0b8de88ddc
issue 2430:use enum class
2013-07-26 12:08:18 +08: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
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
James Chen
a1c3631962
issue #2404 : DrawPrimitives deprecated.
2013-07-25 22:38:55 +08:00
minggo
4d7ac6c800
issue #2430:fix conflict
2013-07-25 21:37:12 +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
samuele3hu
6854bd6b19
issue #2404:replace LuaEngine::defaultEngine() with LuaEngine::getInstance()
2013-07-25 20:40:44 +08:00
minggo
df48f52aa3
issue #2430:use Image::Format instead of tImageFormat
2013-07-25 20:38:15 +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
25beed0051
[Android] Fixing path error and reducing dependence for extension.
2013-07-25 16:53:35 +08:00
James Chen
653c1f7f8f
Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing
2013-07-25 16:00:45 +08:00
James Chen
aaf5bcef52
issue #2404 : Invocation of some deprecated methods fixes.
2013-07-25 15:25:11 +08:00
minggo
3d6f3bf8b2
issue #2430:move ProgressTimer enum into class
2013-07-25 15:11:36 +08:00
minggo
658bffbb69
issue #2430:use upper letter for enum item in ccGLStateCache.h
2013-07-25 15:04:13 +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
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
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
15e3a7825c
Re-enable use of CocosDenshion in SimpleGame
2013-07-24 20:19:49 +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
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
minggo
439ed140cd
assign 1 to predefined macro CC_ENABLE_CHIPMUNK_INTEGRATION
2013-07-24 18:35:26 +08:00
James Chen
e0f9ac82da
issue #2404 : Updating ExtensionsTest/CocosBuilderTest.
2013-07-24 18:17:20 +08:00
samuele3hu
8e0a3b16a1
issue #2429:LuaWebSocket supports sending binary string passed by lua
2013-07-24 15:42:32 +08:00
samuele3hu
5b888d44e4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 15:34:32 +08:00
samuele3hu
ff980477d7
issue #2429:LuaWebSocket supports passing binary string buffer to c++
2013-07-24 15:33:37 +08:00
minggo
ff0cbb9d0b
Merge pull request #3232 from samuele3hu/TestSample
...
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-23 23:33:28 -07:00
samuele3hu
a52bab7a66
issue #2426:Modify coding style
2013-07-24 11:51:24 +08:00
samuele3hu
4f1a46136a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample
2013-07-24 10:15:39 +08:00
samuele3hu
e9df175e9a
issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample
2013-07-24 10:15:16 +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
Ricardo Quesada
2013f841ad
Merge branch 'develop' into more_best_practices_fixes
2013-07-23 13:36:22 -07:00
James Chen
12bb640307
issue #2378 : ParticleTest: _emitter->getOpacityModifyRGB --> _emitter->isOpacityModifyRGB
2013-07-23 20:47:19 +08:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
Ricardo Quesada
c158cd5be6
More best practices fixes
...
- Removes Hungarian notation from the CPP test (there are still some Hungarian to remove)
- Label and MotionStreak: Uses the CL() entry for the tests (lambda functions)
2013-07-22 17:25:44 -07: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
James Chen
9b0f2a6e33
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol
2013-07-22 17:25:29 +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
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
minggo
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07: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
e81c0f944d
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 11:47:08 +08:00
James Chen
604c30f102
Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers
...
Conflicts:
CocosDenshion/include/SimpleAudioEngine.h
samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
2013-07-22 10:06:14 +08:00
samuele3hu
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08:00
samuele3hu
1f5f6e8fa2
issue #2404:Modify configs
2013-07-22 09:36:00 +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
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
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
yinkaile
0470ce936b
1.Fix release CCTexture2DMutable.cpp crash
...
2.Change frame tween method
2013-07-19 19:02:26 +08:00
boyu0
ad3ceda3c2
roll back the android project setting
2013-07-19 15:58:33 +08:00
boyu0
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
samuele3hu
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +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
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
rafael.x
c4ef2c9250
Added to various functions a check whether an OpenAL source exists on which OpenAL functions can be called.
...
Playback of background music starts now with the previously set volume, independent of the OpenAL source state.
Added a delete on the SimpleSoundEngine object within CocosDenshionTest::onExit() so that alutExit() gets called to release allocated resources by OpenAL.
2013-07-19 01:00:24 +02: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
samuele3hu
236b675e21
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-18 23:29:41 +08:00
samuele3hu
78cd3e561e
issue #2404:Move deprecated functions to Deprecated.lua
2013-07-18 23:27:07 +08: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
8176f2f178
issue #2404 : Fixing wrong replacement of shape.m_Vertex2F. shape.m_Vertex2F --> shape.m_vertex2
2013-07-18 14:48:18 +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
James Chen
e7452bc912
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2407-class-order
2013-07-17 14:36:55 +08:00
James Chen
c31e8a8afc
issue #2407 : Updating SpriteTest.cpp, Don't hide virtual override function.
2013-07-17 14:33:15 +08:00
James Chen
b6fda7bf7c
issue #2407 : Removing unused codes in Box2dTest.h
2013-07-17 14:32:38 +08:00
James Chen
d3bf9935cd
Merge pull request #3166 from dumganhar/iss2410-blackscreen-android
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3117
2013-07-16 23:25:01 -07:00
James Chen
56419b9e90
issue #2410 : [Android] Adding listener for CCDrawNode when application resume from background.
...
Reset the order of reloading shaders and textures in main.cpp.
2013-07-17 12:53:30 +08:00
samuele3hu
6ce5bbf09a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-17 10:16:11 +08:00
samuele3hu
0f1ac9983f
issue #2377:Modify some tolua_*_open functions place and Modify Websocket,OpenGl,Scrollview handlers operation.
2013-07-17 10:15:25 +08:00
Ricardo Quesada
5d499d351d
Some more changes to make the code more c++ friendly:
...
- nodeToParentTransform -> getNodeToParentTransform() (the same for its friends)
- Deprecates the old methods
- adds 'consts' to those methods
- boundingBox() -> getBoundingBox()
- the new one is const
- Deprecates the old method.
- Adds overrides keywords in CCNodeRGBA and CCArmature
- AffineMatrix are mutables
2013-07-16 18:16:04 -07:00
carlo morgantini
9cfe1b7823
new stuff for FreeType
2013-07-16 15:18:39 -07:00
James Chen
80590dcfc1
Merge pull request #3132 from samuele3hu/ScriptHandler
...
issue 2377:Add scriptHandlerMgr to manager lua script handler
2013-07-16 02:40:50 -07:00
samuele3hu
596eb9df3e
issue #2377:Modify tojs/cocos2dx.ini and a function name
2013-07-16 16:45:57 +08:00
James Chen
510b29a2ff
Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2013-07-16 16:33:02 +08:00
James Chen
b543de648c
[iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects.
2013-07-16 15:35:13 +08:00
James Chen
f09cf35dba
Updating JS-test to the latest version.
2013-07-16 15:31:23 +08:00
samuele3hu
241c01bec3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-16 14:47:46 +08:00
James Chen
13e939b55e
Merge pull request #3157 from ricardoquesada/override_love
...
closed 2407: Adds more readability to the class internals.
2013-07-15 22:05:33 -07:00
samuele3hu
1761669832
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
2013-07-16 12:47:40 +08:00
James Chen
b11000908e
Merge pull request #3155 from pktangyue/patch
...
issue #2406 : Override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class.
Resolved issue: Color and Opacity of Scale9Sprite will not be changed when it's added to NodeRGBA and run with FadeIn/Out actions.
2013-07-15 19:40:29 -07:00
James Chen
a36a4bf19b
issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.
2013-07-16 10:02:02 +08:00
samuele3hu
c955a559bf
issue #2377:Del register/unregister function in .cpp and .h files
2013-07-16 09:55:06 +08:00
Ricardo Quesada
f9268c8054
small API changes
...
::create()
and const chars
2013-07-15 14:35:25 -07:00
Ricardo Quesada
9958e0d7f9
Adds more readability to the class internals.
...
Changes:
- creator (static) methods, and singleton methods (static) are always at the top of the class
- Constructors, destructros, and init methods comes next
- Then the instance methods for the class
- Then the overriden methods
- and finally the ivars
Also, overriden methos have the "override" context keyword
2013-07-15 12:43:22 -07:00
pktangyue
6bb2d64f19
add S9CascadeOpacityAndColor test
2013-07-15 20:13:30 +08:00
minggo
93e75bad9f
Merge pull request #3154 from minggo/add-deprecated-header
...
Add deprecated header
2013-07-15 03:20:32 -07:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
minggo
eada29ee40
issue #2404:created CCDprecated.h and move all global functions and variables into it
2013-07-15 16:14:26 +08:00
samuele3hu
80a6811f9f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-15 10:39:08 +08:00
samuele3hu
51c3ced4ba
issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples
2013-07-15 10:38:16 +08:00
yinkaile
680b7f1cb0
Remove vld.h
2013-07-13 22:59:21 +08:00
James Chen
4b2165e648
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
2013-07-13 19:24:41 +08:00
James Chen
1bdb8f1bb2
Adding SocketIO test for iOS and Mac projects.
2013-07-13 19:24:09 +08:00
James Chen
b5ca0b4ed5
Fixing warnings in SocketIOTest.cpp.
2013-07-13 19:21:31 +08:00
yinkaile
619a8810fe
Change Physics detector
2013-07-13 19:14:30 +08:00
carlo morgantini
45f9edcdc3
some more work on freetype
2013-07-12 17:31:23 -07:00
carlo morgantini
e4af13f1f6
use freetype
2013-07-12 12:39:47 -07:00
minggo
6abe6fce78
closed #2393 : fix conflicts
2013-07-12 18:04:32 +08:00
minggo
58fe3c7563
closed #2393 : fixed conflicts
2013-07-12 15:07:44 +08:00
minggo
5d9fea1416
issue #2393:mark PointZero RectZero and SizeZero as deprecated
2013-07-12 14:47:36 +08:00
James Chen
33c37f5f9d
issue #2397 : CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
2013-07-12 14:44:24 +08:00
James Chen
4a7e884de8
issue #2397 : UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance();
2013-07-12 14:34:57 +08:00
minggo
15096b0716
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
2013-07-12 14:30:26 +08:00
James Chen
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +08:00
James Chen
6038d69183
issue #2397 : sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance.
2013-07-12 14:12:58 +08:00
minggo
bb758df0d0
issue #2393:mark ccp as deprecated
2013-07-12 14:11:55 +08:00
James Chen
41957f06c9
issue #2397 : sharedAnimationCache --> getInstance.
2013-07-12 13:54:56 +08:00
James Chen
1f8e852020
issue #2397 : Shader::sharedShaderCache() --> Shader::getInstance().
2013-07-12 13:40:01 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
James Chen
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
Ricardo Quesada
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
Chris Hannon
126ebb888c
Implements a socket.io client extension, adds a test case and updates the android makefiles.
...
Contains the following tasks:
-initial socket.io extension commit
-sioclientimpl subclasses websocket:delegate to respond to websocket events
-implement static connect methods and basic client creation
-move SocketIO class files into correct extension folder (network)
-create SocketIO test in TestCpp
-update project references
-add missing static modifier to connect method
-implement basic test methods
-update extensions tests with SocketIO test entry
-implement basic handshake and opensocket methods for SocketIO
-add Delegate class to handle callbacks, implement virtual Delegate methods in test
-implement socket and client registries for lookup when connecting to hosts and endpoints
-connect delegate onOpen method by separating impl creation from connection
-update test to demonstrate onOpen callback
-create send and emit methods, move SIOClient into header file, add send and emit methods to test
-implement basic socket.io message parsing
-improve logging for events and messages
-add logic to pull event name from payload
-schedule heartbeat to keep connection alive, scheduled for 90% of the heartbeat interval from the server for safety
-add onConnect handler to to catch socket.io onconnect vs websocket onopen
-add disconnect and disconnectFromEndpoint methods to properly disconnect and destroy objects
-modify SIOClientImpl to track _uri for easier lookup in registries
-connect handler for onMessage to message event from socket.io, modify onError handler to take a string instead of WebSocket error code
-create SIOEvent callback type, implement event registry in clients, add test for event registration and callback
-update SIOEvent to use std::function and c++11, utilize cocos2d CC_CALLBACK method to bind selectors, this ensures that the *this reference is properly passed
-check for connect before sending or emitting in the client, cleanup some codes
-change connect logic to reuse existing socket connections instead of opening a new one
-implements get and set Tag methods for clients for easy reference
-improve endpoint handling, add endpoint tests to test layer
-additional error handling within socket disconnect error and failure to open connection
-fixes extracting endpoint from socket.io messages (in cases of the connect message, where there is 1 less colon for the connect message to the default namespace). Also fixes connecting to the default namespace "/" in the connectToEndpoint method
-add disconnect and onClose handlers to client so that onClose is called in the delegate
-add disconnect test methods to test layers
-change c-style casts to static_casts when using a CCDICT_FOREACH
-remove some unneeded namespace completion
-add usage documentation
-add handling for disconnect from server, cleanup some codes
-update comments and documentation in the socketiotest
-update includes so the NDK doesn't complain when compiling with c++11
-add socketio.cpp and test.cpp to the android makefiles
-update test URL to my public server, test script can also be found in my repo at https://github.com/hannon235/socket.io-testserver.git
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2013-07-11 17:41:42 -04:00
carlo morgantini
002ae77698
new dynamic TTF label stuff
2013-07-11 14:41:03 -07:00
James Chen
3c64bc8972
issue #2396 : Updating Scale9SpriteTest.cpp.
2013-07-11 17:08:09 +08:00
samuele3hu
ea0a19e7a2
issue #2377:Adjust tab and space
2013-07-11 16:49:29 +08:00
samuele3hu
c4de89870a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-11 16:43:25 +08:00
samuele3hu
81ad976eed
issue #2377:Remove registerNotificationHandler function
2013-07-11 16:42:11 +08:00
minggo
c37af8fa77
issue #2393:mark functions in CCPointExtensions deprecated
2013-07-11 16:38:58 +08:00
pktangyue
5e8de73061
add S9FrameNameSpriteSheetRotatedSetCapInsetLater test
2013-07-11 16:09:07 +08:00
James Chen
227afc37b9
Merge branch 'iss2395-s9sprite-test' of https://github.com/dumganhar/cocos2d-x into iss2395-s9sprite-test
2013-07-11 15:10:27 +08:00
James Chen
1527c1b4c3
issue #2395 : Updating TestCpp/Android.mk
2013-07-11 15:09:13 +08:00
James Chen
ab4e9749b6
issue #2395 : [Win32] Updating TestCpp project configuration
2013-07-11 14:17:43 +08:00
James Chen
9946bc4f00
issue #2395 : Adding Scale9SpriteTest for other platforms.
2013-07-11 14:13:01 +08:00
James Chen
ad95ba4894
closed #2395 : Adding Scale9SpriteTest for TestCpp
2013-07-11 14:07:14 +08:00
James Chen
2e9d727466
issue #2395 : Removing unused codes in ActionTest.h.
2013-07-11 14:00:26 +08:00
samuele3hu
ff29d2b5d4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-11 13:40:16 +08:00
samuele3hu
9007b9feee
issue #2377:Replace the CallFunc script Handler and repair Testlua Bug
2013-07-11 13:38:25 +08:00
carlo morgantini
9264b3de1d
more clean up
2013-07-10 11:59:05 -07:00
samuele3hu
31d0e492c2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
2013-07-10 15:05:02 +08:00
samuele3hu
cf1cbe1bd6
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
2013-07-10 15:04:00 +08:00
Lee, Jae-Hong
9322e5594b
Support Tizen 2.2 SDK.
...
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
yinkaile
54e5fca2aa
Bone can add a particle display as a CCNode
2013-07-10 10:00:51 +08:00
Jaroslaw Lewandowski
626ba2686f
Solving 'black screen' on android
2013-07-09 21:21:43 +01:00
Éloi Rivard
05ae6f8518
Fixed some warnings
2013-07-09 16:33:21 +02:00
Éloi Rivard
e6354bbf0a
Various linux eclipse projects compilation fixes
2013-07-09 15:23:19 +02:00
Éloi Rivard
b8242cfe97
Removed unused include in eclipse HelloLua project
2013-07-09 15:23:19 +02:00
Éloi Rivard
d853934f1b
Added -std=c++0x flag in C++ eclipse projects
2013-07-09 15:23:19 +02:00
James Chen
9b9fe67d25
issue #2387 : Using static_cast instead of C style cast in iteration of CCArray.
2013-07-09 14:29:51 +08:00
minggo
6d7b9ca236
Merge pull request #3108 from minggo/pitch_7platforms
...
Pitch 7platforms
2013-07-08 20:24:15 -07:00
minggo
e5a80eed91
fixed conflict
2013-07-09 10:39:16 +08:00
James Chen
85ef6b3b98
closed #2384 : Using static_cast instead of C cast in ExtensionsTest.cpp.
2013-07-09 10:18:15 +08:00
James Chen
3c394bba87
Merge branch 'iss3102-extensionstest-menuscroll' of https://github.com/hannon235/cocos2d-x into hannon235-iss3102-extensionstest-menuscroll
2013-07-09 10:16:31 +08:00
James Chen
976d4ad11e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
cocos2dx/actions/CCActionInterval.cpp
cocos2dx/cocoa/CCDictionary.cpp
samples/Cpp/TestCpp/Classes/NodeTest/NodeTest.cpp
2013-07-09 09:48:41 +08:00
Ricardo Quesada
c7bf2ead10
More static_cast<>
2013-07-08 14:42:08 -07:00
Ricardo Quesada
9fe9341646
From C++ best practices
...
Uses static_cast<> instead of C casting.
2013-07-08 14:38:14 -07:00
Chris Hannon
bba9722faa
iss3102: make extension test submenu in TestCpp scrollable to access all entries
2013-07-08 16:20:24 -04:00
dumganhar
9b126e79d7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-08 23:09:48 +08:00
dumganhar
8f900d02b8
issue #2300 : Removing all 'copyWithZone' pattern.
2013-07-08 23:05:47 +08:00
minggo
87125e4b2a
issue #2129:use capital words for static const member variables
2013-07-08 18:11:32 +08:00
James Chen
e28cf8d258
issue #2129 : Windows doesn't support 'initializer list', using constructor instead.
2013-07-07 21:08:14 +08:00
minggo
5ff7baf126
update to latest branch
2013-07-05 17:53:39 +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
James Chen
a996b878cd
issue #2368 : Updating JS-test.
2013-07-05 15:30:33 +08:00
James Chen
fcc02d476c
Updating AppDelegate.cpp
2013-07-05 15:24:29 +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
minggo
12bc534475
Merge pull request #3079 from dabingnn/Issue-2367-ClippingNodes-Bug
...
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-04 22:42:03 -07:00
Huabing.Xu
7a61ead598
issue #2367 : Fix Bug "ClippingNodes work different in Android and IOS"
2013-07-05 11:59:46 +08:00
James Chen
3138281cab
issue #2371 : [Lua] Only 64bit target needs the linking flag '-pagezero_size 1000 -image_base '
2013-07-04 17:53:23 +08:00
James Chen
6ed014ab00
issue #2371 : Removing unused file.
2013-07-04 17:25:52 +08:00
James Chen
dca0874ee3
issue #2371 : Removed unused projects.
2013-07-04 17:24:34 +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
7d3a63bb23
issue #2371 : Adding HelloLua and TestLua projects for MAC.
2013-07-04 17:10:47 +08:00
James Chen
83b23c67fd
issue #2371 : Set design resolution for TestLua.
2013-07-04 17:07:34 +08:00
James Chen
808ce2e208
close #2371 : Adding Lua projects for Mac.
2013-07-04 16:29:06 +08:00
minggo
f019700b91
Merge pull request #3072 from minggo/const_love
...
Fix compiling errors of #3070
2013-07-03 23:19:14 -07:00
James Chen
397b698f07
[iOS] Adding lua projects.
2013-07-04 13:50:09 +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
d88a4244b9
Obfuscated Test JS added on iOS and Mac
...
new version of game.js. I guess it was autogenerated
2013-07-03 15:29:57 -07:00
Ricardo Quesada
d399a044a9
Adds JS tests for iOS
2013-07-03 14:05:02 -07:00
Ricardo Quesada
22b42bfe7d
SimpleGame and HelloCpp works as expected
...
their Info.plist was broken
2013-07-03 13:24:39 -07:00
Ricardo Quesada
77dbe995d4
Merge branch 'develop' into ios_mac_one_project
2013-07-03 11:39:00 -07: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
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
Darragh Coy
e247b5d960
Add ccDrawSolidCircle
...
Similar to ccDrawCircle() primitives drawing function except the circle is filled.
2013-07-02 13:39:16 -07:00
James Chen
54736814fa
issue #2285 : New JS-test MotionStreak.
2013-07-02 17:57:48 +08:00
James Chen
53884d8238
issue #2285 : Adding MotionStreak test for TestJavascript.
2013-07-02 17:47:33 +08: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
dded008909
issue #2328 refractor etc support:remove comments
2013-07-02 15:46:17 +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
eeff9b3d75
issue #2325 : [MAC] Adding missing resources for TestCpp.
2013-07-02 10:43:21 +08:00
James Chen
ec5edeb8f6
issue #2325 : Updating title for Mac projects.
2013-07-02 10:42:50 +08:00
Ricardo Quesada
c38e932fe8
Adds SimpleGame and HelloCpp to the mac samples project
2013-07-01 17:31:03 -07:00
Ricardo Quesada
9e13cb91a5
Adds xcworspace data
2013-07-01 16:33:17 -07:00
Ricardo Quesada
92469a635c
CrystalCraze and CocosDragon added
2013-07-01 16:24:41 -07:00
Ricardo Quesada
1e6a7f6bbc
MoonWarriors works on Mac
2013-07-01 16:02:36 -07:00
Ricardo Quesada
631ea4ef1d
restore js shared
2013-07-01 15:26:03 -07:00
Ricardo Quesada
527d209ca8
Tries to compile WaterMelonWithMe
2013-07-01 15:20:31 -07:00
Ricardo Quesada
f83383b86c
removes unused projects
2013-07-01 14:43:47 -07:00
Ricardo Quesada
87fc7d4d62
cocos2d mac project redesigned
2013-07-01 14:41:39 -07:00
Huabing.Xu
ae47e94db9
change test case, all platform not can read pkm file
2013-07-01 18:15:59 +08:00
Sergey Shambir
0a2207f531
Fixed coding style, rearranged CocosDenshionTest UI, changed
...
rewindBackgroundMusic to work with paused music.
2013-06-29 13:46:19 +04: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
9bac943040
issue #2325 : [MAC] Removing libxml2.dylib, adding libcurl.dylib and updating dependence for TestCpp.
2013-06-29 12:25:44 +08:00
James Chen
7dd6218344
issue #2325 : [MAC] Setting the windows size to 800x450 which is the same as HTML5-tests.
2013-06-29 12:12:26 +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
Ricardo Quesada
9b1684b666
Merge remote-tracking branch 'cocos2d/develop' into js_mac
2013-06-27 22:15:03 -07: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
James Chen
89ccd9240e
issue #2340 : Using 800x450 as design resolution for TestJavascript.
2013-06-27 16:10:42 +08:00
Ricardo Quesada
ccd9cb486c
JS Tests compiles and links in Mac
...
...but it doesn't work yet due to a bug with the touch events :-(
2013-06-27 00:58:46 -07:00
Ricardo Quesada
398c6593f0
JS Tests: Almost working on Mac
2013-06-26 23:45:08 -07:00
James Chen
0fdf4b97d6
Fixing iOS workspace project, using c99 instead of gnu99.
2013-06-26 17:52:54 +08:00
James Chen
afc7e39d0f
issue #2313 : Opens stencil for TestJavascript.
2013-06-26 16:28:14 +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
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
James Chen
4196f2036e
Merge pull request #2993 from dumganhar/iss2325-ios-workspace-dependence-fix
...
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 08:41:28 -07:00
James Chen
3e052d5525
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 23:21:06 +08:00
minggo
28c69b8b16
Merge pull request #2990 from minggo/ccx_filesystem
...
fixed a compiling error of AssetsManager on Android
2013-06-25 02:36:34 -07:00
minggo
6539fd52ba
Merge pull request #2989 from samuele3hu/glMoudle
...
issue #2276 : Add OpenGL lua module
2013-06-25 02:23:15 -07:00
minggo
86646bb820
issue #2329:fixed a compiling error of AssetsManager on Android
2013-06-25 17:09:10 +08: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
minggo
d13597bcc3
Merge branch 'ccx_filesystem' of https://github.com/folecr/cocos2d-x into ccx_filesystem
2013-06-25 16:55:39 +08:00
samuele3hu
46bcf6ddba
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into glMoudle
2013-06-25 15:22:14 +08:00
samuele3hu
3b058fe019
issue #2276 : Add OpenGL lua module
2013-06-25 14:55:57 +08:00
James Chen
425db1af6b
Merge pull request #2982 from ricardoquesada/ios_project_fixes
...
[iOS] TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
2013-06-24 22:02:53 -07:00
Ricardo Quesada
436c7e9391
removes Xcode's autogenerated library paths
2013-06-24 21:30:04 -07:00
Ricardo Quesada
e1d65e149b
some fixes
...
removes deprecated functions from AsssetManager
AssetManager: updated project
HelloCpp: does not depent on box2d, chipmunk, etc.
2013-06-24 18:20:07 -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
Ricardo Quesada
4204e8243c
TestCpp for iOS uses libcocos2dx, libCocosDenshion, etc...
...
...as dependencies, and other minor fixes
2013-06-24 16:59:00 -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
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
Ricardo Quesada
404193eb9f
Uses C++11 iterator in samples
...
or it just uses touches->anyObject() instead of creating an iterator
and removes more unneeded casts
2013-06-21 20:02:43 -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
Ricardo Quesada
5e106f3c85
Uses C++11 code for the actions tests
...
Removes all casting.
Uses auto for actions
uses for(:) (C++11) iterator
2013-06-21 12:25:36 -07:00
James Chen
88a0dbec5e
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-21 21:29:25 +08:00
minggo
0a768da240
issue #2305 : use 4.7 toolchain to fix compiling errors
2013-06-21 17:17:23 +08:00
James Chen
09f141f162
Merge pull request #2962 from samuele3hu/scrollview_develop
...
issue #2276 : Add ScrollView lua binding and test sample
2013-06-21 01:57:41 -07:00
samuele3hu
e36c6f544a
issue #2276 : Modify ScrollView and LuaScrollView class
2013-06-21 14:17:41 +08:00
James Chen
12549f72f9
Adding resource for ComponentTest.
2013-06-21 14:16:03 +08:00
James Chen
dcaa55e622
Warning fixes for TestCpp. Using lambda, CC_CALLBACK_1 and clone pattern.
2013-06-21 14:15:20 +08:00
samuele3hu
35f0b07aa6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 11:16:46 +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
samuele3hu
a862543a4c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-21 10:44:03 +08:00
samuele3hu
c527fecfe3
issue #2276 : Add scrollview sample test in cocosbuilder and modify some config
2013-06-21 10:43:02 +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
5c4545de3c
[NaCl] Remove use of -lnosys
2013-06-20 12:56:13 -07:00
Sam Clegg
d3110c0a45
[NaCl] Recreate webstore zip archive each build.
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
Sam Clegg
ab1243e8dd
[NaCl] Disable http tests under NaCl
2013-06-20 10:56:26 -07:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00