Dale Stammen
|
f73a07c7b9
|
added missing files
|
2014-12-30 17:27:37 -08:00 |
Dale Stammen
|
bd1fef7515
|
added missing files
|
2014-12-30 16:40:04 -08:00 |
minggo
|
da8c007932
|
add const for Sprite::getTextureRect() and do some format
|
2014-12-30 11:55:54 +08:00 |
minggo
|
7db279220c
|
Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3
|
2014-12-29 15:04:43 +08:00 |
minggo
|
d7dfdc9124
|
Merge pull request #9417 from lite3/spriteretainframe
retain the sprite frame in sprite
|
2014-12-29 10:33:42 +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 |
andyque
|
19dc8b5d19
|
fix conflicts and wp8, wp8.1 linker error
|
2014-12-25 18:11:59 +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 |
lvlong
|
a4a108f766
|
fix lua binding again!!
|
2014-12-25 14:04:41 +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 |
yangxiao
|
0db70977f9
|
wrong scale order
|
2014-12-25 10:39:48 +08:00 |
yangxiao
|
510633ba72
|
wrong spelling
|
2014-12-25 10:33:49 +08:00 |
yangxiao
|
6eed142e03
|
rename _rotation_quat to _rotationQuat
|
2014-12-24 18:12:00 +08:00 |
yangxiao
|
17207673ff
|
merge cocos
|
2014-12-24 17:34:58 +08:00 |
yangxiao
|
88e0f025ef
|
make it clean
|
2014-12-24 17:18:09 +08:00 |
yangxiao
|
22ae384edf
|
Rotation representation with quaternion fix #9510
|
2014-12-24 17:07:54 +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 |
lvlonggame
|
805b248af3
|
modify win-project
|
2014-12-24 15:06:58 +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 |
minggo
|
5d8e004b9b
|
Merge pull request #9600 from huangshiwu/v3_allocator_wp
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:54:16 +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 |
minggo
|
dea483b6ef
|
performance improve
|
2014-12-23 18:07:22 +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 |
yangxiao
|
3d77c7535d
|
merge cocos
|
2014-12-23 10:35:35 +08:00 |
yusheng.lu
|
2de5ba7c2f
|
vs filters update
|
2014-12-22 19:43:14 +08:00 |
yusheng.lu
|
02b9269cff
|
completed multiplatform projects
|
2014-12-22 19:39:10 +08:00 |
yusheng.lu
|
b0bfc2906a
|
change armature codes files path
|
2014-12-22 18:26:50 +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 |
yusheng.lu
|
62c5df2d9d
|
armature node reader done (projs incompleted)
|
2014-12-22 17:35:39 +08:00 |
yangxiao
|
e8c7f30541
|
add quaternion
|
2014-12-22 17:23:44 +08:00 |
minggo
|
feacf75f12
|
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
#9555 MoveTo and MoveBy support Vec3
|
2014-12-22 15:57:12 +08:00 |
yangxiao
|
bdc12dce8b
|
add quaternion property
|
2014-12-22 15:14:18 +08:00 |
minggo
|
81de0ae687
|
Merge pull request #9566 from austinkelleher/dev
Fixing variable name lenght -> length.
|
2014-12-22 15:07:15 +08:00 |
minggo
|
20beb3b9e0
|
Merge pull request #9567 from joewan/v3-improve-perf
fix serious performance problem of Animate.
|
2014-12-22 14:57:26 +08:00 |
minggo
|
1268f73a7c
|
MoveTo and MoveBy support Vec3
|
2014-12-22 14:34:35 +08:00 |
kaile.yin
|
b924dafe83
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
|
2014-12-22 11:14:31 +08:00 |
joewanchen
|
bb1267cd09
|
use auto&.
|
2014-12-21 14:05:34 +08:00 |
joewanchen
|
a15a4a0739
|
fix compile error.
|
2014-12-21 02:03:41 +08:00 |
joewanchen
|
3765f87651
|
fix.
|
2014-12-21 00:49:23 +08:00 |
joewanchen
|
7d6686eb7b
|
fix.
|
2014-12-21 00:42:55 +08:00 |
joewanchen
|
fc69dabca2
|
fix serious performance problem.
|
2014-12-21 00:22:23 +08:00 |
Austin Kelleher
|
d3ca364259
|
Fixing variable name lenght -> length.
|
2014-12-20 07:34:44 -05:00 |
XiaoYang
|
9102c77840
|
Merge pull request #182 from lvlonggame/v3
camera frustum update
|
2014-12-19 16:14:01 +07:00 |
WenhaiLin
|
4366fb7230
|
Fix compile error on WIN32.
|
2014-12-19 11:49:40 +08:00 |
songchengjiang
|
f5f95c5693
|
fix errors on Windows
|
2014-12-19 11:30:51 +08:00 |
lvlong
|
f6bea9b6bb
|
1.add camera culling.
2.add camera culling sample.
3.fix bug: load .obj file material.
|
2014-12-18 17:18:22 +08:00 |
minggo
|
e800b3d9ba
|
Merge pull request #9501 from joewan/v3-fix-mismatch
V3 fix uninitialized members.
|
2014-12-16 18:28:36 +08:00 |