godyZ
|
27baf5b961
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-08-07 09:32:42 +08:00 |
godyZ
|
02419ccb00
|
update s3tc #3 ,android test
|
2013-08-06 15:33:38 +08:00 |
James Chen
|
b3bfe2401a
|
Merge pull request #3378 from pyrasis/tizen_2.2
[Tizen] fix acceleration wrong coordinates.
|
2013-08-06 00:17:25 -07:00 |
Lee, Jae-Hong
|
5cc906f798
|
[Tizen] fix acceleration wrong coordinates.
|
2013-08-06 16:10:13 +09:00 |
godyZ
|
195536097f
|
update s3tc #2
|
2013-08-06 11:52:48 +08:00 |
godyZ
|
fd7b00681f
|
update s3tc#1
|
2013-08-06 11:19:45 +08:00 |
folecr
|
74583d21f3
|
Android port needs etc headers
|
2013-08-05 02:05:47 -07:00 |
folecr
|
8e386cf0bc
|
moar checking
|
2013-08-05 02:05:47 -07:00 |
folecr
|
952cefa036
|
Accelerometer
|
2013-08-05 02:05:47 -07:00 |
folecr
|
b56df6d28c
|
Separate log macro for logging event processing
|
2013-08-05 02:05:46 -07:00 |
folecr
|
5889cc2218
|
Shift by correct amount
|
2013-08-05 02:05:46 -07:00 |
Rohan Kuruvilla
|
fa940ec292
|
Add touch input processing
|
2013-08-05 02:05:46 -07:00 |
Rohan Kuruvilla
|
3c20c6d9a8
|
Fixing bug where engine wouldn't start animating when coming into foreground
|
2013-08-05 02:05:46 -07:00 |
folecr
|
5737d4cd25
|
strip out old accelerometer implementation
|
2013-08-05 02:05:42 -07:00 |
folecr
|
a10c9c74a1
|
Remove Accelerometer and TextEdit implementations.
|
2013-08-05 02:05:42 -07:00 |
folecr
|
4567ab96b8
|
Helper and LocalStorage now use NativeActivity directly
|
2013-08-05 02:05:42 -07:00 |
folecr
|
9cefb85bea
|
Use getInstance() instead of various deprecated singleton access methods
|
2013-08-05 02:05:42 -07:00 |
folecr
|
af1e450fe6
|
Remove spurious LOGI (use appropriate LOG_RENDER_DEBUG in its place.)
|
2013-08-05 02:05:42 -07:00 |
folecr
|
c1e88b79ba
|
Initialize JniHelper with the Acitivity. Load the native library that is specified in the Activity's meta-data.
|
2013-08-05 02:05:42 -07:00 |
folecr
|
76a684c556
|
Initialize Cocos2dxHelper from JNI. Call System.loadLibrary() in Java so functions implemented in native code are available from Java.
|
2013-08-05 02:05:42 -07:00 |
folecr
|
2951504b46
|
Actually obtain a reference to the Java class
|
2013-08-05 02:05:41 -07:00 |
folecr
|
dd79d9bbc2
|
Use default class loader to obtain the ClassLoader for this NativeActivity
|
2013-08-05 02:05:41 -07:00 |
folecr
|
e67698116c
|
Cache JNIEnv
|
2013-08-05 02:05:41 -07:00 |
folecr
|
d96f54d4e0
|
Separate calls to setvm reference and to set classloader
|
2013-08-05 02:05:41 -07:00 |
folecr
|
53b1a92773
|
Use an obtained class loader instead of the default
|
2013-08-05 02:05:41 -07:00 |
folecr
|
669427363f
|
Clean up JNIHelper
|
2013-08-05 02:05:41 -07:00 |
folecr
|
dc6b6ecc69
|
Remove unused Java files for Activity and GLSurfaceView (now in C code.)
|
2013-08-05 02:05:40 -07:00 |
folecr
|
921ed14a87
|
Use OpenGLES 2.0
|
2013-08-05 02:05:40 -07:00 |
folecr
|
a2a999d505
|
JNI, Set JavaVM
|
2013-08-05 02:05:40 -07:00 |
folecr
|
4539600ac2
|
initialize cocos with asset manager interface. separate out cocos init from android view init.
|
2013-08-05 02:05:40 -07:00 |
folecr
|
1fb4387d0a
|
AssetManager is a private member of FileUtilsAndroid. setter method. Remove old Java/JNI setter.
|
2013-08-05 02:05:40 -07:00 |
folecr
|
68b9e5d608
|
Move nativeactivity.cpp
|
2013-08-05 02:05:40 -07:00 |
folecr
|
0a9e9571cc
|
Remove unused declaration
|
2013-08-05 02:05:40 -07:00 |
folecr
|
e1bcbc7859
|
Remove references to the Java renderer
|
2013-08-05 02:05:39 -07:00 |
folecr
|
f7d5eb198e
|
ccx : setAnimationInterval() not implemented.
|
2013-08-05 02:05:39 -07:00 |
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
|
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
|
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
|
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
|
588ca7e57b
|
Android port is a static library
|
2013-08-05 02:04:25 -07: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
|
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
|
eaabd93051
|
issue #2170: Fixing compilaction errors on Emscripten.
|
2013-08-05 11:10:12 +08:00 |