Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,898 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

720 Commits

Author SHA1 Message Date
minggo 8964c8860a [ci skip] Update CHANGELOG 2014-10-10 15:27:12 +08:00
minggo d7d52a7cf0 [ci skip] Update CHANGELOG 2014-10-10 10:19:07 +08:00
minggo db72756d02 [ci skip] Update CHANGELOG 2014-10-09 16:08:56 +08:00
minggo 52ebad885b [ci skip] Update CHANGELOG 2014-10-09 15:53:04 +08:00
minggo 640ad4a422 [ci skip] Update CHANGELOG 2014-10-08 13:50:22 +08:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
minggo d423e8f800 [ci skip] Update CHANGELOG 2014-09-30 15:21:54 +08:00
minggo f9005868d4 [ci skip] Update CHANGELOG 2014-09-30 15:11:51 +08:00
minggo ef221ce323 [ci skip] Update CHANGELOG 2014-09-30 11:17:03 +08:00
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
minggo eb1da8a0f9 [ci skip] 2014-08-22 23:34:46 +08:00
minggo 7fd1521bbf update version 2014-08-22 11:48:14 +08:00
minggo 2fc3be2720 [ci skip] 2014-08-21 10:33:57 +08:00
minggo 5ef8938217 [ci skip] 2014-08-20 13:45:08 +08:00
minggo fa95bda629 [ci skip] 2014-08-20 11:23:50 +08:00
minggo eecaac3384 [ci skip] 2014-08-20 09:48:39 +08:00
minggo 36113c65ac [ci skip] 2014-08-18 22:56:47 +08:00
minggo 6d21420755 [ci skip] 2014-08-15 16:05:12 +08:00
minggo 8d69d4b05c [ci skip] 2014-08-15 15:20:05 +08:00
minggo 64f6b9a8cc [ci skip] 2014-08-15 15:02:09 +08:00
minggo 186fd78729 [ci skip] 2014-08-14 10:06:32 +08:00
minggo 55e9487dbd [ci skip] 2014-08-14 09:42:59 +08:00
minggo c809c8806a [ci skip] 2014-08-14 09:36:29 +08:00
minggo b2dad11f7c [ci skip] 2014-08-14 09:33:32 +08:00
minggo a2cafa29e5 [ci skip] 2014-08-13 10:06:14 +08:00
minggo bdc5a7b306 [ci skip] 2014-08-13 09:30:33 +08:00
minggo 66c5d996dc [ci skip] 2014-08-12 13:39:10 +08:00
minggo e4faa4f9b1 [ci skip] 2014-08-11 10:37:23 +08:00
minggo 63ec1f894b [ci skip] 2014-08-11 09:50:46 +08:00
minggo 3031b17ba8 [ci skip] 2014-08-08 15:57:18 +08:00
minggo f677210746 [ci skip] 2014-08-08 14:07:49 +08:00
minggo 49ea910d94 [ci skip] 2014-08-08 11:59:39 +08:00
minggo 92a4a8c42c [ci skip] 2014-08-08 11:55:26 +08:00
minggo 83a204a720 [ci skip] 2014-08-08 11:48:06 +08:00
minggo beb74599c9 [ci skip] 2014-08-07 10:54:34 +08:00
minggo 8565d2734f [ci skip] 2014-08-07 10:25:16 +08:00
minggo d8aefffe3c [ci skip] 2014-08-06 14:36:37 +08:00
minggo b39954ad92 [ci skip] 2014-08-06 09:52:41 +08:00
minggo 6771ee10a5 [ci skip] 2014-08-05 13:34:41 +08:00
minggo 99f9a0fb19 [ci skip] 2014-08-05 11:55:06 +08:00
minggo a6a90e4090 [ci skip] 2014-08-05 10:10:17 +08:00
minggo a42bbaebf9 [ci skip] 2014-08-05 09:35:13 +08:00
minggo cad0c40cd2 [ci skip] 2014-08-04 16:33:44 +08:00
minggo aa78d878e1 [ci skip] 2014-08-04 15:37:17 +08:00
minggo 780549e5a7 [ci skip] 2014-08-01 11:59:44 +08:00
minggo eb3b58edc4 [ci skip] 2014-07-31 13:44:22 +08:00
minggo 57859beb68 [ci skip] 2014-07-30 09:51:18 +08:00
minggo 21ea77fb6f [ci skip] 2014-07-29 14:04:36 +08:00
minggo cb68b00634 [ci skip] 2014-07-28 14:16:39 +08:00
minggo 4249311c0c [ci skip] 2014-07-28 14:07:40 +08:00
minggo af3955f60c [ci skip] 2014-07-28 11:37:59 +08:00
minggo a878bd27db [ci skip] 2014-07-28 10:50:13 +08:00
minggo 6217748f1c [ci skip] 2014-07-25 23:16:27 +08:00
minggo 98f9395728 [ci skip] 2014-07-25 11:21:52 +08:00
minggo ae522f08fb [ci skip] 2014-07-24 23:06:42 +08:00
minggo 991fcffbf1 [ci skip] 2014-07-24 22:09:13 +08:00
minggo 92a6aab146 [ci skip] 2014-07-23 18:34:53 +08:00
minggo 2b2a00f0b3 [ci skip] 2014-07-23 11:33:12 +08:00
minggo d005ea2404 [ci skip] 2014-07-22 21:33:24 +08:00
minggo 033bbbe440 [ci skip] 2014-07-22 21:25:20 +08:00
minggo 42eb69655e [ci skip] 2014-07-21 14:57:06 +08:00
minggo 6fe58b4153 [ci skip] 2014-07-18 18:38:16 +08:00
minggo da6b8aae3d [ci skip] 2014-07-18 18:09:20 +08:00
minggo e2aedc05d3 [ci skip] 2014-07-17 22:16:46 +08:00
minggo b92fc24cc4 [ci skip] 2014-07-17 22:13:41 +08:00
minggo 10dc7cc563 [ci skip] 2014-07-17 22:06:24 +08:00
minggo c38cda6248 [ci skip] 2014-07-17 21:35:22 +08:00
minggo 8181ef9918 [ci skip] 2014-07-17 21:31:58 +08:00
minggo f418217b56 [ci skip] 2014-07-17 21:25:31 +08:00
minggo f8ecceff25 [ci skip] 2014-07-17 18:06:48 +08:00
minggo 0b7ecc769e [ci skip] 2014-07-17 17:31:32 +08:00
minggo 30f4a5cced [ci skip] 2014-07-17 16:41:32 +08:00
minggo a85e54cb69 [ci skip] 2014-07-17 12:03:59 +08:00
minggo d8a2acfdea [ci skip] 2014-07-17 11:57:11 +08:00
minggo 7ef77027d1 [ci skip] 2014-07-17 11:50:09 +08:00
minggo f17817b9ac [ci skip] 2014-07-15 17:00:16 +08:00
minggo 65f252785e [ci skip] 2014-07-15 15:02:23 +08:00
minggo e2bbc3d54d [ci skip] 2014-07-15 11:48:55 +08:00
minggo 337fc03f3a [ci skip] 2014-07-10 22:06:29 +08:00
minggo d2bcf9e9d1 [ci skip] 2014-07-10 15:49:29 +08:00
minggo ddb72228d3 [ci skip] 2014-07-10 09:57:16 +08:00
minggo fc515428bf [ci skip] 2014-07-08 22:19:54 +08:00
minggo 3e658216da [ci skip] 2014-07-08 22:08:28 +08:00
minggo 08027a65a7 [ci skip] 2014-07-08 21:21:26 +08:00
minggo 81e6fdabba [ci skip] 2014-07-08 20:38:58 +08:00
minggo 211096816b [ci skip] 2014-07-08 20:18:55 +08:00
minggo ca59f663a5 [ci skip] 2014-07-08 15:31:48 +08:00
minggo 92e113a602 [ci skip] 2014-07-08 10:59:50 +08:00
minggo aca498b06f [ci skip] 2014-07-08 10:53:07 +08:00
minggo f525500a41 [ci skip] 2014-07-03 14:20:31 +08:00
minggo aa80776eaa [ci skip] 2014-07-02 09:41:50 +08:00
minggo d6c516b62d [ci skip] 2014-07-01 16:20:55 +08:00
minggo 41379fb551 [ci skip] 2014-06-30 11:35:03 +08:00
minggo c85c6928b4 [ci skip] 2014-06-30 11:09:00 +08:00
minggo 707f5c2c93 [ci skip] 2014-06-30 11:08:13 +08:00
minggo 26db31ebc6 [ci skip] 2014-06-30 09:44:50 +08:00
minggo 496de72d6e [ci skip] 2014-06-30 09:39:38 +08:00
minggo fcde912273 [ci skip] 2014-06-27 18:09:57 +08:00
minggo 145ae387c9 [ci skip] 2014-06-27 16:38:41 +08:00
minggo 6b8fded088 [ci skip] 2014-06-26 22:59:20 +08:00
minggo 08c68e12c3 [ci skip] 2014-06-26 16:08:25 +08:00
minggo 013cf6de28 [ci skip] 2014-06-26 15:21:10 +08:00
minggo eb67d9deff [ci skip] 2014-06-25 17:59:30 +08:00
minggo ae346a741e [ci skip] 2014-06-25 17:14:57 +08:00
minggo 07c5e219d5 [ci skip] 2014-06-25 14:42:12 +08:00
minggo e44dafb9f9 [ci skip] 2014-06-25 14:33:42 +08:00
minggo 5dcc6e6707 [ci skip] 2014-06-25 14:13:50 +08:00
minggo cd2d56f5d9 [ci skip] 2014-06-25 14:11:16 +08:00
minggo e2fd768989 [ci skip] 2014-06-25 13:59:41 +08:00
minggo aa7e48794b [ci skip] 2014-06-24 10:50:09 +08:00
minggo d9c99e6251 [ci skip] 2014-06-24 10:47:50 +08:00
minggo 0a61932730 [ci skip] 2014-06-24 10:30:36 +08:00
minggo 8991ff739b [ci skip] 2014-06-23 17:22:56 +08:00
minggo dc96be969f [ci skip] 2014-06-23 16:45:47 +08:00
minggo 079e612ef2 [ci skip] 2014-06-19 22:07:25 +08:00
minggo 44e8df0ec6 [ci skip] 2014-06-19 22:05:52 +08:00
minggo 56777e6d61 [ci skip] 2014-06-19 09:47:01 +08:00
minggo c9492cbbef [ci skip] 2014-06-18 11:31:16 +08:00
minggo ba54f8c92c [ci skip] 2014-06-18 10:34:57 +08:00
minggo 9b6d58118c update changelog and release note 2014-06-17 21:13:49 +08:00
minggo 17bbb675df [ci skip] 2014-06-17 20:23:26 +08:00
minggo ec632a54b2 [ci skip] 2014-06-17 18:50:47 +08:00
minggo caafc0ebc5 [ci skip] 2014-06-17 18:38:33 +08:00
minggo 7ebb639763 [ci skip] 2014-06-17 13:51:11 +08:00
minggo ed40e48607 [ci skip] 2014-06-16 10:46:16 +08:00
minggo 1b24af95f1 [ci skip] 2014-06-12 18:23:31 +08:00
minggo 1187cfff6d [ci skip] 2014-06-12 16:19:05 +08:00
minggo bb5471ca8b [ci skip] 2014-06-12 15:07:29 +08:00
minggo 22f445d56f [ci skip] 2014-06-12 14:47:42 +08:00
minggo cc683ff00f [ci skip] 2014-06-12 11:40:41 +08:00
minggo 70147e9a20 [ci skip] 2014-06-12 11:38:28 +08:00
minggo 0ad57bdde7 [ci skip] 2014-06-11 14:50:33 +08:00
minggo 8222cdd8aa [ci skip] 2014-06-10 13:53:41 +08:00
minggo 9ef1272de7 [ci skip] 2014-06-09 17:18:55 +08:00
minggo 6ea42dd6ad [ci skip] 2014-06-09 16:34:41 +08:00
minggo f0021d7dae [ci skip] 2014-06-09 15:29:16 +08:00
minggo 4e299099d2 [ci skip] 2014-06-09 15:19:58 +08:00
minggo 2230431582 [ci skip] 2014-06-09 14:21:14 +08:00
minggo 6a4322eeac [ci skip] 2014-06-09 11:49:25 +08:00
minggo e0238c107e [ci skip] 2014-06-06 13:41:40 +08:00
minggo 11320a0ef5 [ci skip] 2014-06-06 11:40:32 +08:00
minggo 4c7628f69e [ci skip] 2014-06-05 11:51:02 +08:00
minggo 0c24c639aa [ci skip] 2014-06-05 11:01:43 +08:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
minggo a4f421a779 [ci skip] 2014-06-04 17:21:12 +08:00
minggo 539fed65fb [ci skip] 2014-06-04 15:29:54 +08:00
minggo 9c5b5924ed [ci skip] 2014-06-04 14:09:56 +08:00
minggo ef175e5999 [ci skip] 2014-06-04 13:55:00 +08:00
minggo 7641790185 [ci skip] 2014-06-04 10:05:28 +08:00
minggo 8a6a0968ef [ci skip] 2014-06-03 18:20:01 +08:00
minggo a6a686bef1 [ci skip] 2014-06-03 18:17:37 +08:00
minggo 3d576d8068 [ci skip] 2014-06-03 18:02:37 +08:00
minggo c1bb5d8803 [ci skip] 2014-06-03 16:58:53 +08:00
minggo 96d697a670 [ci skip] 2014-06-03 14:40:20 +08:00
minggo 90136b2634 [ci skip] 2014-06-03 14:36:15 +08:00
Ricardo Quesada 1b8d0d88df Adds setNormalizedPosition() 
Changes in `visit()` were done in order to do it
in a robust and fast way.
 2014-05-30 16:42:05 -07:00
