minggo
|
77f89956a3
|
Merge pull request #3414 from boyu0/iss2522_unpackccz
closed #2522: Let Image::initWithImageData() support the packed data.
|
2013-08-15 21:44:43 -07:00 |
James Chen
|
041b14f3ff
|
Merge pull request #3411 from maciekczwa/master
fixed stroke font color with channel color values other than 255
|
2013-08-15 20:28:49 -07: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
|
0b306cd510
|
Removing unused file: cocos2dx/platform/blackberry/CCImage.cpp.
|
2013-08-15 21:44:51 +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 |
boyu0
|
2c3fd7ebae
|
issue #2522: fix some wrong indent.
|
2013-08-13 10:11:28 +08:00 |
boyu0
|
1f87fa37f4
|
closed #2522: Fix some coding style.
|
2013-08-12 17:05:19 +08:00 |
boyu0
|
cde4a7945c
|
closed #2522: Let Image::initWithImageData() support the packed data.
|
2013-08-12 11:54:54 +08:00 |
James Chen
|
dbd58b6aa7
|
issue #2521: Updating comments where searchs full path.
|
2013-08-12 11:06:51 +08:00 |
Maciej Czerniak
|
86b2ce33af
|
fixed stroke font color with channel color values other than 255
|
2013-08-11 11:38:38 +02:00 |
James Chen
|
2ff3655fff
|
Merge pull request #3408 from pyrasis/tizen_2.2
[Tizen] Update project files
|
2013-08-10 07:23:13 -07: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 |
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
|
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
|
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
|
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 |
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 |
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 |
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 |