Commit Graph

460 Commits

Author SHA1 Message Date
minggo 4736124357 [ci skip] Update CHANGELOG 2014-09-29 18:04:10 +08:00
minggo f7fcb047aa [ci skip] Update CHANGELOG 2014-09-29 18:00:29 +08:00
minggo f2fe4efdee [ci skip] Update CHANGELOG 2014-09-29 17:52:10 +08:00
minggo 913102d923 [ci skip] Update CHANGELOG 2014-09-28 17:25:04 +08:00
minggo ab8db5aced [ci skip] Update CHANGELOG 2014-09-28 16:45:38 +08:00
minggo 0cbe889030 [ci skip] Update CHANGELOG 2014-09-26 11:51:59 +08:00
minggo 995b09cb28 [ci skip] Update CHANGELOG 2014-09-26 11:01:18 +08:00
minggo e281f9f6b3 [ci skip] Update CHANGELOG 2014-09-25 14:47:03 +08:00
minggo df7685d237 [ci skip] Update CHANGELOG 2014-09-25 13:52:20 +08:00
minggo 26cbfaa29b [ci skip] 2014-09-25 13:46:12 +08:00
minggo b56b0d1eae [ci skip] 2014-09-25 10:55:18 +08:00
minggo 260cdd4eaa [ci skip] 2014-09-25 10:53:34 +08:00
minggo cebde4181b [ci skip] 2014-09-25 09:43:11 +08:00
minggo f88685be8e [ci skip] 2014-09-24 15:02:03 +08:00
minggo bb1771a000 [ci skip] 2014-09-23 11:18:56 +08:00
minggo 0368d5ace4 [ci skip] 2014-09-22 09:33:09 +08:00
minggo a1c0761107 [ci skip] 2014-09-19 17:04:41 +08:00
minggo a1052e0384 [ci skip] 2014-09-19 17:02:09 +08:00
minggo bffcf79737 [ci skip] 2014-09-17 11:33:41 +08:00
minggo 71325220bc [ci skip] 2014-09-17 10:26:03 +08:00
Ricardo Quesada c89f7ec6c4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into english_fixes
Conflicts:
	CHANGELOG
2014-09-15 09:34:11 -07:00
Ricardo Quesada 38cdee45f8 English fixes 2014-09-15 09:33:07 -07:00
minggo fc06916689 [ci skip] 2014-09-15 14:39:19 +08:00
minggo cd9611a0a6 [ci skip] 2014-09-15 09:55:38 +08:00
minggo 4aad03c449 [ci skip] 2014-09-15 09:54:42 +08:00
minggo 2b3bdbf56d [ci skip] 2014-09-12 18:06:33 +08:00
minggo 92325d30e5 [ci skip] 2014-09-12 17:17:28 +08:00
minggo 7256865f76 [ci skip] 2014-09-12 15:19:31 +08:00
minggo 2f5a3b6f8c [ci skip] 2014-09-12 15:09:50 +08:00
minggo 4106596f9d [ci skip] 2014-09-11 15:24:22 +08:00
minggo 04d4df54c0 [ci skip] 2014-09-11 15:10:45 +08:00
Ricardo Quesada 1e79cacf26 Updates CHANGELOG 2014-09-09 18:25:47 -07:00
minggo fd7bb349bb [ci skip] 2014-09-09 10:29:59 +08:00
Chuanren Wu 0b58ff7fce introduce substeps for accurate physics 2014-09-08 00:14:40 +02:00
minggo a2ee559244 [ci skip] 2014-09-04 22:38:26 +08:00
minggo d26446c73f [ci skip] 2014-09-04 14:02:20 +08:00
minggo 9cd21f19c9 [ci skip] 2014-09-04 13:39:17 +08:00
minggo cef9a21324 [ci skip] 2014-09-04 10:10:26 +08:00
minggo 8fd8ba97db [ci skip] 2014-09-03 11:27:45 +08:00
minggo 05c767be3b [ci skip] 2014-08-29 16:51:40 +08:00
minggo ffd81d8b0f [ci skip] 2014-08-29 13:43:42 +08:00
minggo 1d92d911d8 [ci skip] 2014-08-28 14:54:27 +08:00
minggo 966ea72263 [ci skip] 2014-08-28 14:35:50 +08:00
minggo 56392a080c [ci skip] 2014-08-28 14:33:31 +08:00
minggo d3227d0726 [ci skip] 2014-08-28 14:30:01 +08:00
minggo 50bbe6c91b [ci skip] 2014-08-28 14:29:06 +08:00
minggo d143754034 [ci skip] 2014-08-28 10:21:43 +08:00
Ricardo Quesada 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
minggo abf4fb2319 [ci skip] 2014-08-25 09:47:13 +08:00
minggo d358a06716 [ci skip] 2014-08-22 23:47:53 +08:00