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 |
|
Huabing.Xu
|
e2a24dec84
|
replace Point with Vector2
|
2014-04-15 18:08:29 +08:00 |
|
Ricardo Quesada
|
78fdabe926
|
more cleanup in TMX code
|
2014-02-07 18:33:30 -08:00 |
|
Ricardo Quesada
|
616feadda1
|
More fixes and "tiles" is an uint32 (GID)
|
2014-02-07 18:11:17 -08:00 |
|
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
|
boyu0
|
1f72fafd08
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
Conflicts:
cocos/2d/CCTMXXMLParser.cpp
cocos/2d/CCTMXXMLParser.h
|
2013-12-30 12:30:59 +08:00 |
|
boyu0
|
6e6ccbd5f9
|
change some const char* to const std::string&
|
2013-12-24 15:49:58 +08:00 |
|
James Chen
|
5f17984826
|
Don’t hide parent’s addChild method in TMXLayer class.
|
2013-12-23 21:53:23 +08:00 |
|
boyu0
|
baf8cb06c5
|
issue #2050: delete max/minGID, fix firstGID bug
|
2013-12-23 10:37:46 +08:00 |
|
boyu0
|
19e1609c27
|
issue #2050: unsigned int to int
|
2013-12-20 09:50:53 +08:00 |
|
James Chen
|
bb5ef615dd
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479
Conflicts:
cocos/2d/CCSpriteBatchNode.h
|
2013-12-13 16:44:22 +08:00 |
|
Ricardo Quesada
|
a8c317bd83
|
getDescription() works as expected
renames `description` to `getDescription`. Adds `virtual` to it.
Adds `getDescription` to missing nodes.
|
2013-12-12 14:30:22 -08:00 |
|
minggo
|
1e9c763b40
|
use ssize_t for index and capacity
|
2013-12-12 14:48:26 +08:00 |
|
James Chen
|
54289276de
|
issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
|
2013-12-04 17:46:57 +08:00 |
|
James Chen
|
4ec6e50cc4
|
issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
|
2013-12-04 16:02:52 +08:00 |
|
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
|
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |