minggo
c4a97cdfa1
Merge pull request #3485 from ricardoquesada/perf_and_bug_fixes
...
Perf and bug fixes
2013-08-26 23:22:33 -07:00
James Chen
213b7aea21
Merge pull request #3453 from samuele3hu/iss2433-lua-bindings-generator
...
issue #2433 : Add lua bindings generator and modify releated test samples
2013-08-26 23:09:56 -07:00
Ricardo Quesada
0093263c18
Little performance improvements
...
Uses `AffineTransform::IDENTITY`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
James Chen
6501c9bffd
Merge pull request #3479 from pyrasis/tizen_2.2
...
[Tizen] Update project files
2013-08-26 03:23:14 -07:00
minggo
e567b6c54b
fix warnings on ndk-r9
2013-08-26 18:02:51 +08:00
James Chen
c9ffc44bc4
[Android] Removing x86 from APP_ABI. Otherwise the time of compiling will be very long.
2013-08-26 16:52:20 +08:00
Ricardo Quesada
ea8eb601af
Uses std::sort()
...
Uses std::sort() for inserting the nodes.
This code is not final, but preliminary results show that std::sort() is 60% faster
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-24 10:56:07 -07:00
Lee, Jae-Hong
bbf9053788
[Tizen] Update project files.
...
- Update file list.
- change order of link files.
2013-08-25 02:22:50 +09:00
Ricardo Quesada
364288cf66
Adds "Sort all Children" perf test
...
Adds a new perf tests: "sortAllChildren"
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-23 13:14:57 -07:00
samuele3hu
6ae80bcaf0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-23 16:14:19 +08:00
samuele3hu
e557b6b7c2
issue #2433:Add lua deprecated fiel and modify some test samples
2013-08-23 16:12:59 +08:00
James Chen
2a147ec34a
Adding a new search path 'res' to TestJavascript since some resources are defined as hard code in ControlColourPicker::init().
...
bool ControlColourPicker::init()
{
if (Control::init())
{
setTouchEnabled(true);
// Cache the sprites
SpriteFrameCache::getInstance()->addSpriteFramesWithFile("extensions/CCControlColourPickerSpriteSheet.plist"); // Hard code here
// Create the sprite batch node
SpriteBatchNode *spriteSheet = SpriteBatchNode::create("extensions/CCControlColourPickerSpriteSheet.png"); // Hard code here
addChild(spriteSheet);
2013-08-23 15:55:25 +08:00
James Chen
7882ea7fbc
Merge pull request #3465 from dumganhar/develop
...
issue #2483 : Updating VS projects to use the correct library (mozjs-23.0.lib).
2013-08-22 20:28:57 -07:00
James Chen
6ed43811fe
issue #2483 : Updating VS projects to use the correct library (mozjs-23.0.lib).
2013-08-23 11:26:16 +08:00
Ricardo Quesada
055c566bc9
Adds missing #include
2013-08-22 19:30:20 -07:00
Ricardo Quesada
38bfadf7f3
Adds 2 new performance tests
...
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-22 18:21:52 -07:00
minggo
ddb4219d24
Merge pull request #3457 from boyu0/iss2434_gen_android_mk
...
closed #2434 : Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0
9e34aae075
closed #2434 : Use the origin android.mk files instead use templates
2013-08-22 16:45:40 +08:00
samuele3hu
5f6d9815ca
issue #2433:Modify platform config and some test samples
2013-08-22 15:06:34 +08:00
boyu0
83f7835708
issue #2434 : Delete unused method dirs and find_files in Android.mk template
2013-08-22 14:03:25 +08:00
boyu0
ad23ec4a0f
#closed #2434 : refactor LocalVarToAuto.py to use the PathUtils and fix some errors
2013-08-22 13:40:57 +08:00
samuele3hu
3b90d0b5b6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 13:40:35 +08:00
Ricardo Quesada
d7590affda
Merge branch 'develop' into dictionary_array_fixes
...
Conflicts:
cocos2dx/cocoa/CCArray.cpp
cocos2dx/cocoa/CCArray.h
cocos2dx/label_nodes/CCLabel.cpp
extensions/CCArmature/datas/CCDatas.cpp
extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
boyu0
da566a3c16
issue #2434 : add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
...
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
Ricardo Quesada
2e221ee6cc
Array & Dictionary fixes
...
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.
This patch fixes all those issues.
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
Ricardo Quesada
f0a2f6cbf8
purge profiler data one + or - is pressed
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:02:50 -07:00
minggo
2de8963a0a
fix warnings caused by deprecating some functions of Array
2013-08-22 10:45:47 +08:00
samuele3hu
3cb095f48a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-22 10:17:59 +08:00
samuele3hu
bea62800b4
issue #2433:Modify TestLua samples and add some manual binding code
2013-08-22 10:16:57 +08:00
Huabing.Xu
3bc5f1ed8a
issue #2460 : glfw win32 project file
2013-08-21 12:02:21 +08:00
Huabing.Xu
b2e167c6ea
issue #2460 : glfw mac version
2013-08-21 12:01:56 +08:00
Ricardo Quesada
cf02cb4581
Fixes names in Performance Node tests
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 18:05:35 -07:00
Ricardo Quesada
e5551b2872
Compiles both with std::vector and ccCArray
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 16:06:51 -07:00
Ricardo Quesada
20167e2a12
removes unneeded spaces
...
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:45 -07:00
Ricardo Quesada
c9b250d4a4
Adds new tests to tests
...
and enables profiling
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:32 -07:00
Huabing.Xu
2e21e18b70
issue #2460 : rename EGLView::Create to EGLView->create
2013-08-20 16:23:46 +08:00
Huabing.Xu
dd538a28a7
issue #2460 : glfw window version
2013-08-20 13:57:15 +08:00
samuele3hu
39686ea503
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-20 13:46:26 +08:00
samuele3hu
7a9f1d6804
issue #2433:Modify TestLua samples and some .ini files
2013-08-20 13:44:37 +08:00
Ricardo Quesada
511ec1cc5d
Compiles with improved CCArray
...
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
minggo
3ca26e1aa6
Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto
...
closed #2517 : Update all test cases use auto for local variables
2013-08-17 01:12:48 -07:00
minggo
c7f313419e
Merge pull request #3431 from minggo/iss2525-add_iterator_for_array
...
add iterator for Array and make Array can be used in range-based loop
2013-08-17 00:42:42 -07:00
folecr
aff86b1b52
Keep TravisCI happy : build Android TestCpp for ARM architecture only.
2013-08-16 16:19:34 -07:00
minggo
baa9e0a1e4
issue #2525:add iterator for Array and make Array can be used in range-based loop
2013-08-16 18:23:41 +08:00
성낙호
200a1ec831
style edited
2013-08-16 19:03:27 +09:00
boyu0
6779f494f3
issue #2517 : Restore TestCpp proj.android that edited by mistake.
2013-08-16 16:09:46 +08:00
boyu0
70df1a6061
closed #2517 : Use LocalVarToAuto.py to change Samples src file
2013-08-16 16:05:27 +08:00
godyZ
424b4140a2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode
2013-08-16 11:14:47 +08:00
godyZ
e8809b2b15
issue #2533:add ATITC compressed texture support
...
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
2013-08-16 11:02:44 +08:00
samuele3hu
c8b75a1080
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
2013-08-16 10:13:38 +08:00
samuele3hu
de3335a4a9
issue #2433:Update lua manual binding and modify some samples
2013-08-16 10:12:46 +08:00
James Chen
9ab671fb03
Merge pull request #3425 from dumganhar/iss2488-new-label-sample
...
Iss2488: Merge PR https://github.com/cocos2d/cocos2d-x/pull/3422
2013-08-15 07:16:48 -07:00
James Chen
4b0d0225b7
issue #2488 : Updating makefile for linux and emscripten.
2013-08-15 21:44:51 +08:00
James Chen
409e345522
issue #2488 : Updating VS project configuration.
2013-08-15 21:40:11 +08:00
James Chen
56cd039b32
issue #2488 : Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'";
2013-08-15 21:39:47 +08:00
James Chen
9dbd74d2a8
Merge pull request #3413 from dumganhar/iss2521-js-ccb-owner
...
Adding more ExtensionTest like CocosBuilderTest and ControlButtonTest and bug fix in CCBReader.
2013-08-15 04:19:17 -07:00
James Chen
21134cc48f
Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean
2013-08-15 17:02:51 +08:00
samuele3hu
7f8099ce69
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
tools/bindings-generator
2013-08-15 16:21:32 +08:00
samuele3hu
f29525bbc6
issue #2433:Modify Testlua sample and add some manual binding functions
2013-08-15 15:51:22 +08:00
samuele3hu
13fd369beb
issue #2433:Modify lua binding generator template and releated action test
2013-08-14 21:35:55 +08:00
folecr
b4edb14d33
Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging.
2013-08-13 15:50:58 -07:00
folecr
4d34cfc28f
Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore
2013-08-13 11:29:53 -07:00
folecr
84054a237c
Android platform version used matches all other sample projects
2013-08-13 11:28:56 -07:00
carlo morgantini
47be4ff58a
Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
...
Conflicts:
cocos2dx/label_nodes/CCFontAtlas.cpp
cocos2dx/label_nodes/CCFontAtlas.h
cocos2dx/label_nodes/CCFontAtlasCache.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.h
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontFreeType.cpp
cocos2dx/label_nodes/CCLabel.cpp
cocos2dx/label_nodes/CCLabel.h
cocos2dx/label_nodes/CCStringBMFont.h
cocos2dx/label_nodes/CCStringTTF.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-08-13 11:28:54 -07:00
carlo morgantini
15ec303278
more clean ups on tests for label
2013-08-13 10:12:02 -07:00
folecr
b61ce3c79d
ndkgdb.sh for TestCpp
2013-08-13 08:47:48 -07:00
folecr
17c7b7cbcf
APP_OPTIM is debug
2013-08-13 08:47:48 -07:00
folecr
652920eaac
set android:debuggable property to true
2013-08-13 08:47:48 -07:00
folecr
75f7af00a6
TestCpp builds both ARM and x86 versions
2013-08-13 08:47:48 -07:00
folecr
cd0f1beaf4
fix evaluation of properties array read from local.properties
2013-08-13 08:47:48 -07:00
folecr
ef7c3b2b09
Remove unused option in build script
2013-08-13 08:47:48 -07:00
carlo morgantini
35b5e30190
alignment added to new label creation
2013-08-12 15:41:29 -07:00
carlo morgantini
d15d84c05f
samples cleaned up
2013-08-12 15:09:28 -07:00
carlo morgantini
097a5c488a
New Label tests plus bug fixing
2013-08-12 13:29:54 -07:00
James Chen
9cf3bf64d5
issue #2521 : Updating JS-Test.
2013-08-12 11:31:54 +08:00
James Chen
12ffdfc4fd
issue #2521 : TestJavascript needs ccbreader support.
2013-08-12 11:21:31 +08:00
Lee, Jae-Hong
66593ae4bf
[Tizen] Update project files
...
- include stdint.h
- set etc, s3tc header path
- exclude CCImageCommonWebp.cpp, include etc, s3tc directories.
- update project files.
2013-08-10 23:11:31 +09:00
godyZ
fa7b486880
update s3tc #5 , code standardization
2013-08-09 12:54:05 +08:00
samuele3hu
980bea8a97
issue #2433:lua binding generator add hello.lua
2013-08-09 10:07:10 +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
James Chen
7910581654
Merge pull request #3388 from dumganhar/iss2483-sp-v23
...
closed 2483: Upgrading spidermonkey library to v23.
2013-08-07 18:39:40 -07:00
folecr
cbd7796438
Update nojava.txt with readme.
2013-08-07 12:29:58 -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
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
James Chen
39084750db
[Android] Updating launch activity name. ".TestJavascipt" --> "android.app.NativeActitiy" for TestJavascript project.
2013-08-07 13:46:09 +08:00
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