folecr
|
05daebf65e
|
ccx : Initialize cocos. Calls cocos_android_app_init() to initialize the Cocos app.
|
2013-08-05 02:05:39 -07:00 |
folecr
|
7add86c751
|
ccx : Trace accelerometer only when tracing rendering
|
2013-08-05 02:05:38 -07:00 |
folecr
|
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
|
58c4037de8
|
ccx : Trace rendering
|
2013-08-05 02:05:38 -07:00 |
folecr
|
3cc62f9fa8
|
ccx : remove/comment filesystem access methods from Java
|
2013-08-05 02:05:38 -07:00 |
folecr
|
e5377e2ddc
|
simplegame : Use Cocos2dxActivity (which is also a NativeActivity.)
|
2013-08-05 02:05:38 -07:00 |
folecr
|
d9c3089f35
|
ccx : Cocos2dxActivity extends NativeActivity
|
2013-08-05 02:05:38 -07:00 |
folecr
|
3af519a61a
|
ccx : Remove Cocos2dxRenderer
|
2013-08-05 02:05:37 -07:00 |
folecr
|
6d990d0570
|
ccx : Call cocos rendering methods.
* switch to .cpp for nativeactivity.
* ccx : update log tags to say .ccp instead of .c
|
2013-08-05 02:05:37 -07:00 |
folecr
|
57cd5eedef
|
ccx : Change minimum config to RGB565. Add depth buffer and stencil buffer requirements to EGL config.
|
2013-08-05 02:05:37 -07:00 |
folecr
|
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 |
folecr
|
f4d21528d5
|
ccx : Link libraries used by nativeactivity.c
|
2013-08-05 02:05:36 -07:00 |
folecr
|
6ac71f16c1
|
ccx : add nativeactivity
|
2013-08-05 02:05:36 -07:00 |
folecr
|
12f25a574d
|
Shared Android makefile uses the platform specific code as a static library
* Resolve conflicts with latest cocos2x/Android.mk
* Revert changes to cocos2dx/Android.mk introduced by 9cba2c42c1
* Update files in label_nodes
|
2013-08-05 02:05:36 -07:00 |
folecr
|
588ca7e57b
|
Android port is a static library
|
2013-08-05 02:04:25 -07:00 |
folecr
|
92c45d85f2
|
Up refresh interval to 2 secs
|
2013-08-05 02:04:25 -07:00 |
James Chen
|
40332299d1
|
Merge pull request #3368 from azmeuk/emscripten
Multi-resolution emscripten html template.
|
2013-08-05 01:10:08 -07:00 |
James Chen
|
915bb16a72
|
Update AUTHORS [ci skip]
|
2013-08-05 15:50:01 +08:00 |
James Chen
|
00af9cfa29
|
Update AUTHORS [ci skip]
|
2013-08-05 15:47:50 +08:00 |
James Chen
|
82d87e2270
|
Merge pull request #3369 from dumganhar/iss2480-vao-vbo-crash
closed 2480: Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad.
|
2013-08-05 00:44:33 -07:00 |
James Chen
|
2df0b056ce
|
closed #2480: Fixed the crash caused by improper deletion of VBOs and VAO in ParticleSystemQuad.
|
2013-08-05 15:42:01 +08:00 |
Éloi Rivard
|
9dcb6fb80e
|
Multi-resolution emscripten html template.
Default emscripten html template update.
Minor emscripten warnings.
|
2013-08-05 09:24:47 +02:00 |
dotsquid
|
e92337f82d
|
Fixed the crash caused by improper deletion of VBOs in ParticleSystemQuad.
|
2013-08-05 15:23:01 +08:00 |
James Chen
|
fe0bae981f
|
Merge pull request #3365 from CocosRobot/updategeneratedsubmodule_1375681464
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings.
|
2013-08-04 22:45:46 -07:00 |
CocosRobot
|
a53a388005
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-05 05:44:27 +00:00 |
James Chen
|
8623d206f0
|
Merge pull request #3364 from dumganhar/carlomorgantinizynga-new_develop_merge
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, some more clean up (code review)
|
2013-08-04 22:44:03 -07:00 |
James Chen
|
c61da90441
|
Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge
|
2013-08-05 13:40:59 +08:00 |
James Chen
|
e73529b082
|
Merge pull request #3362 from dumganhar/carlomorgantinizynga-new_develop_merge
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, New (experimental) label TTF
|
2013-08-04 22:39:20 -07:00 |
James Chen
|
e08b319726
|
issue #2170: [JSB] Label is abstract class now.
|
2013-08-05 12:49:57 +08:00 |
James Chen
|
ea10032b24
|
issue #2170: Adding missing libs for Android.
|
2013-08-05 11:43:43 +08:00 |
James Chen
|
9a9ffaeb4d
|
issue #2170: A typo fix.
|
2013-08-05 11:33:59 +08:00 |
James Chen
|
b52732cc6b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into carlomorgantinizynga-new_develop_merge
|
2013-08-05 11:27:46 +08:00 |
James Chen
|
b8a7a4291f
|
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
|
2013-08-05 11:26:34 +08:00 |
James Chen
|
a979d6c6d3
|
Merge pull request #3340 from azmeuk/emscripten-fix
Fixed emscripten build error.
|
2013-08-04 20:22:34 -07:00 |
James Chen
|
eaabd93051
|
issue #2170: Fixing compilaction errors on Emscripten.
|
2013-08-05 11:10:12 +08:00 |
James Chen
|
a2fbf0c2b8
|
issue #2179: Fixing compilation errors on Linux.
|
2013-08-05 10:29:20 +08:00 |
James Chen
|
5ee6e7d79a
|
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
Conflicts:
cocos2dx/Android.mk
|
2013-08-05 10:09:15 +08:00 |
Éloi Rivard
|
00c8cf62a5
|
Fixed emscripten build error.
|
2013-08-04 16:30:33 +02:00 |
minggo
|
1aadf55b59
|
Merge pull request #3355 from minggo/iss2434-refactor_androidmk
closed #2434: simply Android.mk
|
2013-08-03 08:33:14 -07:00 |
minggo
|
456b5af872
|
closed #2434:fixed path
|
2013-08-03 23:12:10 +08:00 |
carlo morgantini
|
73286ad76b
|
some more clean up (code review)
|
2013-08-02 16:11:20 -07:00 |
James Chen
|
1becefefef
|
Merge pull request #3356 from dumganhar/iss2469-windows-path2
closed 2469:LabelTest and TileMapTest crash on windows.
|
2013-08-02 03:02:17 -07:00 |
minggo
|
9cba2c42c1
|
closed #2434: simply Android.mk
|
2013-08-02 17:33:27 +08:00 |
James Chen
|
0db8b2bbf3
|
closed #2469:LabelTest and TileMapTest crash on windows.
|
2013-08-02 17:31:19 +08:00 |
James Chen
|
53f4f1dab6
|
Merge pull request #3352 from CocosRobot/updategeneratedsubmodule_1375411584
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-08-02 00:09:33 -07:00 |