b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
8ad49c1bbc
SpriteFrameCache: take pixelFormat into account if specified
2016-02-11 15:47:23 +03:00
ba45e2df33
updated lua bindings; updated file format description
2015-12-15 10:56:10 +01:00
d47a79c0e4
Remove cocos studio limitation for new functions
2015-11-16 11:08:20 +08:00
c40a2a3301
Combine Studio change for 2d components
2015-11-12 09:49:49 +08:00
94ab41ceb3
use "const string &" in SpriteFrameCache
2015-10-26 09:36:01 +01:00
c49b60ae40
SpriteFrameCache: added plist file format documentation, fixed broken link
2015-10-01 10:36:18 +02:00
ac24612e98
extend SpriteFrameCache to load PolygonInfo from plist file
2015-09-29 15:42:04 +02:00
07725ce84d
fix
2015-04-24 11:40:15 +08:00
faddbd8e71
Add function to texture cache for studio to check if texture have been already loaded
2015-04-23 16:50:28 +08:00
6cc8fb4348
Merge pull request #11092 from fusijie/cocosapi
...
[ci skip]update headers' module name.
2015-03-24 11:27:54 +08:00
af12891cfc
[ci skip]update headers' module name.
2015-03-24 10:34:41 +08:00
de73f25e42
Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h
2015-03-19 21:44:44 +08:00
069791a0a2
Corrected a wrong indent in CCSpriteFrameCache.h
2015-03-19 21:00:33 +08:00
9be573e92f
Added js annotate to CCSpriteFrameCache.h
2015-03-18 22:24:03 +08:00
2d50327323
update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache
2015-03-18 20:40:29 +08:00
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
23e0ed3767
add
...
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
2014-07-29 16:58:33 +08:00
e76feceada
fix coding style
2014-05-30 15:13:59 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
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
5e6130c92c
issue #4058 : Get rid of Object ,rename it to Ref.
2014-02-20 10:53:49 +08:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
555f3609c8
Uses `const std::string&`
...
... instead of const char*
* Because it is more robust
* and it is faster... yes faster.
It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.
It is faster to have everthing in std::string as soon as possible to
prevent further conversions.
There are still some parts of the code that require conversion, but
most of the code was converted.
2013-11-05 19:02:03 -08:00
95acb1b9e3
issue #2905 : helloworld build ok on android
2013-10-14 14:01:00 +08:00
49d7bbd600
issue #2905 : remove sub folders except platform
2013-10-12 15:41:45 +08:00
James Chen