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 |
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 |