yangxiao
|
ed8f8a9cad
|
sprite3d with skin render&bundle
|
2014-06-05 16:36:01 +08:00 |
vision
|
f7d5d837bf
|
add new tests for different pixel formats
|
2014-06-05 16:33:42 +08:00 |
minggo
|
5cf083fbeb
|
Merge pull request #6982 from CocosRobot/update_lua_bindings_1401951865
[AUTO]: updating luabinding automatically
|
2014-06-05 15:59:19 +08:00 |
CocosRobot
|
b749d0b5ca
|
[AUTO]: updating luabinding automatically
|
2014-06-05 07:06:07 +00:00 |
minggo
|
88409092ff
|
Merge pull request #6981 from samuele3hu/v3_fix
Update controller.lua for lua-tests and bindings-generator submoudle
|
2014-06-05 15:00:44 +08:00 |
samuele3hu
|
373d4dfb1a
|
Replace `log` with `CCLOG`
|
2014-06-05 14:49:02 +08:00 |
samuele3hu
|
919524cf89
|
Update controller.lua for lua-tests and bindings-generator submoudle
|
2014-06-05 14:39:09 +08:00 |
minggo
|
6a1a3b5a06
|
Merge pull request #6980 from CocosRobot/update_cocosfiles_1401940273
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-05 11:52:23 +08:00 |
CocosRobot
|
b218f8ec13
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-05 03:51:15 +00:00 |
minggo
|
4c7628f69e
|
[ci skip]
|
2014-06-05 11:51:02 +08:00 |
minggo
|
366beedbb2
|
Merge pull request #6955 from samuele3hu/v3_fix
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-05 11:49:40 +08:00 |
minggo
|
a2ee890927
|
Merge pull request #6978 from CocosRobot/update_lua_bindings_1401937200
[AUTO]: updating luabinding automatically
|
2014-06-05 11:04:41 +08:00 |
minggo
|
0c24c639aa
|
[ci skip]
|
2014-06-05 11:01:43 +08:00 |
CocosRobot
|
0010ed2e44
|
[AUTO]: updating luabinding automatically
|
2014-06-05 03:01:43 +00:00 |
vision
|
860057c307
|
Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories.
|
2014-06-05 10:58:27 +08:00 |
minggo
|
c1360318c1
|
Merge pull request #6977 from minggo/update-version
update libcurl.a
|
2014-06-05 10:56:06 +08:00 |
minggo
|
ed40dc9268
|
update libcurl.a
|
2014-06-05 10:54:59 +08:00 |
samuele3hu
|
a4cb0c183a
|
Update Linux CMakeLists for xxtea
|
2014-06-05 10:54:05 +08:00 |
vision
|
c90f2b3251
|
remove unused codes in CCTexture2D
|
2014-06-05 10:09:36 +08:00 |
Ricardo Quesada
|
4fdfc3a7ed
|
Merge pull request #6947 from ricardoquesada/normalized_position
Adds setNormalizedPosition()
|
2014-06-04 10:25:30 -07:00 |
Ricardo Quesada
|
a11740ff29
|
ouch, more windows compile issues
|
2014-06-04 10:11:16 -07:00 |
Ricardo Quesada
|
59b966731e
|
Compiles on Windows and Android
|
2014-06-04 09:48:35 -07:00 |
Ricardo Quesada
|
0c2f8ed401
|
Lua compiles and runs
|
2014-06-04 09:26:39 -07: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 |
yangxiao
|
54caf26a57
|
animation3d
|
2014-06-04 18:17:09 +08:00 |
James Chen
|
cc0de2f269
|
Merge pull request #6973 from CocosRobot/update_cocosfiles_1401873482
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-04 17:51:21 +08:00 |
minggo
|
a4f421a779
|
[ci skip]
|
2014-06-04 17:21:12 +08:00 |
CocosRobot
|
bd018ea645
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-04 09:18:03 +00:00 |
minggo
|
7a4d46dc1b
|
Merge pull request #6965 from Dhilan007/v3-wp8fix
Support Fast App Resume and fixed black screen may arise when using third sdk.
|
2014-06-04 17:15:13 +08:00 |
minggo
|
a495747a7c
|
Merge pull request #6971 from andyque/refactorUIFramework
refactor ObjectFactory
|
2014-06-04 17:08:27 +08:00 |
andyque
|
ab8a68f53b
|
fix template
|
2014-06-04 15:55:52 +08:00 |
andyque
|
d1e664fd44
|
fix win7 compile error
|
2014-06-04 15:43:53 +08:00 |
minggo
|
539fed65fb
|
[ci skip]
|
2014-06-04 15:29:54 +08:00 |
minggo
|
a31710973c
|
Merge pull request #6962 from visiblelight/AlphaIssues
Fix a crash in ParticleTest->PremultipliedAlphaTest
|
2014-06-04 15:10:54 +08:00 |
andyque
|
d089b251db
|
fix other platform compile error
|
2014-06-04 14:56:34 +08:00 |
andyque
|
54e93f6c41
|
fix ObjectFactory refactor issue
|
2014-06-04 14:56:34 +08:00 |
andyque
|
f0d38290a1
|
refactor ObjectFactor and move it to base
|
2014-06-04 14:56:34 +08:00 |
andyque
|
38e274de73
|
refact ui header file include
|
2014-06-04 14:56:33 +08:00 |
minggo
|
c5f96aaa3b
|
[ci skip]
|
2014-06-04 14:33:48 +08:00 |
minggo
|
7bf2be6033
|
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
Bugfix autorelease pool manager
|
2014-06-04 14:31:30 +08:00 |
minggo
|
96bb950d96
|
[ci skip]
|
2014-06-04 14:14:09 +08:00 |
minggo
|
700b0f7320
|
Merge pull request #6966 from kicktheken/v3
fix layout constant syntax error
|
2014-06-04 14:12:52 +08:00 |
minggo
|
9c5b5924ed
|
[ci skip]
|
2014-06-04 14:09:56 +08:00 |
minggo
|
7fd59baa2f
|
[ci skip]
|
2014-06-04 14:08:19 +08:00 |
minggo
|
b174481645
|
Merge pull request #6967 from ntotani/fix-lua-binding-release-build
fix lua-binding release build
|
2014-06-04 14:06:29 +08:00 |
minggo
|
d2be671281
|
Merge pull request #6970 from CocosRobot/update_lua_bindings_1401861401
[AUTO]: updating luabinding automatically
|
2014-06-04 13:59:59 +08:00 |
CocosRobot
|
a70d6628a7
|
[AUTO]: updating luabinding automatically
|
2014-06-04 05:58:29 +00:00 |
minggo
|
ef175e5999
|
[ci skip]
|
2014-06-04 13:55:00 +08:00 |
Dhilan007
|
3fcb75c82f
|
Fixed black screen may arise when using third SDK.
|
2014-06-04 13:54:44 +08:00 |
minggo
|
5432698674
|
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
closed #5482: Node::setPhysicsBody() doesn't work after node added to another node.
|
2014-06-04 13:52:43 +08:00 |