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 |