f26509efe4
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
2015-08-19 14:02:12 +08:00
07f6774cee
Crash fix for referring a non-existent layer in tmx.
2015-05-20 11:29:52 +08:00
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31: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
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
ff802ed753
Merge pull request #5279 from edba/develop
...
Added getPropertiesForGID that assings value instead of returning it.
2014-02-10 12:19:47 -08:00
78fdabe926
more cleanup in TMX code
2014-02-07 18:33:30 -08:00
4da6b97786
Added getPropertiesForGID that assings value instead of returning it.
2014-01-31 14:57:26 -08:00
5018c9ba6c
Removes unused cast in CCTMXTiledMap.cpp.
2014-01-20 11:13:29 +08:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
49d8b76b9e
fix crash related to not support the z length modifier for size_t on vs
2014-01-05 11:59:32 +08:00
0cbbfdba8c
closed #2050 : Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug2050_tilemap_firstgid_bug
...
Conflicts:
cocos/2d/CCTMXLayer.cpp
2013-12-23 15:40:33 +08:00
1072711a4c
issue #2050 : use static_cast
2013-12-23 10:46:35 +08:00
baf8cb06c5
issue #2050 : delete max/minGID, fix firstGID bug
2013-12-23 10:37:46 +08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
189cf1a076
Some fixes for XXX:getDescription.
2013-12-13 16:51:57 +08:00
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
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
db07c781ab
#include <algorithm> for std::max, std::min on VS2013.
2013-11-12 10:35:50 +08:00
ddb0111392
continue replacing `const char*` with `const std::string&`
...
This patch includes:
* Continue replacing `const char*` with `const std::string&` where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
2013-11-06 17:05:13 -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
XiaoFeng