andyque
|
57d8f155df
|
issue #4401. resolve conflicts
|
2014-03-26 14:54:50 +08:00 |
minggo
|
a374241f65
|
Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes
Windows Phone 8,0 cocos2d-x 3.0 changes
|
2014-03-26 13:58:46 +08:00 |
James Chen
|
7a8db8271f
|
Merge pull request #5930 from andyque/Branch_issue4429
closed #4429: Boolean value could not be written to specified plist file
|
2014-03-26 11:46:56 +08:00 |
Dale Stammen
|
44e6efea64
|
#pragma mark for ios and mac only
|
2014-03-22 06:08:05 -07:00 |
andyque
|
7ab639ec0f
|
fix lots compile warnings
|
2014-03-20 16:24:55 +08:00 |
andyque
|
bab53ef2bd
|
add test for ios and mac
|
2014-03-19 16:47:57 +08:00 |
andyque
|
cadbfbe9b1
|
add Bool Integer Float Double support to CCDictionary
|
2014-03-19 16:47:57 +08:00 |
andyque
|
00249328a6
|
add boolean support for mac and ios
|
2014-03-19 16:47:57 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |