kompjoefriek
|
0c70660551
|
Fixed warnings
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
|
2015-01-29 01:36:22 +01:00 |
minggo
|
6edf125c4e
|
Merge pull request #10259 from andyque/fixCompileError
fix compile error
|
2015-01-28 17:00:51 +08:00 |
andyque
|
ac3d79a516
|
add constructor to AnimationInfo
|
2015-01-28 16:59:27 +08:00 |
andyque
|
35c436f1f3
|
fix compile error
|
2015-01-28 16:35:16 +08:00 |
Huabing.Xu
|
1f8b5796e9
|
Merge pull request #10256 from dabingnn/v3_fixCompileError
fix compile error on cpp-tests release mode
|
2015-01-28 15:51:19 +08:00 |
Huabing.Xu
|
29c4c744ac
|
fix compile error on cpp-tests release mode
|
2015-01-28 15:34:28 +08:00 |
minggo
|
34c132280e
|
Merge pull request #10244 from geron-cn/fixProjectNodeLoader
Fix project node crash in simulator and add its test-cpp
|
2015-01-28 15:30:53 +08:00 |
minggo
|
757c4a6cdb
|
Merge pull request #10253 from CocosRobot/update_lua_bindings_1422429538
[AUTO]: updating luabinding automatically
|
2015-01-28 15:24:52 +08:00 |
minggo
|
80cf4439f2
|
Merge pull request #10241 from Dhilan007/v3-scheduled-fix
Fixed may access wrong memory address in Scheduler::schedule
|
2015-01-28 15:22:40 +08:00 |
CocosRobot
|
ba5b23d2a5
|
[AUTO]: updating luabinding automatically
|
2015-01-28 07:21:15 +00:00 |
minggo
|
b41873bb7e
|
[ci skip]update CHANGELOG
|
2015-01-28 15:20:22 +08:00 |
minggo
|
b233d6928e
|
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-28 15:16:23 +08:00 |
minggo
|
2738745614
|
Merge pull request #10248 from dabingnn/v3_fixRenderer
V3 fix renderer
|
2015-01-28 15:15:08 +08:00 |
minggo
|
b5fe4d37fd
|
Merge pull request #10249 from CocosRobot/update_lua_bindings_1422423873
[AUTO]: updating luabinding automatically
|
2015-01-28 13:47:50 +08:00 |
CocosRobot
|
78463a4a66
|
[AUTO]: updating luabinding automatically
|
2015-01-28 05:46:25 +00:00 |
minggo
|
f54916cf69
|
Merge pull request #10247 from samuele3hu/v3_4_fi
Add more 3D test case and adjust some binding function
|
2015-01-28 13:41:34 +08:00 |
WenhaiLin
|
7baf84c232
|
Add test case for issue#10232
|
2015-01-28 11:31:52 +08:00 |
samuele3hu
|
cd42806367
|
Fix the error of tolua_cocos2d_Mat4_decompose
|
2015-01-28 11:12:12 +08:00 |
samuele3hu
|
7628ec53bc
|
Remove useless comment
|
2015-01-28 11:06:00 +08:00 |
Huabing.Xu
|
c8a783e4ac
|
use const auto&
|
2015-01-28 10:59:29 +08:00 |
samuele3hu
|
82a95bf2fc
|
Modify some script files
|
2015-01-28 10:57:30 +08:00 |
minggo
|
c320262f43
|
Merge pull request #10243 from cheyiliu/patch-1
Update SocketIOTest.cpp
|
2015-01-28 10:49:58 +08:00 |
geron-cn
|
7b9d9ff9f9
|
fix complie error on win
|
2015-01-28 10:33:50 +08:00 |
Huabing.Xu
|
5f5c00b7d2
|
remove duplicated QUEUE_GROUP::QUEUE_COUNT and QUEUE_GROUP::QUEUE_GROUP_SIZE
|
2015-01-28 10:32:22 +08:00 |
Wenhai Lin
|
4685ab1ef6
|
Add a test case about Scale9Sprite run action in physics scene
|
2015-01-28 10:20:30 +08:00 |
minggo
|
823ec8812f
|
[ci skip]update CHANGELOG
|
2015-01-28 10:00:16 +08:00 |
minggo
|
8d681dfe7d
|
Merge pull request #10218 from andyque/fixIssue10183
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
|
2015-01-28 09:57:34 +08:00 |
Huabing.Xu
|
7ae85cb51f
|
Merge pull request #8 from darkdukey/v3_fixRenderer
V3 fix renderer
|
2015-01-28 09:55:49 +08:00 |
samuele3hu
|
6208e9cba5
|
Add more test cases about 3D
|
2015-01-28 09:40:20 +08:00 |
Nite Luo
|
5c32b31d6e
|
Fix test case #10237
|
2015-01-27 17:24:01 -08:00 |
Nite Luo
|
be6ca1b6d2
|
add force depth write
|
2015-01-27 17:05:51 -08:00 |
Nite Luo
|
c364323bbc
|
Not using static value to save previous render state since other commands like custom command could change them
|
2015-01-27 16:26:31 -08:00 |
Nite Luo
|
8f539a0107
|
Make PositionZ independent from global Z
|
2015-01-27 15:41:58 -08:00 |
Nite Luo
|
a67a48c6da
|
Merge branch 'v3' into v3_fixRenderer
|
2015-01-27 14:41:43 -08:00 |
Nite Luo
|
b89e255099
|
Finish organize the render queue
|
2015-01-27 14:41:16 -08:00 |
Nite Luo
|
4211b8d07d
|
Merge pull request #10245 from darkdukey/fixCameraTest
Fix BillboardTest
|
2015-01-27 14:31:17 -08:00 |
Nite Luo
|
3cd74ee8ce
|
Fix BillboardTest
|
2015-01-27 13:49:49 -08:00 |
Nite Luo
|
78d8a694c8
|
Merge branch 'v3' into v3_fixRenderer
Conflicts:
cocos/renderer/CCRenderer.cpp
cocos/renderer/CCRenderer.h
|
2015-01-27 11:23:48 -08:00 |
Nite Luo
|
3c635d044e
|
Add Queue_count for render queues
|
2015-01-27 11:12:51 -08:00 |
Nite Luo
|
2be140fccc
|
Merge pull request #10225 from darkdukey/saveRenderState
save/restore render state
|
2015-01-27 11:12:05 -08:00 |
Nite Luo
|
75253d66ff
|
Merge branch 'v3' into v3_fixRenderer
|
2015-01-27 10:56:28 -08:00 |
Nite Luo
|
a45db07da3
|
Merge pull request #10236 from super626/usecase
Usecase 2 for 2d + 3d
|
2015-01-27 10:30:18 -08:00 |
geron-cn
|
3268dbc9fd
|
add cpp-test for animation list and projected
|
2015-01-28 02:12:09 +08:00 |
geron-cn
|
df10a974fa
|
fix projectnode
|
2015-01-27 23:19:27 +08:00 |
minggo
|
f09626bcfb
|
Merge pull request #10235 from pipu/modify_parse_ignoresize
Modify that parse ignoreSize for TextAtlas, TextBMFont.
|
2015-01-27 18:44:01 +08:00 |
cheyiliu
|
71abf22a0d
|
Update SocketIOTest.cpp
just a fix for spelling
|
2015-01-27 18:22:39 +08:00 |
WenhaiLin
|
d9bb6192dc
|
Fixed may access wrong memory in Scheduler::schedule
|
2015-01-27 17:29:12 +08:00 |
Huabing.Xu
|
cee1df2278
|
Merge branch 'v3' into v3_fixRenderer
|
2015-01-27 16:54:35 +08:00 |
Wenhai Lin
|
f2335fb3bc
|
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-27 16:13:45 +08:00 |
yangxiao
|
89f107ac08
|
remove unused variables
|
2015-01-27 15:25:40 +08:00 |