Dale Stammen
|
a2a257133a
|
enabled fogtestdemo for winrt universal apps
|
2015-01-13 14:32:30 -08:00 |
minggo
|
12539c24be
|
Merge pull request #9937 from pipu/serialize_parse_inneractionframe_alphaframe
Serialize parse inneractionframe alphaframe
|
2015-01-12 20:01:45 +08:00 |
andyque
|
32450ae9a3
|
fix empty http string
|
2015-01-12 16:16:39 +08:00 |
pipu
|
34402b75c9
|
Merge branch 'v3' into parse_inneractionframe
|
2015-01-12 13:38:30 +08:00 |
minggo
|
c4e47ed38d
|
Merge pull request #9902 from super626/v3
add fog test and arcball test
|
2015-01-12 11:58:03 +08:00 |
pipu
|
78b32332d3
|
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
|
2015-01-12 10:55:15 +08:00 |
WenhaiLin
|
e2c7743db1
|
Add test case
|
2015-01-09 18:51:30 +08:00 |
songmiao
|
9de5371202
|
fix bug and add notes
|
2015-01-09 10:23:40 +08:00 |
WenhaiLin
|
83cf479cb4
|
Fixed typo
|
2015-01-08 16:57:03 +08:00 |
songmiao
|
71820e6db1
|
add notes, deal with opengl shader in windows device, fix bug
|
2015-01-08 15:16:47 +08:00 |
Huabing.Xu
|
2b71c57b52
|
Merge pull request #9840 from Dhilan007/v3-physics-performance
Improve performance of Physics
|
2015-01-08 10:33:51 +08:00 |
songmiao
|
dfa6137ce9
|
modify arcball and fog shader
|
2015-01-07 17:58:10 +08:00 |
Wenhai Lin
|
8524a5fb97
|
Improve performance of physics
|
2015-01-07 17:08:04 +08:00 |
Huabing.Xu
|
27d4c6a0f6
|
Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
DrawNode override drawPoints function to set pointSize, fix draw points ...
|
2015-01-07 14:46:13 +08:00 |
songmiao
|
d1845f89fe
|
add fog test and arcball camera test
|
2015-01-07 11:47:34 +08:00 |
huangshiwu
|
f41f00fcb2
|
make rotated rect draw correctly
|
2015-01-07 11:44:16 +08:00 |
andyque
|
a1daba88f9
|
fix indent issue
|
2015-01-05 16:04:59 +08:00 |
andyque
|
56e333dc9b
|
fix crash on mac
|
2015-01-05 16:02:46 +08:00 |
andyque
|
2a266efc1a
|
fix CurlTest error code 23 on Windows
|
2015-01-05 15:55:40 +08:00 |
raydelto
|
e20c347767
|
Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID
|
2014-12-31 20:51:45 -04:00 |
Dale Stammen
|
5c79bf996d
|
delete first pass of allocations before starting second pass
|
2014-12-30 21:24:49 -08:00 |
minggo
|
d517831e01
|
Merge pull request #9699 from super626/fixandroid
fix background/foreground switch
|
2014-12-30 17:07:38 +08:00 |
yangxiao
|
3377c3ee53
|
fix #9689
|
2014-12-30 11:54:53 +08:00 |
yangxiao
|
bfb577e385
|
fix ##9689
|
2014-12-30 11:48:39 +08:00 |
minggo
|
3c1978fcc3
|
Merge pull request #9611 from super626/quaternion
Rotation With Quaternion
|
2014-12-30 10:09:08 +08:00 |
Thomas Hou
|
1502d32aac
|
use std math library M_PI instead of pi.
|
2014-12-29 16:24:31 +08:00 |
yangxiao
|
060c6ee0b7
|
add quaternion test
|
2014-12-29 14:36:25 +08:00 |
lvlong
|
f592671df6
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
|
2014-12-26 13:42:13 +08:00 |
lvlong
|
fdb498a8d2
|
camera test
|
2014-12-26 13:37:02 +08:00 |
minggo
|
491d36c62b
|
Merge pull request #9626 from liamcindy/CocoReader
update for cocos reader
|
2014-12-26 09:29:37 +08:00 |
andyque
|
29e9ef7edf
|
Merge branch 'v3' into modifyWidgetDefaultBehavior
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
|
2014-12-25 18:08:07 +08:00 |
Liam
|
fa85faec68
|
update for cocos reader
|
2014-12-25 15:02:22 +08:00 |
youyou
|
f678d1027c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
|
2014-12-25 12:09:31 +08:00 |
youyou
|
db6ffd7962
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-24 15:59:50 +08:00 |
yusheng.lu
|
c64792959c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-24 15:32:02 +08:00 |
minggo
|
bb9fb9f0d6
|
Merge pull request #9591 from liamcindy/Layout
update for lay out
|
2014-12-24 14:27:08 +08:00 |
yusheng.lu
|
fa5b4f8df7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
|
2014-12-24 13:06:38 +08:00 |
Liam
|
83fcf74882
|
update for code format
|
2014-12-24 10:56:01 +08:00 |
kaile.yin
|
942abfc654
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-12-24 10:53:09 +08:00 |
huangshiwu
|
01eeb15a8d
|
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:45:29 +08:00 |
yusheng.lu
|
d543f8f6a2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-23 16:12:50 +08:00 |
andyque
|
d8f726bc4f
|
modify widget default behavior
|
2014-12-23 15:03:31 +08:00 |
Liam
|
e4360b7616
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
|
2014-12-23 14:15:55 +08:00 |
yusheng.lu
|
7eedef71e6
|
armature node test completed
|
2014-12-23 11:13:05 +08:00 |
yangxiao
|
3d77c7535d
|
merge cocos
|
2014-12-23 10:35:35 +08:00 |
Liam
|
2991b57ec6
|
update lay out reader and samples
|
2014-12-22 18:24:06 +08:00 |
lvlong
|
db9f4a23fe
|
feedback commit.
|
2014-12-22 18:13:07 +08:00 |
yusheng.lu
|
6de7fae114
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-22 18:00:08 +08:00 |
lvlong
|
abd9a35504
|
CameraClippingDemo: change the sprite number.
|
2014-12-22 17:48:34 +08:00 |
yusheng.lu
|
62c5df2d9d
|
armature node reader done (projs incompleted)
|
2014-12-22 17:35:39 +08:00 |