minggo e41f163483 [ci skip] 2014-05-30 15:25:37 +08:00
minggo b579fa3720 [ci skip] 2014-05-29 15:07:57 +08:00
minggo 4abf7bc749 [ci skip] 2014-05-29 14:48:47 +08:00
minggo e4f19e41d2 [ci skip] 2014-05-27 16:51:23 +08:00
minggo 053da338bb [ci skip] 2014-05-27 10:18:29 +08:00
minggo 55baa62f96 [ci skip] 2014-05-25 22:34:21 -05:00
minggo b9819106b0 [ci skip] 2014-05-23 20:07:32 -05:00
minggo 99bfa9ffe8 [ci skip] 2014-05-23 02:13:58 -05:00
minggo 523d136cc5 [ci skip] 2014-05-22 20:30:06 -05:00
minggo b7cd118d52 [ci skip] 2014-05-21 18:35:14 +08:00
minggo 64d316fa65 [ci skip] 2014-05-21 14:32:03 +08:00
minggo 7facea521c [ci skip] 2014-05-21 11:44:15 +08:00
minggo dd21d27d59 [ci skip] 2014-05-21 11:24:23 +08:00
minggo e5a27ad605 [ci skip] 2014-05-20 15:41:19 +08:00
minggo da30c64498 [ci skip] 2014-05-19 11:18:00 +08:00
Ricardo Quesada 6461e26c9f Squashed commit of the following: 
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 14:03:53 2014 -0700

    More WP8 fixes

commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:41 2014 -0700

    Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d

commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 12:19:19 2014 -0700

    Adds missing resources for Windows Phone 8

commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:54:15 2014 -0700

    Updates CHANGELOG

commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:48:59 2014 -0700

    Adds Sprite3d files and tests

commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 11:16:13 2014 -0700

    fixes compiler warnings for windows

commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun May 18 10:53:34 2014 -0700

    fixes for Sprite3D

    Adds copyright header
    removes compilation warnings
    cleans code a bit

commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:46:26 2014 -0700

    Merge pull request #34 from dumganhar/pull/6731

    fix compilation error of missing bind Mesh for luabindings.

commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:45:12 2014 -0700

    use const & and changed typo

commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:43:10 2014 +0800

    fix compilation error of missing bind Mesh for luabindings.

commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94 5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date:   Sat May 17 11:33:01 2014 +0800

    Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731

commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:23:58 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:22:49 2014 -0700

    remove empty lines

commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 20:15:44 2014 -0700

    Merge pull request #33 from dabingnn/mesh3d_work

    Mesh3d work

commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 20:14:01 2014 -0700

    added mesh3d file to template

commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 19:10:45 2014 -0700

    Merge pull request #32 from dabingnn/mesh3d_work

    Mesh3d work

commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 18:18:13 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Fri May 16 17:15:39 2014 -0700

    Merge pull request #31 from Trace0429/mesh3d_work

    windows work now

commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Sat May 17 08:12:46 2014 +0800

    windows work now

commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:32:58 2014 -0700

    Merge pull request #30 from dabingnn/mesh3d_work

    Mesh3d work

commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:32:00 2014 -0700

    fix compile error after merge (MAC can work)

commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:24:11 2014 -0700

    Merge branch 'v3' into mesh3d_work

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/2d/cocos2d.vcxproj
    	cocos/2d/cocos2d.vcxproj.filters
    	cocos/Android.mk
    	cocos/CMakeLists.txt
    	cocos/renderer/CMakeLists.txt

commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 16:11:39 2014 -0700

    Merge pull request #29 from dabingnn/mesh3d_work

    Mesh3d work

commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:08:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 16:05:37 2014 -0700

    bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw

commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 16:02:27 2014 -0700

    bind buffer to 0 when finish draw

commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 14:00:38 2014 -0700

    fix outline width

commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:17 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 13:47:12 2014 -0700

    make some member protected

commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:06:17 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d

commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 13:04:27 2014 -0700

    linux work now

commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:48:34 2014 -0700

    inc drawcall

commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:31:44 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:31:31 2014 -0700

    Merge pull request #28 from dabingnn/mesh3d_work

    Mesh3d work

commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 12:30:01 2014 -0700

    optimize code

commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:29:37 2014 -0700

    adjust code style

commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 12:06:53 2014 -0700

    Merge pull request #27 from dabingnn/mesh3d_work

    Mesh3d work

commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 12:06:02 2014 -0700

    fix visual error for outline

commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:54 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 11:54:47 2014 -0700

    fix shader, add multiple sprite to Sprite3DEffectTest

commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 11:33:31 2014 -0700

    Merge pull request #26 from dabingnn/mesh3d_work

    Mesh3d work

commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:30:34 2014 -0700

    share the same glprogram in effect3DOutline

commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:19:56 2014 -0700

    add class static variable for EffectOutline

commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 11:07:04 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:55:28 2014 -0700

    add mesh.h in cocos2d.h

commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:24 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 10:41:05 2014 -0700

    remove namespace

commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Fri May 16 10:30:23 2014 -0700

    Merge pull request #25 from dabingnn/mesh3d_work

    Mesh3d work

commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:27:28 2014 -0700

    remove redundant uniform CC_Texture0

commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Fri May 16 10:20:01 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 09:11:36 2014 -0700

    warning more than one texture

commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Fri May 16 08:45:03 2014 -0700

    remove redundant line

commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:53:10 2014 -0700

    Merge pull request #24 from dabingnn/mesh3d_work

    Mesh3d work

commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:52:33 2014 -0700

    fix memory leak

commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:49:04 2014 -0700

    remove unused member variable

commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 22:37:16 2014 -0700

    Merge pull request #23 from dabingnn/mesh3d_work

    Mesh3d work

commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 22:35:48 2014 -0700

    fix memory leak

commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 20:01:49 2014 -0700

    Merge pull request #22 from dabingnn/mesh3d_work

    Mesh3d work

commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 20:01:29 2014 -0700

    android work now

commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:53:39 2014 -0700

    remove sprite3dEffect include

commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:50:17 2014 -0700

    remove unused Sprite3dEffect

commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:48:12 2014 -0700

    remove unused outline shader files

commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 19:43:17 2014 -0700

    fix error on IOS

commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 18:47:37 2014 -0700

    Merge pull request #21 from dabingnn/mesh3d_work

    Mesh3d work

commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:46:54 2014 -0700

    adjust indent, and line to the end of the file

commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:35:18 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

    Conflicts:
    	cocos/3d/CCSprite3D.cpp
    	cocos/3d/CCSprite3D.h
    	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:31:06 2014 -0700

    add testCase for outline

commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 18:03:34 2014 -0700

    extract base class Effect3D

commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 18:02:45 2014 -0700

    RendeMeshData member rename

commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:57:29 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date:   Thu May 15 17:54:24 2014 -0700

    Merge pull request #20 from Trace0429/mesh3d_work

    Mesh3d work

commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 17:54:03 2014 -0700

    android meshcommand

commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date:   Fri May 16 08:50:38 2014 +0800

    windows work now

commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 17:38:41 2014 -0700

    raw EffectSprite

commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:37:20 2014 -0700

    remove SpriteEffect from Sprite3D

commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 16:34:36 2014 -0700

    raw effectSpriteTest

commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 16:14:57 2014 -0700

    use meshcommand

commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 15:38:30 2014 -0700

    use meshcommand

commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 15:31:43 2014 -0700

    comment out effect framework

commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 15:11:25 2014 -0700

    Merge pull request #19 from dabingnn/mesh3d_work

    Mesh3d work

commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:55:06 2014 -0700

    fix compile error in testcases

commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:52:43 2014 -0700

    fix compile error after merge with v3

commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:48:19 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 14:26:40 2014 -0700

    Merge pull request #18 from dabingnn/mesh3d_work

    Mesh3d work

commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 14:25:40 2014 -0700

    move 3d shaders to shader cache

commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:56:00 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 13:55:49 2014 -0700

    meshcommand

commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:21:36 2014 -0700

    add mesh rebuild when come to foreground in android

commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 13:13:59 2014 -0700

    android work now

commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 12:21:40 2014 -0700

    Merge pull request #17 from dabingnn/mesh3d_work

    Mesh3d work

commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:19:24 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:18:49 2014 -0700

    commit the changed IOS/MAC project file

commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 12:17:57 2014 -0700

    remove MeshPart

commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Thu May 15 11:03:54 2014 -0700

    Merge pull request #16 from dabingnn/mesh3d_work

    Mesh3d work

commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Thu May 15 10:59:10 2014 -0700

    raw version of single Mesh

commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:44:04 2014 -0700

    fix outline

commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Thu May 15 10:09:45 2014 -0700

    without normal no outline effect

commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 22:39:03 2014 -0700

    android listenBackToForeground

commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:58:09 2014 -0700

    add boss1 with normal

commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:54:20 2014 -0700

    change cache

commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 21:35:59 2014 -0700

    depress no .mtl crash

commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:50 2014 -0700

    Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:58:36 2014 -0700

    merge dabingnn

commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:53:58 2014 -0700

    Merge pull request #15 from dabingnn/mesh3d_work

    Mesh3d work

commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:52:58 2014 -0700

    android can work now

commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 15:33:07 2014 -0700

    refactoring render code

commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 15:27:21 2014 -0700

    Merge pull request #14 from dabingnn/mesh3d_work

    Mesh3d work

commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:26:19 2014 -0700

    Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work

commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 15:25:55 2014 -0700

    android can compile now(can not work)

commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 14:21:09 2014 -0700

    Merge pull request #13 from dabingnn/mesh3d_work

    Mesh3d work

commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 14:15:16 2014 -0700

    include Sprite3DEffect in the cocos2d header

commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 12:51:09 2014 -0700

    outline sprite

commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:48:55 2014 -0700

    meshvertexattrib work

commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 10:40:55 2014 -0700

    use meshvertexattribute

commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Wed May 14 09:41:57 2014 -0700

    Merge pull request #12 from dabingnn/mesh3d_work

    Mesh3d work

commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:40:14 2014 -0700

    remove compile error

commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Wed May 14 09:31:14 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Wed May 14 00:25:47 2014 -0700

    vertex attrib

commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 23:49:09 2014 -0700

    mesh vertex attribute

commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 19:06:38 2014 -0700

    Merge pull request #11 from dabingnn/mesh3d_work

    Mesh3d work

commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:05:40 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 19:04:15 2014 -0700

    fix texcoord y flipped

commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 18:35:08 2014 -0700

    Merge pull request #10 from dabingnn/mesh3d_work

    Mesh3d work

commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 18:22:16 2014 -0700

    added blendFunc

commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 16:03:01 2014 -0700

    Merge pull request #9 from dabingnn/mesh3d_work

    Mesh3d work

commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 16:01:59 2014 -0700

    fix compile error after merge

commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 15:56:46 2014 -0700

    Merge branch 'v3' into mesh3d_work

commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 14:19:24 2014 -0700

    Merge pull request #8 from dabingnn/mesh3d_work

    Mesh3d work

commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:17:01 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 14:15:06 2014 -0700

    add new interface for createSprite3D

commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 13:58:35 2014 -0700

    default GLProgram to object

commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:13:24 2014 -0700

    remove compile warning

commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 13:01:20 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 12:59:59 2014 -0700

    rename init->initWithFile in Sprite3D

commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 12:58:23 2014 -0700

    Merge pull request #7 from super626/mesh3d_tmp

    Mesh3d

commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 12:56:06 2014 -0700

    Merge branch 'mesh3d_tmp' into mesh3d

commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:59:46 2014 -0700

    Merge pull request #6 from dabingnn/mesh3d_work

    Mesh3d work

commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:53:17 2014 -0700

    Merge branch 'mesh3d' into mesh3d_work

commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:52:41 2014 -0700

    adjust line indent and header file define

commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 11:44:22 2014 -0700

    using vbo

commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:42:10 2014 -0700

    Merge pull request #5 from dabingnn/mesh3d_work

    Mesh3d work

commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:39:06 2014 -0700

    add CCSprite3d include into cocos2d.h

commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:33:18 2014 -0700

    remove cocos2d.h include in Sprite3DTest.h

commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Tue May 13 11:28:47 2014 -0700

    Merge pull request #4 from dabingnn/mesh3d

    Mesh3d

commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:26:40 2014 -0700

    fix compile error after rename

commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Tue May 13 11:07:30 2014 -0700

    rename FileXXX to CCFileXXX

commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Tue May 13 10:52:36 2014 -0700

    rename _model to _mesh

commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 22:23:59 2014 -0700

    Merge pull request #3 from dabingnn/mesh3d

    Mesh3d

commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 22:21:22 2014 -0700

    fix retain/release in sprite3D

commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 20:04:16 2014 -0700

    remove compile warnings

commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 19:16:25 2014 -0700

    using glprogramstate work ok

commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:38:52 2014 -0700

    add obj

commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 18:33:23 2014 -0700

    use glprogramstate

commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 13:01:56 2014 -0700

    sprite3d

commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date:   Mon May 12 10:52:17 2014 -0700

    Merge pull request #1 from dabingnn/newcode

    Newcode

commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date:   Mon May 12 10:50:14 2014 -0700

    Merge branch 'v3' into newcode

commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date:   Mon May 12 09:44:41 2014 -0700

    3d mesh initial code
 2014-05-18 14:49:16 -07:00
James Chen 9eba2e6cfa Update CHANGELOG [ci skip] 2014-05-17 12:18:44 +08:00
minggo ef3263e80d [ci skip] 2014-05-16 22:09:30 +08:00
minggo 39c76d8a9e [ci skip] 2014-05-16 17:13:17 +08:00
minggo d3853e3f8b [ci skip] 2014-05-16 14:11:26 +08:00
Ricardo Quesada 9d1ab1ba07 uniform sampler CC_Texture0 MUST NOT be defined on shaders 
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
 2014-05-15 16:47:54 -07:00
minggo e6fe882963 [ci skip] 2014-05-15 15:50:12 +08:00
Ricardo Quesada 839170c147 Improvments on the shader2 tests 2014-05-14 13:09:33 -07:00
minggo 89bb56e829 [ci skip] 2014-05-14 09:59:38 +08:00
minggo ac22dc236a [ci skip] 2014-05-13 18:45:41 +08:00
minggo 4bb9fb2396 [ci skip] 2014-05-13 13:56:42 +08:00
minggo cbf2629bf0 [ci skip] 2014-05-12 16:54:18 +08:00
minggo f5055548ac [ci skip] 2014-05-12 14:00:11 +08:00
minggo 8ceb26532a [ci skip] 2014-05-12 13:43:47 +08:00
Ricardo Quesada 91d1883e15 updated changelog 2014-05-11 11:19:11 -07:00
minggo 8a74f83ad0 [ci skip] 2014-05-08 18:46:34 +08:00
minggo 0ae859e3e1 [ci skip] 2014-05-08 18:00:01 +08:00
minggo 5291bbc377 [ci skip] 2014-05-08 17:25:41 +08:00
minggo 2571767907 [ci skip] 2014-05-08 17:13:21 +08:00
minggo b22fe211de [ci skip] 2014-05-08 15:42:05 +08:00
minggo 4defe28f1f [ci skip] 2014-05-08 13:47:04 +08:00
James Chen 37cb91fdc0 Update CHANGELOG [ci skip] 2014-05-08 10:52:15 +08:00
James Chen c6fd98d5f1 Update CHANGELOG [ci skip] 2014-05-07 16:27:35 +08:00
minggo 1caa7ece9a [ci skip] 2014-05-06 11:56:00 +08:00
minggo 07df728919 [ci skip] 2014-05-06 11:51:34 +08:00
minggo 9634da6ce7 [ci skip] 2014-05-06 11:47:53 +08:00
Ricardo Quesada 0e6dd9afe5 Particles can be created without texture 
Needed for complex particles like in EarthWarrior3D
 2014-05-05 15:50:08 -07:00
James Chen 8cbcf17163 issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
James Chen 066a6a3577 Update CHANGELOG [ci skip] 2014-03-04 22:11:50 +08:00
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
James Chen aeecee86a4 Update CHANGELOG [ci skip] 2014-03-03 17:14:16 +08:00
James Chen e0178ae886 Update CHANGELOG [ci skip] 2014-03-03 10:08:47 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer 
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
 2014-03-01 08:26:54 -08:00
