Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,386 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4608 Commits

Author SHA1 Message Date
minggo d2b96be1e6 Merge pull request #3401 from folecr/accel 
Take orientation into account when reporting accelerometer sensor readout
 2013-08-10 05:46:42 -07:00
folecr 2ebd400a75 clean up coding style and remove explicit temporary variable 2013-08-09 11:39:52 -07:00
godyZ 9dde196140 update s3tc#8,resolve CCConfiguration conflict 2013-08-09 15:47:20 +08:00
godyZ e507bb0deb update s3tc #7 2013-08-09 15:00:26 +08:00
godyZ 9bdb8a43d7 update s3tc #6 2013-08-09 14:37:47 +08:00
godyZ fa7b486880 update s3tc #5, code standardization 2013-08-09 12:54:05 +08:00
folecr 063c730726 Take orientation into account when reporting accelerometer sensor readout 2013-08-08 14:40:26 -07:00
godyZ f648a3f907 modify linux makefile 2013-08-08 17:06:42 +08:00
minggo bf79a0560b issue #2462:use cocos2d-x c++ style 2013-08-08 16:31:44 +08:00
godyZ 727ae1bbc2 update s3tc #4 , code standardization 2013-08-08 14:59:46 +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
minggo 552c63d0cf Merge pull request #3269 from metalbass/patch-4 
Removed if from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SA...
 2013-08-07 18:45:27 -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
Lee, Jae-Hong b42868fd69 [Tizen] Remove Tizen 2.1 headers and libraries. 2013-08-07 18:52:15 +09:00
godyZ 674fe025b0 update s3tc #3 ,standard of code 2013-08-07 16:39:05 +08: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
boyu0 684e005ce7 issue #2345: edit for linux compile error 2013-08-07 14:10:42 +08:00
boyu0 d61d3d1a24 issue #2345: fix mac crash due to libjpeg 2013-08-07 11:59:52 +08:00
boyu0 a9d26d3fdc issue #2345: edit getPixelFormatInfoMap method to return reference. 2013-08-07 11:20:41 +08:00
boyu0 ec6343a9b8 fix js and linux compile error 2013-08-07 10:34:30 +08:00
godyZ 27baf5b961 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-07 09:32:42 +08:00
boyu0 eb989db3de issue #2345: fix some coding style 2013-08-06 16:14:36 +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
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07: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 d51db25a6f issue #2345: delete the linux png libraries. 2013-08-06 11:41:03 +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
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09: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