minggo
|
3e9fd67ab2
|
Merge pull request #11520 from super626/v3
Improve Animate3D
|
2015-04-21 09:30:43 +08:00 |
Dale Stammen
|
4169ebf5c8
|
Windows Phone 8.1 back button and terminate app support
|
2015-04-20 10:43:34 -07:00 |
Dale Stammen
|
6c7ecf0b18
|
removed CC_PLATFORM_WINRT messagebox code
|
2015-04-20 10:32:11 -07:00 |
yinjimmy
|
2c0f1c1a50
|
add lua runtime template
|
2015-04-21 01:25:44 +08:00 |
Dale Stammen
|
e00b0dfbd9
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-20 08:17:16 -07:00 |
yangxiao
|
7c37123dbd
|
remove fade in animation if no running animation
|
2015-04-20 19:45:31 +08:00 |
yangxiao
|
e8b21589fc
|
avoid some remap
|
2015-04-20 19:33:16 +08:00 |
minggo
|
fd3e38be1a
|
Merge pull request #11519 from htlxyz/fix_win32_app_retun_code
fixed win32 application return code
|
2015-04-20 18:32:17 +08:00 |
htl
|
2476f2b52d
|
fixed win32 application return code
|
2015-04-20 18:27:21 +08:00 |
yangxiao
|
1a50610c00
|
Merge branch 'newcode' into v3
|
2015-04-20 18:21:07 +08:00 |
Vladimir Perminov
|
6ef1e7e3d0
|
Optimize Vec3 use constructor default.
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
|
2015-04-20 12:56:43 +03:00 |
andyque
|
484153aff7
|
remove ui shaders in windows platform
|
2015-04-20 17:54:49 +08:00 |
yangxiao
|
bc62338b36
|
map use node instead of sprite
|
2015-04-20 17:49:01 +08:00 |
minggo
|
15fe283c2e
|
Merge pull request #11515 from xiaofeng11/v3
update compatibility for upgraded node3d come with 2.2.5 version
|
2015-04-20 17:05:32 +08:00 |
andyque
|
6fb29ad1b0
|
remove uishader settings
|
2015-04-20 17:04:49 +08:00 |
andyque
|
e02dad3489
|
fix ui grayscale shader memory release issue
|
2015-04-20 17:00:40 +08:00 |
xiaofeng11
|
2c0350c1a6
|
Merge pull request #20 from pipu/parse_Node3DReader_position
Modify that parse position for Node3DReader.
|
2015-04-20 16:11:31 +08:00 |
minggo
|
cdf00408a7
|
Merge pull request #11513 from andyque/fix-wp8.1-include-path
fix freetype include path on win-8.1
|
2015-04-20 16:01:55 +08:00 |
minggo
|
d87b175167
|
Merge pull request #11512 from CocosRobot/update_cocosfiles_1429516413
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 16:00:34 +08:00 |
pipu
|
388e4b3a93
|
Modify that parse position for Node3DReader.
|
2015-04-20 15:56:36 +08:00 |
andyque
|
1e514f0a2b
|
fix freetype include path on win-8.1
|
2015-04-20 15:54:31 +08:00 |
CocosRobot
|
ebd76defe6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 07:53:34 +00:00 |
minggo
|
76613fc85f
|
Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341
[AUTO]: updating luabinding automatically
|
2015-04-20 15:51:57 +08:00 |
minggo
|
8f88afa123
|
Merge pull request #11510 from xiaofeng11/v3
Bug fix
|
2015-04-20 15:50:44 +08:00 |
xiaofeng11
|
829da53773
|
Merge pull request #19 from pipu/fixed_shadow_outline
Modify that parse text shadow and outline.
|
2015-04-20 15:04:33 +08:00 |
CocosRobot
|
87e29db218
|
[AUTO]: updating luabinding automatically
|
2015-04-20 05:40:58 +00:00 |
minggo
|
6ec3930bcb
|
Merge pull request #11505 from CocosRobot/update_cocosfiles_1429508263
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 13:39:08 +08:00 |
CocosRobot
|
9b09fb1f6a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 05:37:44 +00:00 |
minggo
|
e55e19923b
|
[ci skip]update CHANGELOG
|
2015-04-20 13:37:19 +08:00 |
minggo
|
fc16bc6154
|
Merge pull request #11501 from samuele3hu/v3_studio2
Add Lua bindings for WebView and related test case
|
2015-04-20 13:36:08 +08:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
pipu
|
4b320a1677
|
Modify that parse text shadow and outline.
|
2015-04-20 11:39:43 +08:00 |
minggo
|
bb4e749a93
|
Merge pull request #11489 from dumganhar/clean-order
[Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene
|
2015-04-20 10:47:37 +08:00 |
minggo
|
e7e6a4c8ff
|
Merge pull request #11503 from CocosRobot/update_cocosfiles_1429497502
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 10:40:10 +08:00 |
CocosRobot
|
fb9cdc28e3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 02:38:23 +00:00 |
minggo
|
d792e3dc94
|
[ci skip]update AUTHORS
|
2015-04-20 10:38:19 +08:00 |
minggo
|
707c7170b1
|
[ci skip]update CHANGELOG
|
2015-04-20 10:37:40 +08:00 |
minggo
|
c7fe7704d4
|
Merge pull request #11499 from perminovVS/v3-dev-user-default-only-delegate
UserDefault::setDelegate
|
2015-04-20 10:36:56 +08:00 |
minggo
|
5e79f79b4a
|
Merge pull request #11500 from andyque/update-deps-v3-to-42
update deps to 42
|
2015-04-20 10:35:04 +08:00 |
samuele3hu
|
4f22a1470b
|
Update the project setting
|
2015-04-20 10:11:39 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
minggo
|
133ca38513
|
[ci skip]update CHANGELOG
|
2015-04-20 09:56:10 +08:00 |
andyque
|
5f030c4c4c
|
update deps to 42
|
2015-04-20 09:55:38 +08:00 |
Dale Stammen
|
5f263968ae
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-19 18:55:02 -07:00 |
minggo
|
1a9febcbed
|
[ci skip]update CHANGELOG
|
2015-04-20 09:54:45 +08:00 |
minggo
|
5b5d9f1337
|
Merge pull request #11498 from perminovVS/v3-dev-optimize-vec2
Optimize Vec2
|
2015-04-20 09:53:28 +08:00 |
Dale Stammen
|
ec378b612e
|
added listener if back button event not handled by app
|
2015-04-19 18:53:10 -07:00 |
minggo
|
0c2059bfe0
|
Merge pull request #11485 from MSOpenTech/v3-winrt-wic
V3 WinRT fixes for WIC image encode
|
2015-04-20 09:36:16 +08:00 |
Dale Stammen
|
a97d5c5370
|
added support for hardware back button on Windows Phone 8.1
|
2015-04-19 16:31:30 -07:00 |
Dale Stammen
|
e3e79475f7
|
added ExitApp() for winrt
|
2015-04-19 16:30:51 -07:00 |