Ricardo Quesada 3bacd45240 indentation fix in CHANGELOG 2014-02-28 21:47:11 -08:00
Ricardo Quesada 5a2697816f Updates CHANGELOG 2014-02-28 16:41:37 -08:00
James Chen 2995f91b59 Update CHANGELOG [ci skip] 2014-02-28 16:38:05 +08:00
James Chen 7bfd180743 Update CHANGELOG [ci skip] 2014-02-28 10:19:37 +08:00
James Chen 5454a2db62 Update CHANGELOG [ci skip] 2014-02-27 21:56:31 +08:00
James Chen cd35bc17e8 Update CHANGELOG [ci skip] 2014-02-27 21:53:31 +08:00
James Chen c994b4ac72 Update CHANGELOG [ci skip] 2014-02-27 10:09:56 +08:00
James Chen c86aeda15e Update CHANGELOG [ci skip] 2014-02-26 11:59:08 +08:00
James Chen f97f109fbc Update CHANGELOG [ci skip] 2014-02-26 11:44:05 +08:00
James Chen 67361fc834 Update CHANGELOG [ci skip] 2014-02-26 11:41:20 +08:00
James Chen 364a6f8ef6 Update CHANGELOG [ci skip] 2014-02-25 18:32:18 +08:00
James Chen 304ccb73f1 Update CHANGELOG [ci skip] 2014-02-25 12:59:30 +08:00
James Chen 1823e890ac Update CHANGELOG [ci skip] 2014-02-25 11:18:02 +08:00
James Chen 3a652fcaf5 Update CHANGELOG [ci skip] 2014-02-24 22:25:55 +08:00
James Chen e310734af1 Update CHANGELOG [ci skip] 2014-02-24 21:50:17 +08:00
James Chen 618104d056 Update CHANGELOG [ci skip] 2014-02-24 20:14:55 +08:00
James Chen 8437e5f08b Update CHANGELOG [ci skip] 2014-02-24 17:02:38 +08:00
Ricardo Quesada 04460750b8 culling working for both 2d and 3d projections 2014-02-23 01:09:52 -08:00
James Chen e133556268 Update CHANGELOG [ci skip] 2014-02-21 19:18:24 +08:00
James Chen 7493f6aeea Update CHANGELOG [ci skip] 2014-02-21 16:25:06 +08:00
James Chen 3c82c1a0b0 Update CHANGELOG [ci skip] 2014-02-21 16:21:29 +08:00
James Chen dc64504043 Update CHANGELOG [ci skip] 2014-02-21 13:53:32 +08:00
James Chen 30c479220f Update CHANGELOG [ci skip] 2014-02-21 11:39:07 +08:00
James Chen 32383a7cfd Update CHANGELOG [ci skip] 2014-02-20 20:46:14 +08:00
James Chen 36611f9770 Update CHANGELOG [ci skip] 2014-02-20 19:35:05 +08:00
James Chen 6e07af03ae Update CHANGELOG [ci skip] 2014-02-20 15:58:55 +08:00
James Chen c0a075ee11 Update CHANGELOG [ci skip] 2014-02-20 15:48:22 +08:00
James Chen 47fd9aed26 Update CHANGELOG [ci skip] 2014-02-20 15:46:46 +08:00
James Chen 609b937b39 Update CHANGELOG [ci skip] 2014-02-18 15:59:56 +08:00
James Chen cae938bd4e Update CHANGELOG [ci skip] 2014-02-17 12:56:28 +08:00
James Chen 5ba38b1320 Update CHANGELOG [ci skip] 2014-02-14 11:20:34 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
James Chen 130c326811 Update CHANGELOG [ci skip] 2014-02-12 17:42:45 +08:00
James Chen 3028d75600 Update CHANGELOG [ci skip] 2014-02-11 14:32:22 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
James Chen a1aa4b9b8a Update CHANGELOG [ci skip] 2014-02-10 11:05:09 +08:00
James Chen 092784d7c5 Update CHANGELOG [ci skip] 2014-02-10 09:55:54 +08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 862500f99a Renames EGLView -> GLView 2014-01-30 15:40:56 -08:00
Ricardo Quesada 4ed2e0d9d2 Merge branch 'develop' into glview_improvements 
Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
 2014-01-28 11:32:25 -08:00
James Chen 1c0eb3198d Update CHANGELOG [ci skip] 2014-01-28 17:36:07 +08:00
James Chen 41e261509b Update CHANGELOG [ci skip] 2014-01-28 16:33:01 +08:00
Ricardo Quesada 1f4ca2f0ad Works on Android 2014-01-27 13:05:58 -08:00
James Chen 09197b65b0 Update CHANGELOG [ci skip] 2014-01-27 16:39:52 +08:00
James Chen bbe156fe37 Update CHANGELOG [ci skip] 2014-01-27 16:12:31 +08:00