minggo
|
0dff539a18
|
Merge pull request #6521 from boyu0/particle_yCoordFlipped_bug
Fix ParticleSystem yCoordFlipped bug.
|
2014-04-30 17:03:01 +08:00 |
James Chen
|
03d10e8926
|
Merge pull request #6520 from boyu0/set_value_asbool_return_false_default
Change Value::asBool() return false by default.
|
2014-04-30 16:43:52 +08:00 |
boyu0
|
489adaf315
|
fix indent
|
2014-04-30 16:33:35 +08:00 |
minggo
|
1c6c099a83
|
Merge pull request #6519 from natural-law/v3
Fix the error in cocos2d-console when rename files on windows.
|
2014-04-30 16:27:53 +08:00 |
boyu0
|
c1d60f4b33
|
Fix ParticleSystem yCoordFlipped bug.
|
2014-04-30 16:18:39 +08:00 |
boyu0
|
0699aa94fe
|
Change Value::asBool() return false by default.
|
2014-04-30 15:07:26 +08:00 |
zhangbin
|
64f30980b4
|
closed #4990, Fix the error in cocos2d-console when rename files on windows.
|
2014-04-30 11:25:47 +08:00 |
minggo
|
8283ab9435
|
Merge pull request #6518 from super626/newmath
wrong rotation
|
2014-04-30 09:44:10 +08:00 |
yangxiao
|
11dc9367ff
|
wrong rotation
|
2014-04-29 18:19:30 -07:00 |
yangxiao
|
3237d7b23d
|
Revert "wrong rotation"
This reverts commit 3c9560017e .
|
2014-04-29 18:14:41 -07:00 |
Ricardo Quesada
|
1954edc655
|
Adds Apache2 license to GamePlay3d files
|
2014-04-29 17:50:12 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -07:00 |
yangxiao
|
3c9560017e
|
wrong rotation
|
2014-04-29 17:27:32 -07:00 |
James Chen
|
f3f138368f
|
Merge pull request #6513 from samuele3hu/dev_compile_error
[Lua] The array stores Vector2 element should use `new[]` and `CC_SAFE_DELETE_ARRAY` to alloc/ free memory
|
2014-04-29 17:22:08 +08:00 |
samuele3hu
|
58a9e40b82
|
Modify some functions return value from `bool` to `int`
|
2014-04-29 17:17:18 +08:00 |
samuele3hu
|
c8fd6765bc
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-29 16:22:07 +08:00 |
samuele3hu
|
4eaec951b6
|
use `new` and `CC_SAFE_DELETE_ARRAY` to replace `malloc` and `free`
|
2014-04-29 16:04:08 +08:00 |
Huabing.Xu
|
331c2d3872
|
readd wp8 code which is removed by accident
|
2014-04-29 16:03:50 +08:00 |
Huabing.Xu
|
faa0f67644
|
using pointer instead of Director::getInstance() in RenderTexture
|
2014-04-29 15:13:24 +08:00 |
Huabing.Xu
|
bd93a5cb76
|
fix bug for renderTexture created which is bigger than screen size
|
2014-04-29 15:08:44 +08:00 |
James Chen
|
8c045da2c0
|
Merge pull request #6502 from samuele3hu/dev_compile_error
Add some deprecated functions and replace the Point related to Vector2
|
2014-04-29 14:54:42 +08:00 |
samuele3hu
|
689ce612f4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-29 14:39:50 +08:00 |
samuele3hu
|
ae488e5afa
|
Replace `vec2s` with `points`
|
2014-04-29 14:39:19 +08:00 |
minggo
|
c0f1c604b2
|
Merge pull request #6508 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-04-29 12:00:57 +08:00 |
zhangbin
|
9ad5acec7c
|
Update the reference of submodule cocos2d-console.
|
2014-04-29 11:56:50 +08:00 |
James Chen
|
e3d195184c
|
Merge pull request #6503 from shujunqiao/cocos-console-apk
[ci skip], modify android apk name in cocos-console-test.py.
|
2014-04-28 17:17:23 +08:00 |
shujunqiao
|
8ac1545686
|
[ci skip], modify android apk name in cocos-console-test.py.
|
2014-04-28 16:55:21 +08:00 |
samuele3hu
|
84c1f9281e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-28 16:28:44 +08:00 |
samuele3hu
|
d729a161a4
|
Add some deprecated functions and replace the Point related to Vector2
|
2014-04-28 16:28:15 +08:00 |
James Chen
|
698b52093e
|
Merge pull request #6396 from natural-law/FuzzyMatch
Support fuzzy matching in the create project configuration.
|
2014-04-28 15:47:56 +08:00 |
James Chen
|
493383967a
|
Merge pull request #6401 from CocosRobot/update_lua_bindings_1398668464
[AUTO]: updating luabinding automatically
|
2014-04-28 15:27:01 +08:00 |
CocosRobot
|
78a7c98b26
|
[AUTO]: updating luabinding automatically
|
2014-04-28 07:01:59 +00:00 |
James Chen
|
55b355009a
|
Merge pull request #6400 from lmskater/check-pr-title
[Jenkins][ci skip] Check pull request title to skip build
|
2014-04-28 15:00:37 +08:00 |
James Chen
|
e96883ec43
|
Merge pull request #6394 from samuele3hu/dev_compile_error
Fix compile error for Lua
|
2014-04-28 14:57:48 +08:00 |
James Chen
|
35207fd8ba
|
Merge pull request #6399 from dumganhar/v3
fullPathForFilename optimization: Checking whether the path is an empty string.
|
2014-04-28 14:56:01 +08:00 |
lm
|
b2a414a660
|
[Jenkins][ci skip] Check pull request title to skip build
|
2014-04-28 14:54:29 +08:00 |
James Chen
|
4f41b9d3ac
|
fullPathForFilename optimization: Checking whether the path is an empty string.
|
2014-04-28 14:53:30 +08:00 |
James Chen
|
0f62be5562
|
Merge pull request #6398 from lmskater/fix-check-queue-build-error
[Jenkins][ci skip] Catch exception in check_queue_build
|
2014-04-28 14:40:09 +08:00 |
lm
|
d2c091edda
|
[Jenkins][ci skip] Catch exception in check_queue_build
|
2014-04-28 14:34:34 +08:00 |
James Chen
|
818586342b
|
Merge pull request #6395 from natural-law/develop
Update the reference of submodule plugin-x.
|
2014-04-28 14:20:51 +08:00 |
zhangbin
|
0eaf8cc38d
|
Support fuzzy matching in the create project configuration.
|
2014-04-28 14:16:19 +08:00 |
James Chen
|
9b3f456f80
|
Merge pull request #6393 from Dhilan007/v3
template work on wp8 now
|
2014-04-28 14:08:06 +08:00 |
samuele3hu
|
c3f40bdc24
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-28 14:05:08 +08:00 |
Dhilan007
|
698657a6ab
|
template work on wp8 now
|
2014-04-28 14:04:52 +08:00 |
samuele3hu
|
d3670644bf
|
Fix compile error for Lua
|
2014-04-28 14:04:37 +08:00 |
James Chen
|
c76b87f9be
|
Merge pull request #6369 from natural-law/develop
Update the reference of submodule plugin-x.
|
2014-04-28 13:54:44 +08:00 |
James Chen
|
8538b27385
|
Merge pull request #6391 from dabingnn/v3_optimize
V3 optimize
|
2014-04-28 13:39:15 +08:00 |
Huabing.Xu
|
e6f7854225
|
clean for kazmath in project file
|
2014-04-28 13:14:22 +08:00 |
James Chen
|
6e0ee08d84
|
Merge pull request #6390 from Dhilan007/v3
fixed compile fail on wp8
|
2014-04-28 11:59:06 +08:00 |
Dhilan007
|
b4a9381238
|
fixed return type is not right
|
2014-04-28 11:55:45 +08:00 |