Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
|
Anton Sokolchenko
|
65cf2e1256
|
Update CCImage.cpp
|
2014-04-13 01:13:58 +03:00 |
|
Anton Sokolchenko
|
a9ccb812ed
|
Fix memory leak
|
2014-04-12 18:47:00 +03:00 |
|
James Chen
|
61134426a8
|
Some fixes detected by xcode analyze
|
2014-04-09 20:41:09 +08:00 |
|
Anton Sokolchenko
|
87015ae888
|
2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
|
2014-04-09 11:37:56 +03:00 |
|
Dale Stammen
|
409ad77b6c
|
disabled webp for wp8 and winrt
|
2014-03-22 05:51:39 -07:00 |
|
Nick Barrios
|
d9cbc5625c
|
CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop).
|
2014-02-20 00:48:09 -05:00 |
|
Nick Barrios
|
45d751caa7
|
CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps.
|
2014-02-19 22:13:12 -05:00 |
|
zhangbin
|
e02f488224
|
Merge branch 'develop' into issue3964
|
2014-02-16 11:01:07 +08:00 |
|
Dhilan007
|
0d5c702708
|
move labelttf's platform-dependent code from CCImage to CCDevice
|
2014-02-13 21:08:43 +08:00 |